Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6722)
This commit is contained in:
parent
90f717fa5a
commit
a3dfe6dca5
365 changed files with 725 additions and 732 deletions
|
@ -5,7 +5,7 @@ Subject: [PATCH] Implement Mob Goal API
|
|||
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index b35e54380cb23758a813fa24d13b888f36906c23..12c2681e0abef8ea4981deec431a9269df6cea54 100644
|
||||
index 03c9f894a2eaa065c456843eef4d3ab1a25565c3..e666319d8472bd860442acacc16f595e3bb195f2 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -62,6 +62,7 @@ dependencies {
|
||||
|
@ -798,10 +798,10 @@ index fabd20265863751ad980ee4a697f3f0d47df101f..3a4da2bb86a742985d309eb325dc843a
|
|||
LOOK,
|
||||
JUMP,
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index bc152fea503bfb43eb39b2c18c15a7c557bb08b7..a6068abb1fa7b2f2d6aba1df0cd8b2799c9d6226 100644
|
||||
index 1e34f8d2c3b14ed6a42930099d3130c4d589d48c..df5a9d6b1b8117080ede57f443dc79b875145461 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -2542,5 +2542,11 @@ public final class CraftServer implements Server {
|
||||
@@ -2570,5 +2570,11 @@ public final class CraftServer implements Server {
|
||||
public boolean isStopping() {
|
||||
return net.minecraft.server.MinecraftServer.getServer().hasStopped();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue