diff options
| author | Jake Potrebic <[email protected]> | 2021-12-08 10:25:57 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-08 10:25:57 -0800 |
| commit | 74fd151adc918a8688a09838f883a08008da3e88 (patch) | |
| tree | e62f51f25fa43cdf639fe536c62c81d22ba3f52e /patches/server/0402-Don-t-run-entity-collision-code-if-not-needed.patch | |
| parent | 33ea869a657073258ac552d3ab9c622c768a2d9b (diff) | |
| download | Paper-74fd151adc918a8688a09838f883a08008da3e88.tar.gz Paper-74fd151adc918a8688a09838f883a08008da3e88.zip | |
Fix entity equipment on cancellation of EntityDeathEvent (#5740)
Diffstat (limited to 'patches/server/0402-Don-t-run-entity-collision-code-if-not-needed.patch')
| -rw-r--r-- | patches/server/0402-Don-t-run-entity-collision-code-if-not-needed.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0402-Don-t-run-entity-collision-code-if-not-needed.patch b/patches/server/0402-Don-t-run-entity-collision-code-if-not-needed.patch index 26127f5601..7e27487f4c 100644 --- a/patches/server/0402-Don-t-run-entity-collision-code-if-not-needed.patch +++ b/patches/server/0402-Don-t-run-entity-collision-code-if-not-needed.patch @@ -7,10 +7,10 @@ Will not run if max entity craming is disabled and the max collisions per entity is less than or equal to 0 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index e8501f18f5021678fad09cb5e600c7fc3660fe52..f0af402ec09a1893e9d7ddd6aa355fd262f3b631 100644 +index 1b9b49caf8d0e2b77064273a4fa1975fa3d5238f..d5a70e9fc2a2a85d7262832687770b9693f05f41 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3261,10 +3261,16 @@ public abstract class LivingEntity extends Entity { +@@ -3270,10 +3270,16 @@ public abstract class LivingEntity extends Entity { protected void serverAiStep() {} protected void pushEntities() { |