diff options
Diffstat (limited to 'patches/server/0391-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch')
| -rw-r--r-- | patches/server/0391-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/patches/server/0391-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0391-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch new file mode 100644 index 0000000000..248e9dd5ca --- /dev/null +++ b/patches/server/0391-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Aikar <[email protected]> +Date: Sun, 5 Jul 2020 14:59:31 -0400 +Subject: [PATCH] Don't check chunk for portal on world gen entity add + + +diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java +index c640d68c35b4454bfa0ae1764dee341041d9c31e..4bf48ce1824e404906a551ceec720c8e485adb44 100644 +--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java ++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +@@ -3624,7 +3624,7 @@ public abstract class LivingEntity extends Entity implements Attackable { + Entity entity = this.getVehicle(); + + super.stopRiding(suppressCancellation); // Paper - Force entity dismount during teleportation +- if (entity != null && entity != this.getVehicle() && !this.level().isClientSide) { ++ if (entity != null && entity != this.getVehicle() && !this.level().isClientSide && entity.valid) { // Paper - don't process on world gen + this.dismountVehicle(entity); + } + |