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

@@ -105,7 +105,7 @@ index 8bae26d296eb73642fa1a2f83ec1a28fadcade0c..2f98c6a031a4e08c8395c326d35b129c
this.world = new CraftWorld((ServerLevel) this, gen, biomeProvider, env);
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 8911766b8e7d4d30765cafe1533134d356bf60db..bad6344243358df99fac031b0fab021493b733a1 100644
index d5b553bb34e988ce916ab5cdc53a8a99b141b00d..cc779a1a5b11a92366fd04585369e0d93eb184f4 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -957,6 +957,7 @@ public final class CraftServer implements Server {
@@ -132,7 +132,7 @@ index 8911766b8e7d4d30765cafe1533134d356bf60db..bad6344243358df99fac031b0fab0214
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2721,6 +2724,18 @@ public final class CraftServer implements Server {
@@ -2722,6 +2725,18 @@ public final class CraftServer implements Server {
return CraftServer.this.console.paperConfigurations.createLegacyObject(CraftServer.this.console);
}