Revert some changes (#264)

patches/server/0010-Allow-Disabling-Explicit-Network-Manager-Flushing.patch

@@ -9,17 +9,17 @@ The logic has been improved to do the
 flushing in the netty event loop, so it doesn't flush on the main
 thread.
 
-Disable flushing by passing -Dpanda.disable-explicit-flush=true
+Disable flushing by passing -Dpaper.explicit-flush=false
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index fcf54e3a138f8408d7b85f087be03ca8cedb45f9..cb46e738f2c4a49aca5d5d57e5a4e24756312f26 100644
+index fcf54e3a138f8408d7b85f087be03ca8cedb45f9..9b8415a334d7e8527ec39d32e7ab1b81be876b54 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -74,6 +74,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
      private IChatBaseComponent n;
      private boolean o;
      private boolean p;
-+    private static boolean disableExplicitFlush = Boolean.getBoolean("panda.disable-explicit-flush"); // PandaSpigot
++    private static boolean enableExplicitFlush = Boolean.getBoolean("paper.explicit-flush"); // PandaSpigot
 
      public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
          this.h = enumprotocoldirection;
@@ -28,7 +28,19 @@ index fcf54e3a138f8408d7b85f087be03ca8cedb45f9..cb46e738f2c4a49aca5d5d57e5a4e247
          }
 
 -        this.channel.flush();
-+        if (!disableExplicitFlush) this.channel.eventLoop().execute(() -> this.channel.flush()); // PandaSpigot - Allow Disabling Explicit Network Manager Flushing
++        if (enableExplicitFlush) this.channel.eventLoop().execute(() -> this.channel.flush()); // PandaSpigot - Allow Disabling Explicit Network Manager Flushing
      }
 
      public SocketAddress getSocketAddress() {
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index 5c980fe2907d2ff01be793ab0654ab198f46e519..c3768c33f240799deb5f92b5141c962e41b11827 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -17,6 +17,7 @@ public class Main {
+     public static boolean useConsole = true;
+
+     public static void main(String[] args) {
++        if (System.getProperty("paper.explicit-flush") == null) System.setProperty("paper.explicit-flush", "true"); // PandaSpigot
+         // Todo: Installation script
+         OptionParser parser = new OptionParser() {
+             {

patches/server/0011-Optimize-Network-Manager-and-add-advanced-packet-sup.patch

@@ -26,7 +26,7 @@ Also avoids spamming closed channel exception by rechecking closed state in disp
 and then catch exceptions and close if they fire.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index cb46e738f2c4a49aca5d5d57e5a4e24756312f26..ae05ce96cb478b32209270e0456a3616776faf5a 100644
+index 9ece4582635db8d9547302421b44f67e262fd0f7..7d5a3c4b6d9958efde5f918963631603efd33877 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -62,7 +62,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
@@ -41,7 +41,7 @@ index cb46e738f2c4a49aca5d5d57e5a4e24756312f26..ae05ce96cb478b32209270e0456a3616
 @@ -75,6 +75,11 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet> {
      private boolean o;
      private boolean p;
-     private static boolean disableExplicitFlush = Boolean.getBoolean("panda.disable-explicit-flush"); // PandaSpigot
+     private static boolean enableExplicitFlush = Boolean.getBoolean("paper.explicit-flush"); // PandaSpigot
 +    // PandaSpigot start - Optimize Network
 +    public boolean isPending = true;
 +    public boolean queueImmunity = false;

patches/server/0015-PandaSpigot-Configuration.patch

@@ -206,10 +206,10 @@ index ad8c5da90fc64825185aedcfdf89a6ff013a7a81..1caffab6e75abf6010e8f1f2d2a29a2a
 
          pluginManager.clearPlugins();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 5c980fe2907d2ff01be793ab0654ab198f46e519..fc6061a800b6e8a61eda70aadc6abb3627805916 100644
+index c3768c33f240799deb5f92b5141c962e41b11827..7ec64221dca7da2d0d52628a59e303eeb44b2621 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -130,6 +130,14 @@ public class Main {
+@@ -131,6 +131,14 @@ public class Main {
                          .defaultsTo(new File("paper.yml"))
                          .describedAs("Yml file");
                  // PaperSpigot End

patches/server/0021-Set-cap-on-JDK-per-thread-native-byte-buffer-cache.patch

@@ -17,12 +17,12 @@ keeping long lived large direct buffers in cache.
 Set system properly at server startup if not set already to help protect from this.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index fc6061a800b6e8a61eda70aadc6abb3627805916..715fb447a1428953d7e1425cb12a5e8dcff574e8 100644
+index 7ec64221dca7da2d0d52628a59e303eeb44b2621..abf3a9f32e55a893b6f451c1e89de38c17ca90b3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -18,6 +18,7 @@ public class Main {
-
+@@ -19,6 +19,7 @@ public class Main {
      public static void main(String[] args) {
+         if (System.getProperty("paper.explicit-flush") == null) System.setProperty("paper.explicit-flush", "true"); // PandaSpigot
          // Todo: Installation script
 +        if (System.getProperty("jdk.nio.maxCachedBufferSize") == null) System.setProperty("jdk.nio.maxCachedBufferSize", "262144"); // PandaSpigot - cap per-thread NIO cache size
          OptionParser parser = new OptionParser() {

patches/server/0040-Use-TerminalConsoleAppender-for-console-improvements.patch

@@ -337,7 +337,7 @@ index e218b127c6dcdce2c4f8154684f58d4295c6c247..e355f31d852fa15ff2c6bba55931f38b
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 715fb447a1428953d7e1425cb12a5e8dcff574e8..697f5a9f0a398d561d771bca7fe2b637a7725b56 100644
+index abf3a9f32e55a893b6f451c1e89de38c17ca90b3..39296a28458bb52b317187b96eec6a2b98230d97 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -10,7 +10,7 @@ import java.util.logging.Logger;
@@ -349,15 +349,15 @@ index 715fb447a1428953d7e1425cb12a5e8dcff574e8..697f5a9f0a398d561d771bca7fe2b637
 
  public class Main {
      public static boolean useJline = true;
-@@ -167,6 +167,7 @@ public class Main {
+@@ -168,6 +168,7 @@ public class Main {
              }
 
              try {
 +                /* // PandaSpigot - Handled by TerminalConsoleAppender
                  // This trick bypasses Maven Shade's clever rewriting of our getProperty call when using String literals
                  String jline_UnsupportedTerminal = new String(new char[] {'j','l','i','n','e','.','U','n','s','u','p','p','o','r','t','e','d','T','e','r','m','i','n','a','l'});
                  String jline_terminal = new String(new char[] {'j','l','i','n','e','.','t','e','r','m','i','n','a','l'});
-@@ -184,10 +185,21 @@ public class Main {
+@@ -185,10 +186,21 @@ public class Main {
                      // This ensures the terminal literal will always match the jline implementation
                      System.setProperty(jline.TerminalFactory.JLINE_TERMINAL, jline.UnsupportedTerminal.class.getName());
                  }
@@ -379,7 +379,7 @@ index 715fb447a1428953d7e1425cb12a5e8dcff574e8..697f5a9f0a398d561d771bca7fe2b637
                  }
 
                  // Spigot Start
-@@ -206,6 +218,7 @@ public class Main {
+@@ -207,6 +219,7 @@ public class Main {
                      System.out.println( "Please see http://www.spigotmc.org/wiki/changing-permgen-size/ for more details and more in-depth instructions." );
                  }
                  // Spigot End

patches/server/0080-Add-command-line-option-to-load-extra-plugin-jars-no.patch

@@ -7,7 +7,7 @@ Subject: [PATCH] Add command line option to load extra plugin jars not in the
 ex: java -jar paperclip.jar nogui -add-plugin=/path/to/plugin.jar -add-plugin=/path/to/another/plugin_jar.jar
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cdff7613b406a39d102ab94395c4fb107ae356e8..3b9325010cd1bfce07cefe0b8514d33d39fd9136 100644
+index 949100d67ab3cc6e06e82a0eb64d9e5cbb4acb34..0c6cdfed088a26380e6fe7052e747efeedda7b1e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -136,7 +136,7 @@ public final class CraftServer implements Server {
@@ -75,10 +75,10 @@ index cdff7613b406a39d102ab94395c4fb107ae356e8..3b9325010cd1bfce07cefe0b8514d33d
          if (type == PluginLoadOrder.STARTUP) {
              helpMap.clear();
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 697f5a9f0a398d561d771bca7fe2b637a7725b56..3fdc95dc79531f909728af4e543a3f9b621f5159 100644
+index 39296a28458bb52b317187b96eec6a2b98230d97..598e9d06e5491eb79cc5f253ca9e1de7c025eec6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -138,6 +138,11 @@ public class Main {
+@@ -139,6 +139,11 @@ public class Main {
                          .ofType(File.class)
                          .defaultsTo(new File("pandaspigot.yml"))
                          .describedAs("Yml file");

patches/server/0103-Remove-unnecessary-permgen-size-check.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Remove unnecessary permgen size check
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 3fdc95dc79531f909728af4e543a3f9b621f5159..e8e264ec639594aa282648e9797e1bb4dae1cfd9 100644
+index 598e9d06e5491eb79cc5f253ca9e1de7c025eec6..1d64ed78786912749156a0a853b9e9787a4fec3a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -207,6 +207,8 @@ public class Main {
+@@ -208,6 +208,8 @@ public class Main {
                      // PandaSpigot end
                  }
 
@@ -17,7 +17,7 @@ index 3fdc95dc79531f909728af4e543a3f9b621f5159..e8e264ec639594aa282648e9797e1bb4
                  // Spigot Start
                  int maxPermGen = 0; // In kb
                  for ( String s : java.lang.management.ManagementFactory.getRuntimeMXBean().getInputArguments() )
-@@ -223,6 +225,8 @@ public class Main {
+@@ -224,6 +226,8 @@ public class Main {
                      System.out.println( "Please see http://www.spigotmc.org/wiki/changing-permgen-size/ for more details and more in-depth instructions." );
                  }
                  // Spigot End