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

@@ -108,10 +108,10 @@ index 96dbffd6e892734a120bcb3b19bd15bdf027df8f..6b9f618c23c329235d8d62347aa3711e
this.cserver.getPluginManager().callEvent(new PlayerResourcePackStatusEvent(this.getCraftPlayer(), packStatus)); // CraftBukkit
// Paper end
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index c8dedd2bfcc633ac1be891c8016dc9384e199796..0e09db289dadb812faf6850d6cbaf202fcc2facf 100644
index f1c3737d5cff959db2cdb3be672987c603c1ca6c..1a5863a192caadac38c47a418f298394c11b8263 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -953,6 +953,8 @@ public abstract class PlayerList {
@@ -955,6 +955,8 @@ public abstract class PlayerList {
}
// Paper end