diff options
| author | Jake Potrebic <[email protected]> | 2021-12-22 10:02:31 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-22 10:02:31 -0800 |
| commit | 82eaf4ee15d77303cdd352cce9b33c2f3e5d14d7 (patch) | |
| tree | 53e4a42978675fc17acc76b85dcb0c3569ab3e3b /patches/server/0471-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch | |
| parent | 6e5ceb34eb2ef4d6c0a35c46d0eded9099bb2fee (diff) | |
| download | Paper-82eaf4ee15d77303cdd352cce9b33c2f3e5d14d7.tar.gz Paper-82eaf4ee15d77303cdd352cce9b33c2f3e5d14d7.zip | |
Fix duplicated BlockPistonRetractEvent call (#7111)
Diffstat (limited to 'patches/server/0471-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch')
| -rw-r--r-- | patches/server/0471-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/0471-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch b/patches/server/0471-Don-t-check-chunk-for-portal-on-world-gen-entity-add.patch new file mode 100644 index 0000000000..0c39cba0cd --- /dev/null +++ b/patches/server/0471-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 cd3bad5a767a060a498fa47b539e6e85ba282ca2..5c8fa0f2488b26684ff25459f384e655ce0417c5 100644 +--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java ++++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +@@ -3376,7 +3376,7 @@ public abstract class LivingEntity extends Entity { + Entity entity = this.getVehicle(); + + super.stopRiding(suppressCancellation); // Paper - suppress +- 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); + } + |