Updated Upstream (CraftBukkit/Spigot) (#5169)

This commit is contained in:
Mariell Hoversholm
2021-02-05 23:52:27 +01:00
committed by GitHub
parent 002f65b8b8
commit 8bc0c6c318
107 changed files with 340 additions and 383 deletions

View File

@@ -873,10 +873,10 @@ index 22773eca7561d39cd838338efe6d40ab9421feba..2e56fcc32f914d2b5f4bb9d368f504f4
public PathfinderGoalWrapped(int i, PathfinderGoal pathfindergoal) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index af92698d6baa9db019d37fd2400c90b03ab92364..cc4f4a8883972cb639fe9df1f583b01d0571ebb8 100644
index 0c9d9364e4544107231dc23982bd7cb3cc2f0008..4e5681a938bcea925a32ab6ec93610d9d64094a4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2326,5 +2326,11 @@ public final class CraftServer implements Server {
@@ -2327,5 +2327,11 @@ public final class CraftServer implements Server {
public boolean isStopping() {
return net.minecraft.server.MinecraftServer.getServer().hasStopped();
}