From fd2bd5e436b9a070c8f2a9eff232b5411dbed53e Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 14 Mar 2025 06:56:12 +1100 Subject: [PATCH] SPIGOT-8016: Use correct source entity for mace knockback event --- nms-patches/net/minecraft/world/item/MaceItem.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nms-patches/net/minecraft/world/item/MaceItem.patch b/nms-patches/net/minecraft/world/item/MaceItem.patch index 999b46797..63df5a7ac 100644 --- a/nms-patches/net/minecraft/world/item/MaceItem.patch +++ b/nms-patches/net/minecraft/world/item/MaceItem.patch @@ -20,7 +20,7 @@ + // CraftBukkit start - EntityKnockbackEvent + Vec3D vec3dPush = new Vec3D(vec3d1.x, 0.699999988079071D, vec3d1.z); + Vec3D result = entity.getDeltaMovement().add(vec3dPush); -+ org.bukkit.event.entity.EntityKnockbackEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityKnockbackEvent((org.bukkit.craftbukkit.entity.CraftLivingEntity) entityliving.getBukkitEntity(), entity1, org.bukkit.event.entity.EntityKnockbackEvent.KnockbackCause.ENTITY_ATTACK, d0, result, vec3dPush.x, vec3dPush.y, vec3dPush.z); ++ org.bukkit.event.entity.EntityKnockbackEvent event = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityKnockbackEvent((org.bukkit.craftbukkit.entity.CraftLivingEntity) entityliving.getBukkitEntity(), entity, org.bukkit.event.entity.EntityKnockbackEvent.KnockbackCause.ENTITY_ATTACK, d0, result, vec3dPush.x, vec3dPush.y, vec3dPush.z); + if (!event.isCancelled()) { + entityliving.push(CraftVector.toNMS(event.getFinalKnockback())); + }