Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6722)
This commit is contained in:
parent
90f717fa5a
commit
a3dfe6dca5
365 changed files with 725 additions and 732 deletions
|
@ -6,10 +6,10 @@ Subject: [PATCH] Expose MinecraftServer#isRunning
|
|||
This allows for plugins to detect if the server is actually turning off in onDisable rather than just plugins reloading.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index d141e1edc81c1f3af8104541e571a1d34c392e76..8831a73ee723bd510d48b577f3d765beb09d45d6 100644
|
||||
index c81230560a729492557bce00aeecb683ade1b072..6de0c6aa40b2962237584156c6270489fdbaa45a 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2529,5 +2529,10 @@ public final class CraftServer implements Server {
|
||||
@@ -2557,5 +2557,10 @@ public final class CraftServer implements Server {
|
||||
public int getCurrentTick() {
|
||||
return net.minecraft.server.MinecraftServer.currentTick;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue