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

Merge remote-tracking branch 'origin/unified-combat-manager' into feature-json7.3

Browse Source 
# Conflicts:
#	src/engine/mobileAI/utilities/CombatUtilities.java
This commit is contained in:
MagicBot
2024-03-18 08:03:10 -04:00
parent 84f9d54ec0 9d7f2f39fe
commit 82c4e3169e
10 changed files with 481 additions and 1762 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/ClientMessagePump.java
+18 -3
View File
@@ -1237,7 +1237,22 @@ public class ClientMessagePump implements NetMsgHandler {
&& (msg.getTargetType() == GameObjectType.PlayerCharacter.ordinal()))
return;
CombatManager.setAttackTarget(msg, conn);
//CombatManager.setAttackTarget(msg, conn);
if(msg.getTargetType() == GameObjectType.Building.ordinal()){
conn.getPlayerCharacter().getPet().setCombatTarget(PlayerCharacter.getPlayerCharacter(msg.getTargetID()));
}
switch(msg.getTargetType()) {
case 53: //player character
conn.getPlayerCharacter().getPet().setCombatTarget(PlayerCharacter.getPlayerCharacter(msg.getTargetID()));
break;
case 37://mob
conn.getPlayerCharacter().getPet().setCombatTarget(Mob.getMob(msg.getTargetID()));
break;
case 8://mob
conn.getPlayerCharacter().getPet().setCombatTarget(BuildingManager.getBuilding(msg.getTargetID()));
break;
}
if (pet.getCombatTarget() == null)
return;
}
@@ -1430,10 +1445,10 @@ public class ClientMessagePump implements NetMsgHandler {
social((SocialMsg) msg, origin);
break;
case COMBATMODE:
CombatManager.toggleCombat((ToggleCombatMsg) msg, origin);
FinalCombatManager.toggleCombat(((ToggleCombatMsg) msg).toggleCombat(),origin);
break;
case ARCCOMBATMODEATTACKING:
CombatManager.toggleCombat((SetCombatModeMsg) msg, origin);
FinalCombatManager.toggleCombat(((SetCombatModeMsg) msg).getToggle(),origin);
break;
case MODIFYGUILDSTATE:
ToggleLfgRecruitingMsg tlrm = (ToggleLfgRecruitingMsg) msg;
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;
}