mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix EntityDeathEvent cancellation (#9323)

Browse source
This commit is contained in:
Lulu13022002 2023-06-12 19:03:51 +02:00 • committed by GitHub
parent f4dfdcbb5b
commit eb0693fff7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 65 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/server/0381-Add-PlayerAttackEntityCooldownResetEvent.patch
View file

@ -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 6bd0dcba534926716e26da6c171737ff1bc91ea7..909ff425123228437cf3ab39c6733cd0a6dd2ef1 100644
index 5132df70d5ef092030db43275b6526b8ac465d1f..02f5992f859163ea3fa77b3607bc9a0a29c17723 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2169,7 +2169,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2172,7 +2172,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
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) {