Fix thorns and other attack effects being applied to shooter

Fixes #90
ThexXTURBOXx · Feb 8, 2025 · e917772 · e917772
1 parent 0ca1bf4
commit e917772
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/common/src/main/java/ckathode/weaponmod/entity/projectile/EntityProjectile.java b/common/src/main/java/ckathode/weaponmod/entity/projectile/EntityProjectile.java
@@ -329,13 +329,13 @@ public void applyEntityHitEffects(Entity entity) {
         }
         if (entity instanceof LivingEntity livingEntity) {
             doKnockback(livingEntity, getDamageSource());
-            Entity shooter = getOwner();
-            if (shooter != null && level() instanceof ServerLevel serverLevel) {
-                EnchantmentHelper.doPostAttackEffectsWithItemSource(serverLevel, shooter,
+            if (level() instanceof ServerLevel serverLevel) {
+                EnchantmentHelper.doPostAttackEffectsWithItemSource(serverLevel, livingEntity,
                         getDamageSource(), getWeaponItem());
             }
-            if (shooter instanceof ServerPlayer && !entity.equals(getOwner()) && entity instanceof Player) {
-                ((ServerPlayer) shooter).connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.ARROW_HIT_PLAYER, 0.0f));
+            Entity shooter = getOwner();
+            if (shooter instanceof ServerPlayer sp && !entity.equals(getOwner()) && entity instanceof Player) {
+                sp.connection.send(new ClientboundGameEventPacket(ClientboundGameEventPacket.ARROW_HIT_PLAYER, 0.0f));
             }
         }
     }