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

Final CombatManager

Browse Source
This commit is contained in:
MagicBot
2024-03-23 19:22:14 -04:00
parent 6a0599a972
commit 0fa042cece
7 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/ClientMessagePump.java
+2 -2
View File
@@ -1445,10 +1445,10 @@ public class ClientMessagePump implements NetMsgHandler {
social((SocialMsg) msg, origin);
break;
case COMBATMODE:
FinalCombatManager.toggleCombat(((ToggleCombatMsg) msg).toggleCombat(),origin);
CombatManager.toggleCombat(((ToggleCombatMsg) msg).toggleCombat(), origin);
break;
case ARCCOMBATMODEATTACKING:
FinalCombatManager.toggleCombat(((SetCombatModeMsg) msg).getToggle(),origin);
CombatManager.toggleCombat(((SetCombatModeMsg) msg).getToggle(), origin);
break;
case MODIFYGUILDSTATE:
ToggleLfgRecruitingMsg tlrm = (ToggleLfgRecruitingMsg) msg;
src/engine/net/client/handlers/AttackCmdMsgHandler.java
+8 -5
View File
@@ -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;
}