From 7f9fbe54baf0e73dc6a9a1ff58d67f82881507a4 Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 15 Jul 2016 20:08:04 +1000
Subject: Simplify a few diffs

---
 nms-patches/DedicatedServer.patch | 48 +++++++++++++++------------------------
 1 file changed, 18 insertions(+), 30 deletions(-)

(limited to 'nms-patches/DedicatedServer.patch')

diff --git a/nms-patches/DedicatedServer.patch b/nms-patches/DedicatedServer.patch
index 6d42a7a3..d14694e7 100644
--- a/nms-patches/DedicatedServer.patch
+++ b/nms-patches/DedicatedServer.patch
@@ -1,18 +1,6 @@
 --- a/net/minecraft/server/DedicatedServer.java
 +++ b/net/minecraft/server/DedicatedServer.java
-@@ -4,10 +4,9 @@
- import com.mojang.authlib.GameProfileRepository;
- import com.mojang.authlib.minecraft.MinecraftSessionService;
- import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService;
--import java.io.BufferedReader;
-+
- import java.io.File;
- import java.io.IOException;
--import java.io.InputStreamReader;
- import java.net.InetAddress;
- import java.net.Proxy;
- import java.util.Collections;
-@@ -18,11 +17,21 @@
+@@ -18,11 +18,21 @@
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  
@@ -35,7 +23,7 @@
      private RemoteStatusListener n;
      public final RemoteControlCommandListener remoteControlCommandListener = new RemoteControlCommandListener(this);
      private RemoteControlListener p;
-@@ -32,8 +41,10 @@
+@@ -32,8 +42,10 @@
      private EnumGamemode t;
      private boolean u;
  
@@ -48,7 +36,7 @@
          Thread thread = new Thread("Server Infinisleeper") {
              {
                  this.setDaemon(true);
-@@ -52,16 +63,30 @@
+@@ -52,16 +64,30 @@
          };
      }
  
@@ -83,7 +71,7 @@
                      }
                  } catch (IOException ioexception) {
                      DedicatedServer.LOGGER.error("Exception handling console input", ioexception);
-@@ -70,6 +95,27 @@
+@@ -70,6 +96,27 @@
              }
          };
  
@@ -111,7 +99,7 @@
          thread.setDaemon(true);
          thread.start();
          DedicatedServer.LOGGER.info("Starting minecraft server version 1.10.2");
-@@ -78,7 +124,7 @@
+@@ -78,7 +125,7 @@
          }
  
          DedicatedServer.LOGGER.info("Loading properties");
@@ -120,7 +108,7 @@
          this.r = new EULA(new File("eula.txt"));
          if (!this.r.a()) {
              DedicatedServer.LOGGER.info("You need to agree to the EULA in order to run the server. Go to eula.txt for more info.");
-@@ -134,6 +180,8 @@
+@@ -134,6 +181,8 @@
                  return false;
              }
  
@@ -129,7 +117,7 @@
              if (!this.getOnlineMode()) {
                  DedicatedServer.LOGGER.warn("**** SERVER IS RUNNING IN OFFLINE/INSECURE MODE!");
                  DedicatedServer.LOGGER.warn("The server will make no attempt to authenticate usernames. Beware.");
-@@ -148,7 +196,7 @@
+@@ -148,7 +197,7 @@
              if (!NameReferencingFileConverter.a(this.propertyManager)) {
                  return false;
              } else {
@@ -138,7 +126,7 @@
                  long j = System.nanoTime();
  
                  if (this.S() == null) {
-@@ -206,7 +254,18 @@
+@@ -206,7 +255,18 @@
                      DedicatedServer.LOGGER.info("Starting remote control listener");
                      this.p = new RemoteControlListener(this);
                      this.p.a();
@@ -157,7 +145,7 @@
  
                  if (this.aP() > 0L) {
                      Thread thread1 = new Thread(new ThreadWatchdog(this));
-@@ -266,7 +325,7 @@
+@@ -266,7 +326,7 @@
          return this.propertyManager.getBoolean("hardcore", false);
      }
  
@@ -166,7 +154,7 @@
  
      public CrashReport b(CrashReport crashreport) {
          crashreport = super.b(crashreport);
-@@ -293,11 +352,11 @@
+@@ -293,11 +353,11 @@
          return crashreport;
      }
  
@@ -180,7 +168,7 @@
          super.D();
          this.aL();
      }
-@@ -328,7 +387,15 @@
+@@ -328,7 +388,15 @@
          while (!this.serverCommandQueue.isEmpty()) {
              ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0);
  
@@ -197,7 +185,7 @@
          }
  
      }
-@@ -535,16 +602,70 @@
+@@ -535,16 +603,70 @@
      }
  
      public String getPlugins() {
@@ -218,17 +206,17 @@
 +                if (i > 0) {
 +                    result.append("; ");
 +                }
-+
-+                result.append(plugins[i].getDescription().getName());
-+                result.append(" ");
-+                result.append(plugins[i].getDescription().getVersion().replaceAll(";", ","));
-+            }
-+        }
  
 -    public String executeRemoteCommand(String s) {
 -        this.remoteControlCommandListener.clearMessages();
 -        this.b.a(this.remoteControlCommandListener, s);
 -        return this.remoteControlCommandListener.getMessages();
++                result.append(plugins[i].getDescription().getName());
++                result.append(" ");
++                result.append(plugins[i].getDescription().getVersion().replaceAll(";", ","));
++            }
++        }
++
 +        return result.toString();
 +        // CraftBukkit end
 +    }
-- 
cgit v1.2.3