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

Modification to minion retaliate.

Browse Source
This commit is contained in:
MagicBot
2023-09-05 08:27:34 -04:00
parent 975542d8af
commit ff36d8f3db
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/CombatManager.java
+9 -11
View File
@@ -1314,23 +1314,21 @@ public enum CombatManager {
if (target.getObjectType() == GameObjectType.Mob) { if (target.getObjectType() == GameObjectType.Mob) {
Mob retaliater = (Mob) target; Mob attackedMobile = (Mob) target;
if (retaliater.getCombatTarget() != null && !retaliater.isSiege()) if (attackedMobile.getCombatTarget() != null && !attackedMobile.isSiege())
return;
if (attacker.getObjectType() == GameObjectType.Mob && retaliater.isSiege())
return; return;
//handle minion informing his captain of the attack //handle minion informing his captain of the attack
if(attacker.getObjectType().equals(GameObjectType.Mob)){ if (attacker.getObjectType().equals(GameObjectType.Mob)) {
Mob mob = (Mob)attacker; Mob mob = (Mob) attacker;
if(mob.agentType.equals(AIAgentType.GUARDMINION) && mob.guardCaptain != null && mob.guardCaptain.isAlive()) if (mob.agentType.equals(AIAgentType.GUARDMINION) && mob.guardCaptain != null && mob.guardCaptain.isAlive())
if(mob.guardCaptain.combatTarget == null) if (mob.guardCaptain.combatTarget == null)
mob.guardCaptain.combatTarget = attacker; mob.guardCaptain.setCombatTarget(attacker);
} }
retaliater.setCombatTarget(attacker); attackedMobile.setCombatTarget(attacker);
} }
} }
src/engine/objects/AbstractCharacter.java
+1 -1
View File
@@ -1107,6 +1107,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
} }
public final void setCombatTarget(final AbstractWorldObject value) { public final void setCombatTarget(final AbstractWorldObject value) {
if(this.getObjectTypeMask() == 2050) {//MOB? if(this.getObjectTypeMask() == 2050) {//MOB?
if (value == null) { if (value == null) {
if (this.isCombat()) { if (this.isCombat()) {
@@ -1127,7 +1128,6 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
this.combatTarget = value; this.combatTarget = value;
} }
public final ConcurrentHashMap<String, JobContainer> getTimers() { public final ConcurrentHashMap<String, JobContainer> getTimers() {