Merge pull request CivClassic#6 from Diet-Cola/first-hit-fix

Fix first hit issue
Diet-Cola · Mar 2, 2022 · 3b0f5d0 · 3b0f5d0
2 parents cf74256 + 65183bc
commit 3b0f5d0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/paper/src/main/java/com/github/maxopoly/finale/combat/CombatUtil.java b/paper/src/main/java/com/github/maxopoly/finale/combat/CombatUtil.java
@@ -63,8 +63,8 @@ public static void attack(net.minecraft.world.entity.player.Player attacker, Ent
         if (victim.isAttackable() && !victim.skipAttackInteraction(attacker)) {
 			float damage = (float) attacker.getAttribute(Attributes.ATTACK_DAMAGE).getValue();
 			float f1 = (victim instanceof LivingEntity) ?
-					EnchantmentHelper.getDamageBonus(attacker.getItemInHand(attacker.swingingArm), ((LivingEntity) victim).getMobType()) :
-					EnchantmentHelper.getDamageBonus(attacker.getItemInHand(attacker.swingingArm), MobType.UNDEFINED);
+					EnchantmentHelper.getDamageBonus(attacker.getItemInHand(attacker.getUsedItemHand()), ((LivingEntity) victim).getMobType()) :
+					EnchantmentHelper.getDamageBonus(attacker.getItemInHand(attacker.getUsedItemHand()), MobType.UNDEFINED);
 
 			float f2 = 0;
 			boolean shouldKnockback = true;