diff options
Diffstat (limited to 'patches/server/0972-Brigadier-based-command-API.patch')
-rw-r--r-- | patches/server/0972-Brigadier-based-command-API.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/server/0972-Brigadier-based-command-API.patch b/patches/server/0972-Brigadier-based-command-API.patch index de3edd2e00..4c899f8032 100644 --- a/patches/server/0972-Brigadier-based-command-API.patch +++ b/patches/server/0972-Brigadier-based-command-API.patch @@ -2378,7 +2378,7 @@ index 134f31cce8d8eca669948a784e2766216fb91ab5..60c65af218d533d53b765ba2175fed16 // CraftBukkit end diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 70b13bab453d50d72c3df9fed06b3956fe2703fe..2f7119ca17cf0df445c0c34804e40acb209a5b0d 100644 +index 65b89919440c0c901fcfd981a5abe317bae12c10..d8edc950000002f048c09d3d6582af1ffb314dde 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -272,11 +272,11 @@ public final class CraftServer implements Server { @@ -2409,7 +2409,7 @@ index 70b13bab453d50d72c3df9fed06b3956fe2703fe..2f7119ca17cf0df445c0c34804e40acb CraftRegistry.setMinecraftRegistry(console.registryAccess()); -@@ -593,48 +599,11 @@ public final class CraftServer implements Server { +@@ -601,48 +607,11 @@ public final class CraftServer implements Server { } private void setVanillaCommands(boolean first) { // Spigot @@ -2460,7 +2460,7 @@ index 70b13bab453d50d72c3df9fed06b3956fe2703fe..2f7119ca17cf0df445c0c34804e40acb // Refresh commands for (ServerPlayer player : this.getHandle().players) { -@@ -1021,17 +990,31 @@ public final class CraftServer implements Server { +@@ -1029,17 +998,31 @@ public final class CraftServer implements Server { return true; } @@ -2502,7 +2502,7 @@ index 70b13bab453d50d72c3df9fed06b3956fe2703fe..2f7119ca17cf0df445c0c34804e40acb return false; } -@@ -1040,7 +1023,7 @@ public final class CraftServer implements Server { +@@ -1048,7 +1031,7 @@ public final class CraftServer implements Server { public void reload() { // Paper start - lifecycle events if (io.papermc.paper.plugin.lifecycle.event.LifecycleEventRunner.INSTANCE.blocksPluginReloading()) { @@ -2511,7 +2511,7 @@ index 70b13bab453d50d72c3df9fed06b3956fe2703fe..2f7119ca17cf0df445c0c34804e40acb } // Paper end - lifecycle events org.spigotmc.WatchdogThread.hasStarted = false; // Paper - Disable watchdog early timeout on reload -@@ -1094,8 +1077,9 @@ public final class CraftServer implements Server { +@@ -1102,8 +1085,9 @@ public final class CraftServer implements Server { } Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper @@ -2522,7 +2522,7 @@ index 70b13bab453d50d72c3df9fed06b3956fe2703fe..2f7119ca17cf0df445c0c34804e40acb // Paper start for (Plugin plugin : pluginClone) { entityMetadata.removeAll(plugin); -@@ -1135,6 +1119,12 @@ public final class CraftServer implements Server { +@@ -1143,6 +1127,12 @@ public final class CraftServer implements Server { this.enablePlugins(PluginLoadOrder.STARTUP); this.enablePlugins(PluginLoadOrder.POSTWORLD); if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins |