Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
9c9583cd2 [Auto] Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
BillyGalbreath
2020-12-12 18:54:25 -06:00
parent c51e3913e4
commit 258ae0734a
12 changed files with 34 additions and 52 deletions

View File

@@ -17,10 +17,10 @@ index 65961a03728852bd75367083a0de6fd0082b17cb..780474397acb4d0e7ecb4540e1a2db57
public final boolean spawnNpcs = this.getBoolean("spawn-npcs", true);
public final boolean pvp = this.getBoolean("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 53ed0465a9f16dd82d77baec92683f287b4996ac..2df140c9bb42e7dc7cb29de40dd8dd3988b7a9ef 100644
index 7502726207073bdac6fc4166064575696f6a7270..c2ac3c69e75de35e38aa262f0634f58005fd3daf 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2440,4 +2440,11 @@ public final class CraftServer implements Server {
@@ -2445,4 +2445,11 @@ public final class CraftServer implements Server {
return mobGoals;
}
// Paper end