Final CombatManager

src/engine/net/client/handlers/AttackCmdMsgHandler.java

@@ -3,12 +3,15 @@ package engine.net.client.handlers;
 import engine.Enum;
 import engine.exception.MsgSendException;
 import engine.gameManager.BuildingManager;
-import engine.gameManager.FinalCombatManager;
+import engine.gameManager.CombatManager;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.AttackCmdMsg;
 import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.TargetedActionMsg;
-import engine.objects.*;
+import engine.objects.AbstractWorldObject;
+import engine.objects.Mob;
+import engine.objects.NPC;
+import engine.objects.PlayerCharacter;
 
 /*
  * @Author:
@@ -72,14 +75,14 @@ public class AttackCmdMsgHandler extends AbstractClientMsgHandler {
 
         if (!playerCharacter.isCombat()) {
             //CombatManager.toggleCombat(true, origin);
-            FinalCombatManager.toggleCombat(true,origin);
+            CombatManager.toggleCombat(true, origin);
         }
         //make character stand if sitting
 
         if (playerCharacter.isSit())
-            FinalCombatManager.toggleSit(false, origin);
+            CombatManager.toggleSit(false, origin);
 
-        FinalCombatManager.combatCycle(playerCharacter,target);
+        CombatManager.combatCycle(playerCharacter, target);
 
         return true;
     }