Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

Unified Combat System

Browse Source
This commit is contained in:
FatBoy-DOTC
2024-03-17 15:56:47 -05:00
parent 836c076884
commit 9d7f2f39fe
10 changed files with 481 additions and 1759 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/AttackCmdMsgHandler.java
+7 -6
View File
@@ -3,7 +3,7 @@ package engine.net.client.handlers;
import engine.Enum;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager;
import engine.gameManager.CombatManager;
import engine.gameManager.FinalCombatManager;
import engine.net.client.ClientConnection;
import engine.net.client.msg.AttackCmdMsg;
import engine.net.client.msg.ClientNetMsg;
@@ -70,15 +70,16 @@ public class AttackCmdMsgHandler extends AbstractClientMsgHandler {
//put in combat if not already
if (!playerCharacter.isCombat())
CombatManager.toggleCombat(true, origin);
if (!playerCharacter.isCombat()) {
//CombatManager.toggleCombat(true, origin);
FinalCombatManager.toggleCombat(true,origin);
}
//make character stand if sitting
if (playerCharacter.isSit())
CombatManager.toggleSit(false, origin);
FinalCombatManager.toggleSit(false, origin);
CombatManager.AttackTarget(playerCharacter, target);
FinalCombatManager.combatCycle(playerCharacter,target);
return true;
}