Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@ed44f69 Fix NamespacedKey#equals not accepting other Key types (#8919)
PaperMC/Paper@e2b8e6b chore: update adventure documentation url in javadocs (#8912)
PaperMC/Paper@2f953a8 Additional ExplosiveMinecart API (#8896)
PaperMC/Paper@fc072c0 Fix forced respawn with respawn anchor (#8845)
PaperMC/Paper@16fc1a1 Make PluginProviderContext#getLogger return ComponentLogger, remove PluginProviderContext#getSLF4JLogger (#8921)
PaperMC/Paper@9256248 [ci skip] Update README and CONTRIBUTING (#8917)
PaperMC/Paper@ad3e1bc Don't log or die on cyclic dependencies of Spigot plugins
This commit is contained in:
granny
2023-02-27 03:32:11 -08:00
parent 387a581a42
commit afcd5b6f10
6 changed files with 14 additions and 14 deletions

View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Barrels and enderchests 6 rows
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 83b080cfd15b03878acca503f0f416166fbc4e5c..168abc1f0c795bf840ca87b301dfa85ac0b5dd16 100644
index e978172bacfba940a112c35bc666a59b2e1fa83b..f1c3737d5cff959db2cdb3be672987c603c1ca6c 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1138,6 +1138,27 @@ public abstract class PlayerList {
@@ -1140,6 +1140,27 @@ public abstract class PlayerList {
player.getBukkitEntity().recalculatePermissions(); // CraftBukkit
this.server.getCommands().sendCommands(player);
} // Paper
@@ -37,7 +37,7 @@ index 83b080cfd15b03878acca503f0f416166fbc4e5c..168abc1f0c795bf840ca87b301dfa85a
public boolean isWhiteListed(GameProfile profile) {
diff --git a/src/main/java/net/minecraft/world/entity/player/Player.java b/src/main/java/net/minecraft/world/entity/player/Player.java
index e0f3375653db94d5fd2e154b72cae3d2113aaab1..aa41679dec3c87c5af8721c710adcad7cdd65f8b 100644
index 34906d3237388d548604de2577f64ff084ed0838..a0cd61f73bdc50cd29125c5e3f9fc47c3c3c5608 100644
--- a/src/main/java/net/minecraft/world/entity/player/Player.java
+++ b/src/main/java/net/minecraft/world/entity/player/Player.java
@@ -183,6 +183,7 @@ public abstract class Player extends LivingEntity {