Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@8dc76e7 [ci skip] Move back more
PaperMC/Paper@4803421 Fix Player.setPlayerListOrder to send update to clients (#11729)
PaperMC/Paper@b746d9d Add missing UPDATE_HAT and UPDATE_LIST_ORDER to some paper-added functions in ClientboundPlayerInfoUpdatePacket (#11731)
This commit is contained in:
granny
2024-12-11 19:38:54 -08:00
parent ba378a71be
commit 9f0aa881d5
8 changed files with 16 additions and 16 deletions

View File

@@ -83,10 +83,10 @@ index 12c65755f85acce10c2d5359539d64498138127b..c0b6efefc4d4f31602f39afa76f83730
}
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index cfc85a7089de9e30ac9a703b87440475cc2e2cf0..ad477e53a2a33e47a5bac42eebe46a59ece659ee 100644
index 5ac1f31892849fe507a59480e3383530d1c89db8..57515361aab6dbf0ec7d4029b34a48b36c4f498b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1441,6 +1441,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1449,6 +1449,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
// Paper start - Teleport passenger API
// Don't allow teleporting between worlds while keeping passengers
if (ignorePassengers && entity.isVehicle() && location.getWorld() != this.getWorld()) {