fix enderpearl across portals

2024-12-20 21:22:58 +01:00
parent 86378c66b3
commit 2213ce5bbc
3 changed files with 13 additions and 12 deletions
--- a/paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch
+++ b/paper-server/patches/sources/net/minecraft/world/entity/Entity.java.patch
@ -1119,15 +1119,17 @@
     }
 
     protected boolean canAddPassenger(Entity passenger) {
-@@ -2295,7 +_,7 @@
+@@ -2295,8 +_,8 @@
                     TeleportTransition portalDestination = this.portalProcess.getPortalDestination(serverLevel, this);
                     if (portalDestination != null) {
                         ServerLevel level = portalDestination.newLevel();
 -                        if (serverLevel.getServer().isLevelEnabled(level)
+-                            && (level.dimension() == serverLevel.dimension() || this.canTeleport(serverLevel, level))) {
 +                        if (this instanceof ServerPlayer // CraftBukkit - always call event for players
-                             && (level.dimension() == serverLevel.dimension() || this.canTeleport(serverLevel, level))) {
+                            || (level != null && (level.dimension() == serverLevel.dimension() || this.canTeleport(serverLevel, level)))) { // CraftBukkit
                             this.teleport(portalDestination);
                         }
+                     }
@@ -2377,7 +_,7 @@
     }