Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@2a4aef3 Mark ChatRender#render as ApiStatus.Override
PaperMC/Paper@f5b9e07 Add GameEvent tags (#6439)
PaperMC/Paper@b173c3e Use access transformers for player profile API (#7468)
PaperMC/Paper@286bd1b 1.18 misc performance dev branch (#7368)
PaperMC/Paper@5bb4549 Fix entity armor not showing on death animation (#7355)
This commit is contained in:
BillyGalbreath
2022-02-18 20:06:35 -06:00
parent d0ea018612
commit 5ad7f4bd90
36 changed files with 101 additions and 99 deletions

View File

@@ -105,7 +105,7 @@ index 4f8b2617adc0013035cc0ca72bf1b83eb5c18c6c..7d2cc5bbeda115bae0b2cdfa89893a75
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 c47bbbdaf75b9691ce2f8436afe3eda431e76ae5..8015ed84e3e37ef0c8377bad66c5658a0279853a 100644
index 5690198dabdcc92bb9f8bd20bea830179e10cea8..15227fd4bdd53630dab390e94001734d04c2143a 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 c47bbbdaf75b9691ce2f8436afe3eda431e76ae5..8015ed84e3e37ef0c8377bad66c5658a
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");
@@ -2688,6 +2691,18 @@ public final class CraftServer implements Server {
@@ -2701,6 +2704,18 @@ public final class CraftServer implements Server {
return com.destroystokyo.paper.PaperConfig.config;
}