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

fix knockback events (#10831)

Browse source 
* fix knockback events

* squash

* handle cancelled event for explosions
This commit is contained in:
Jake Potrebic 2024-05-30 13:17:16 -07:00 • committed by GitHub
parent 06e69c8991
commit a47e11d464
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
36 changed files with 509 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

4
patches/server/0350-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 b8ea7830f9dc1b4ee0052bf3b83127c415cc8085..2f3615cb8e4206ed2eb87c1341de4258879d3907 100644
index 8c95f08302439c7bd36ae9834ea991b29c435cfa..166502bdeb4e20a122c023935f48047debc69bbd 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -2264,7 +2264,16 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -2254,7 +2254,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) {