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/0410-Add-PlayerAttackEntityCooldownResetEvent.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/0410-Add-PlayerAttackEntityCooldownResetEvent.patch')
| -rw-r--r-- | patches/server/0410-Add-PlayerAttackEntityCooldownResetEvent.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0410-Add-PlayerAttackEntityCooldownResetEvent.patch b/patches/server/0410-Add-PlayerAttackEntityCooldownResetEvent.patch index 8256db4306..9876e98e86 100644 --- a/patches/server/0410-Add-PlayerAttackEntityCooldownResetEvent.patch +++ b/patches/server/0410-Add-PlayerAttackEntityCooldownResetEvent.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerAttackEntityCooldownResetEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index f0af402ec09a1893e9d7ddd6aa355fd262f3b631..d23b82e5b6168ea618922f46a0e1ee7f46fad8f9 100644 +index d5a70e9fc2a2a85d7262832687770b9693f05f41..0fc95a0ef5ed17b5cefcc72533783857faa2e749 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -2039,7 +2039,16 @@ public abstract class LivingEntity extends Entity { +@@ -2048,7 +2048,16 @@ public abstract class LivingEntity extends Entity { EntityDamageEvent event = CraftEventFactory.handleLivingEntityDamageEvent(this, damagesource, originalDamage, hardHatModifier, blockingModifier, armorModifier, resistanceModifier, magicModifier, absorptionModifier, hardHat, blocking, armor, resistance, magic, absorption); if (damagesource.getEntity() instanceof net.minecraft.world.entity.player.Player) { |