Spigot / CraftBukkit / e14c9acbec5

Commits

Martoph authored and md_5 committed e14c9acbec5 28 Aug 2020

SPIGOT-6113: Ender Pearls thrown into portals that lead to disabled dimensions crash the server

Modified

-53
++                        CraftEventFactory.entityDamage = null;
-54
+                     }
-55
+-
-56
+-                    entity.enderTeleportTo(this.locX(), this.locY(), this.locZ());
-57
+-                    entity.fallDistance = 0.0F;
-58
+-                    entity.damageEntity(DamageSource.FALL, 5.0F);
-59
++                    // CraftBukkit end
-60
+                 }
-61
+             } else if (entity != null) {
-62
+                 entity.enderTeleportTo(this.locX(), this.locY(), this.locZ());
-+
+@@ -80,7 +100,7 @@
-+
+     public Entity b(WorldServer worldserver) {
-+
+         Entity entity = this.getShooter();
-+
-+
+-        if (entity != null && entity.world.getDimensionKey() != worldserver.getDimensionKey()) {
-+
++        if (entity != null && worldserver != null && entity.world.getDimensionKey() != worldserver.getDimensionKey()) { // CraftBukkit - SPIGOT-6113
-+
+             this.setShooter((Entity) null);
-+
+         }
-+