Remove Patches (#7541)

1 files changed, 52 insertions, 0 deletions

diff --git a/patches/server/0148-Fix-this-stupid-bullshit.patch b/patches/server/0148-Fix-this-stupid-bullshit.patch
new file mode 100644
index 0000000000..0e67ea0838
--- /dev/null
+++ b/patches/server/0148-Fix-this-stupid-bullshit.patch
@@ -0,0 +1,52 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Kyle Wood <[email protected]>
+Date: Sun, 6 Aug 2017 17:17:53 -0500
+Subject: [PATCH] Fix this stupid bullshit
+
+Disable the 15 second sleep when the server jar hasn't been rebuilt within a period of time.
+
+modified in order to prevent merge conflicts when Spigot changes/disables the warning,
+and to provide some level of hint without being disruptive.
+
+diff --git a/src/main/java/net/minecraft/server/Bootstrap.java b/src/main/java/net/minecraft/server/Bootstrap.java
+index 9f23951f6b4c17c2a968fdcb3e8f9f65c296f34a..248b7ca7dbd75d4eab52fb937cace2b2d9ee3467 100644
+--- a/src/main/java/net/minecraft/server/Bootstrap.java
++++ b/src/main/java/net/minecraft/server/Bootstrap.java
+@@ -47,7 +47,7 @@ public class Bootstrap {
+     public static void bootStrap() {
+         if (!Bootstrap.isBootstrapped) {
+             // CraftBukkit start
+-            String name = Bootstrap.class.getSimpleName();
++            /*String name = Bootstrap.class.getSimpleName(); // Paper - actually, I don't think this class should ever have been called DispenserRegistry, that's a stupid name, bootstrap is waaay better
+             switch (name) {
+                 case "DispenserRegistry":
+                     break;
+@@ -61,7 +61,7 @@ public class Bootstrap {
+                     System.err.println("*** WARNING: This server jar is unsupported, use at your own risk. ***");
+                     System.err.println("**********************************************************************");
+                     break;
+-            }
++            }*/ // Paper
+             // CraftBukkit end
+             Bootstrap.isBootstrapped = true;
+             if (Registry.REGISTRY.keySet().isEmpty()) {
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index 1e49bff6e1ccd7cf8405785c73f56caada94e399..08f4ba483a6c61365310de6561b314e428a6b978 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -234,10 +234,12 @@ public class Main {
+                     Calendar deadline = Calendar.getInstance();
+                     deadline.add(Calendar.DAY_OF_YEAR, -3);
+                     if (buildDate.before(deadline.getTime())) {
+-                        System.err.println("*** Error, this build is outdated ***");
++                        // Paper start - This is some stupid bullshit
++                        System.err.println("*** Warning, you've not updated in a while! ***");
+                         System.err.println("*** Please download a new build as per instructions from https://papermc.io/downloads ***"); // Paper
+-                        System.err.println("*** Server will start in 20 seconds ***");
+-                        Thread.sleep(TimeUnit.SECONDS.toMillis(20));
++                        //System.err.println("*** Server will start in 20 seconds ***");
++                        //Thread.sleep(TimeUnit.SECONDS.toMillis(20));
++                        // Paper End
+                     }
+                 }
+