diff --git a/src/engine/gameManager/CombatManager.java b/src/engine/gameManager/CombatManager.java
index 86a1adb0..6a86933d 100644
--- a/src/engine/gameManager/CombatManager.java
+++ b/src/engine/gameManager/CombatManager.java
@@ -260,12 +260,16 @@ public enum CombatManager {
 
             if (target.getObjectType() == mbEnums.GameObjectType.Building)
                 hitChance = 100;
-
             int passiveAnim = getSwingAnimation(null, null, slot.equals(mbEnums.EquipSlotType.RHELD));
-            if (attacker.charItemManager.getEquipped().get(slot) != null) {
-                passiveAnim = getSwingAnimation(weapon.template, null, true);
+            if(attacker.getObjectType().equals(mbEnums.GameObjectType.Mob)){
+                if (weapon != null) {
+                    passiveAnim = getSwingAnimation(weapon.template, null, true);
+                }
+            }else {
+                if (attacker.charItemManager.getEquipped().get(slot) != null) {
+                    passiveAnim = getSwingAnimation(attacker.charItemManager.getEquipped().get(slot).template, null, true);
+                }
             }
-
             if (ThreadLocalRandom.current().nextInt(100) > hitChance) {
                 TargetedActionMsg msg = new TargetedActionMsg(attacker, target, 0f, passiveAnim);