Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@1d2d9566 fix(#13144): Entity pathfinding paths do not appear with 1.21.9 debug flag enabled (#13202)
PaperMC/Paper@cf02a071 Add Particle.Spell support to ParticleBuilder#color(Color, float) (#13128)
PaperMC/Paper@97452e19 Improvements for Player#openBook (#12582)
PaperMC/Paper@d16e03fb [ci/skip] Add IntelliJ tips to CONTRIBUTING.md (#13299)
This commit is contained in:
granny
2025-11-13 13:19:42 -08:00
parent 56ac4ded5a
commit d22f66f2ad
5 changed files with 18 additions and 7 deletions

View File

@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
index ecb01b035d81a42911db1c8364e23ccba4a8b790..56bbaab57432a78e85bc0013cd7f991f662f0cd2 100644
index 29c08d097b487b177426ec2ea78f8fe79d987bdc..b615c03d73071c923e0a3d1123810e110419318b 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1382,6 +1382,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
@@ -1390,6 +1390,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa
// Minecraft does not currently support teleporting players between worlds with passengers.
// It causes them to be dismounted, and causes weird behavior.
if (location.getWorld() != this.getWorld() && !this.getHandle().passengers.isEmpty()) {