Fixed double html escaping on text files + always overwrite EULA file

DoubleDoorDevelopment · Aug 4, 2016 · 08a67ed · 08a67ed
1 parent e87c773
commit 08a67ed
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Typos? [Go here.](https://github.com/DoubleDoorDevelopment/D3Backend/issues/10)
 1. Tell us what you clicked exactly (if applicable)
 1. If we ask you for more information and you don't replay within 14 days, the issue will be considerer inactive.
 
-ToDO
+ToDo
 ----
 
 - [ ]  Implement email system

diff --git a/src/main/java/net/doubledoordev/backend/server/FileManager.java b/src/main/java/net/doubledoordev/backend/server/FileManager.java
@@ -225,7 +225,7 @@ public String getFileContents() throws IOException
             case "lock":
                 return null;
             default:
-                return StringEscapeUtils.escapeHtml4(FileUtils.readFileToString(file));
+                return FileUtils.readFileToString(file);
         }
     }
 

diff --git a/src/main/java/net/doubledoordev/backend/server/Server.java b/src/main/java/net/doubledoordev/backend/server/Server.java
@@ -880,20 +880,17 @@ public void startServer() throws Exception
         for (String blocked : SERVER_START_ARGS_BLACKLIST_PATTERNS) if (getJvmData().extraMCParameters.contains(blocked)) throw new Exception("JVM/MC options contain a blocked option: " + blocked);
 
         File eula = new File(getFolder(), "eula.txt");
-        if (!eula.exists())
+        try
         {
-            try
-            {
-                FileUtils.writeStringToFile(eula, "#The server owner indicated to agree with the EULA when submitting the from that produced this server instance.\n" +
-                        "#That means that there is no need for extra halting of the server startup sequence with this stupid file.\n" +
-                        "#" + new Date().toString() + "\n" +
-                        "eula=true\n");
-            }
-            catch (IOException e)
-            {
-                printLine("Error making the eula file....");
-                e.printStackTrace();
-            }
+            FileUtils.writeStringToFile(eula, "#The server owner indicated to agree with the EULA when submitting the from that produced this server instance.\n" +
+                    "#That means that there is no need for extra halting of the server startup sequence with this stupid file.\n" +
+                    "#" + new Date().toString() + "\n" +
+                    "eula=true\n");
+        }
+        catch (IOException e)
+        {
+            printLine("Error making the eula file....");
+            e.printStackTrace();
         }
 
         new Thread(new Runnable()