From 3dbcf242c6e4b0b4b94ce8ac7d5d1f6991761276 Mon Sep 17 00:00:00 2001 From: MiniDigger | Martin Date: Sat, 12 Jun 2021 19:13:23 +0200 Subject: [PATCH] Fix this stupid bullshit v2 --- patches/server/Fix-this-stupid-bullshit.patch | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/patches/server/Fix-this-stupid-bullshit.patch b/patches/server/Fix-this-stupid-bullshit.patch index df33fd65b8..8afd4de533 100644 --- a/patches/server/Fix-this-stupid-bullshit.patch +++ b/patches/server/Fix-this-stupid-bullshit.patch @@ -8,6 +8,28 @@ Disable the 15 second sleep when the server jar hasn't been rebuilt within a per 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/net/minecraft/server/Bootstrap.java ++++ b/src/main/java/net/minecraft/server/Bootstrap.java +@@ -0,0 +0,0 @@ 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; +@@ -0,0 +0,0 @@ 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 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/Main.java