Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@c029645 Don't allow world unloading while ticking worlds (fixes #8080) (#8081)
PaperMC/Paper@9d0650e Don't print component in resource pack rejection message (#8084)
This commit is contained in:
BillyGalbreath
2022-07-03 04:11:37 -05:00
parent e7d3f0741a
commit 959d211f48
7 changed files with 13 additions and 13 deletions

View File

@@ -17,10 +17,10 @@ index 26345494ce190b5cd2ab58dd7d4b046796767b20..20d579a20e186e59975df1b35112015e
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 bad6344243358df99fac031b0fab021493b733a1..5fcd5c23755773613ca7a2926a60327d36c08b51 100644
index cc779a1a5b11a92366fd04585369e0d93eb184f4..317ec55ac02deb9e88fa658f2eaa150409c12127 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2911,4 +2911,11 @@ public final class CraftServer implements Server {
@@ -2912,4 +2912,11 @@ public final class CraftServer implements Server {
}
// Paper end