Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c7a82c1 Clean up hopper optimization patch
PaperMC/Paper@8836739 Update adventure doc links
PaperMC/Paper@81d7ff6 Properly re-add providers when reloading (#8881)
This commit is contained in:
granny
2023-02-25 23:17:13 -08:00
parent 1d7602de32
commit 387a581a42
11 changed files with 47 additions and 45 deletions

View File

@@ -17,10 +17,10 @@ index c7e4330c93baff1f3027d7c75cf857b673d38970..5134fed0cd0eedbe0c2177bce91b978b
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 d633d9da06ea08b55a57fa4e9b8104ccb074385f..1528e8ec7d475e59d93b28a8874676afdb5c96ac 100644
index 234ba3e20fd79040c1386a5c5a47a924b3d42164..ca3bb446e7f4e1585b06f462ec6844956e2a0ee6 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2941,4 +2941,11 @@ public final class CraftServer implements Server {
@@ -2942,4 +2942,11 @@ public final class CraftServer implements Server {
}
// Paper end