From d239eca9dd9f87635f1b095e8d67b7d462393699 Mon Sep 17 00:00:00 2001
From: Prof-Bloodstone <46570876+Prof-Bloodstone@users.noreply.github.com>
Date: Wed, 4 Aug 2021 09:48:15 +0200
Subject: [PATCH] Fix writing server.properties with wrong encoding (#6322)

Fixes #6321
---
 ...riting-of-comments-to-server.propert.patch | 36 +++++++------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/patches/server/0738-Allow-skipping-writing-of-comments-to-server.propert.patch b/patches/server/0738-Allow-skipping-writing-of-comments-to-server.propert.patch
index 973aa00abd..5fd98bcbe3 100644
--- a/patches/server/0738-Allow-skipping-writing-of-comments-to-server.propert.patch
+++ b/patches/server/0738-Allow-skipping-writing-of-comments-to-server.propert.patch
@@ -8,21 +8,18 @@ Makes less git noise, as it won't update the date every single time
 Use -DPaper.skipServerPropertiesComments=true flag to disable writing it
 
 diff --git a/src/main/java/net/minecraft/server/dedicated/Settings.java b/src/main/java/net/minecraft/server/dedicated/Settings.java
-index 745a6735fba8343329ec31723da914fad16ae134..2713d9acc51c6c5cc51bdbbe63477343ecb29154 100644
+index 745a6735fba8343329ec31723da914fad16ae134..232c305b63df19ea923772192c97de65411531dd 100644
 --- a/src/main/java/net/minecraft/server/dedicated/Settings.java
 +++ b/src/main/java/net/minecraft/server/dedicated/Settings.java
-@@ -1,9 +1,11 @@
+@@ -1,6 +1,8 @@
  package net.minecraft.server.dedicated;
  
  import com.google.common.base.MoreObjects;
-+import java.io.BufferedWriter; // Paper
++
++import java.io.BufferedOutputStream; // Paper
  import java.io.IOException;
  import java.io.InputStream;
  import java.io.OutputStream;
-+import java.io.OutputStreamWriter; // Paper
- import java.nio.file.Files;
- import java.nio.file.Path;
- import java.util.Objects;
 @@ -18,11 +20,13 @@ import org.apache.logging.log4j.Logger;
  
  import joptsimple.OptionSet; // CraftBukkit
@@ -37,32 +34,25 @@ index 745a6735fba8343329ec31723da914fad16ae134..2713d9acc51c6c5cc51bdbbe63477343
      // CraftBukkit start
      private OptionSet options = null;
  
-@@ -79,9 +83,54 @@ public abstract class Settings<T extends Settings<T>> {
+@@ -79,9 +83,47 @@ public abstract class Settings<T extends Settings<T>> {
              }
              // CraftBukkit end
              OutputStream outputstream = Files.newOutputStream(path);
 +            // Paper start - disable writing comments to properties file
-+            OutputStreamWriter outputStreamWriter = new OutputStreamWriter(outputstream);
-+            BufferedWriter bufferedwriter = !skipComments ? new BufferedWriter(outputStreamWriter) : new BufferedWriter(outputStreamWriter) {
++            BufferedOutputStream bufferedOutputStream =  !skipComments ? new BufferedOutputStream(outputstream) : new BufferedOutputStream(outputstream) {
 +                private boolean isRightAfterNewline = true; // If last written char was newline
 +                private boolean isComment = false; // Are we writing comment currently?
 +
 +                @Override
-+                public void write(@NotNull String str) throws IOException {
-+                    char[] ch = str.toCharArray();
-+                    this.write(ch);
++                public void write(@NotNull byte[] b) throws IOException {
++                    this.write(b, 0, b.length);
 +                }
 +
 +                @Override
-+                public void write(@NotNull char[] cbuf) throws IOException {
-+                    this.write(cbuf, 0, cbuf.length);
-+                }
-+
-+                @Override
-+                public void write(@NotNull char[] cbuf, int off, int len) throws IOException {
++                public void write(@NotNull byte[] bbuf, int off, int len) throws IOException {
 +                    int latest_offset = off; // The latest offset, updated when comment ends
 +                    for (int index = off; index < off + len; ++index ) {
-+                        char c = cbuf[index];
++                        byte c = bbuf[index];
 +                        boolean isNewline = (c == '\n' || c == '\r');
 +                        if (isNewline && isComment) {
 +                            // Comment has ended
@@ -73,7 +63,7 @@ index 745a6735fba8343329ec31723da914fad16ae134..2713d9acc51c6c5cc51bdbbe63477343
 +                            isComment = true;
 +                            if (index != latest_offset) {
 +                                // We got some non-comment data earlier
-+                                super.write(cbuf, latest_offset, index-latest_offset);
++                                super.write(bbuf, latest_offset, index-latest_offset);
 +                            }
 +                        }
 +                        isRightAfterNewline = isNewline; // Store for next iteration
@@ -81,7 +71,7 @@ index 745a6735fba8343329ec31723da914fad16ae134..2713d9acc51c6c5cc51bdbbe63477343
 +                    }
 +                    if (latest_offset < off+len && !isComment) {
 +                        // We have some unwritten data, that isn't part of a comment
-+                        super.write(cbuf, latest_offset, (off + len) - latest_offset);
++                        super.write(bbuf, latest_offset, (off + len) - latest_offset);
 +                    }
 +                }
 +            };
@@ -89,7 +79,7 @@ index 745a6735fba8343329ec31723da914fad16ae134..2713d9acc51c6c5cc51bdbbe63477343
  
              try {
 -                this.properties.store(outputstream, "Minecraft server properties");
-+                this.properties.store(bufferedwriter, "Minecraft server properties"); // Paper - use bufferedwriter
++                this.properties.store(bufferedOutputStream, "Minecraft server properties"); // Paper - use bufferedOutputStream
              } catch (Throwable throwable) {
                  if (outputstream != null) {
                      try {