Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@3fd1502 Add missing deprecation (#8886)
PaperMC/Paper@773dd72 Updated Upstream (Bukkit/CraftBukkit) (#9739)
This commit is contained in:
granny
2023-09-22 19:33:54 -07:00
parent fbedef8a16
commit cc43efdd44
16 changed files with 37 additions and 158 deletions

View File

@@ -17,10 +17,10 @@ index 818289e831e3dad29345c43265e2efd7689bc500..1ea3012995c738c67b31e997c138f824
public final boolean spawnNpcs = this.get("spawn-npcs", true);
public final boolean pvp = this.get("pvp", true);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index ece0c8c903e9eb5890a6a770c908e624d0478671..6eb6c98492667192224dfe6981a2353fe7210a46 100644
index 3cdb675a5ae2ca3e4694d379ffe4fdb4f7831e63..139ff6af8134dd26b0ee40fa3d62a00f55e41694 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -3143,4 +3143,11 @@ public final class CraftServer implements Server {
@@ -3145,4 +3145,11 @@ public final class CraftServer implements Server {
}
// Paper end