From e6aaaff3f3d764c9dd92c4fc42d0f6e1b62071a5 Mon Sep 17 00:00:00 2001 From: LexManos Date: Wed, 5 Apr 2023 11:16:39 -0700 Subject: [PATCH] Temporary fix for Canceling ProjectileImpactEvents of Piercing ammo. Event needs to be re-worked to have finer control. #9370 --- .../world/entity/projectile/AbstractArrow.java.patch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/patches/minecraft/net/minecraft/world/entity/projectile/AbstractArrow.java.patch b/patches/minecraft/net/minecraft/world/entity/projectile/AbstractArrow.java.patch index d678e7dc48..068131aafa 100644 --- a/patches/minecraft/net/minecraft/world/entity/projectile/AbstractArrow.java.patch +++ b/patches/minecraft/net/minecraft/world/entity/projectile/AbstractArrow.java.patch @@ -9,12 +9,14 @@ this.m_20095_(); } -@@ -186,7 +_,7 @@ +@@ -186,7 +_,9 @@ } } - if (hitresult != null && !flag) { -+ if (hitresult != null && hitresult.m_6662_() != HitResult.Type.MISS && !flag && !net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, hitresult)) { ++ if (hitresult != null && hitresult.m_6662_() != HitResult.Type.MISS && !flag) { ++ if (net.minecraftforge.event.ForgeEventFactory.onProjectileImpact(this, hitresult)) ++ break; this.m_6532_(hitresult); this.f_19812_ = true; }