diff options
| author | Lulu13022002 <[email protected]> | 2023-06-12 19:03:51 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-06-12 19:03:51 +0200 |
| commit | eb0693fff78f57402e4cd9eb313146a4eb052589 (patch) | |
| tree | f6e6f7217cbfc628f51fdde3dd8a7a505a177004 /patches/server/0376-Don-t-run-entity-collision-code-if-not-needed.patch | |
| parent | f4dfdcbb5b287b1f42b31cb3a2ddada9bbf81703 (diff) | |
| download | Paper-eb0693fff78f57402e4cd9eb313146a4eb052589.tar.gz Paper-eb0693fff78f57402e4cd9eb313146a4eb052589.zip | |
Fix EntityDeathEvent cancellation (#9323)
Diffstat (limited to 'patches/server/0376-Don-t-run-entity-collision-code-if-not-needed.patch')
| -rw-r--r-- | patches/server/0376-Don-t-run-entity-collision-code-if-not-needed.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0376-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0376-Don-t-run-entity-collision-code-if-not-needed.patch index d33987764d..5e2751c910 100644 --- a/patches/server/0376-Don-t-run-entity-collision-code-if-not-needed.patch +++ b/patches/server/0376-Don-t-run-entity-collision-code-if-not-needed.patch @@ -12,10 +12,10 @@ The entity's current team collision rule causes them to NEVER collide. Co-authored-by: Owen1212055 <[email protected]> diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 55d8856e5fdeee4d38e49f5d4a252cf61212e5cb..6bd0dcba534926716e26da6c171737ff1bc91ea7 100644 +index ba1e09e310e48d10be86d2679f6853c0cdc603c4..5132df70d5ef092030db43275b6526b8ac465d1f 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3377,10 +3377,24 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3380,10 +3380,24 @@ public abstract class LivingEntity extends Entity implements Attackable { if (this.level().isClientSide()) { this.level().getEntities(EntityTypeTest.forClass(net.minecraft.world.entity.player.Player.class), this.getBoundingBox(), EntitySelector.pushableBy(this)).forEach(this::doPush); } else { |