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

Logic cleanup when dealing with contracts.

Browse Source
This commit is contained in:
MagicBot
2023-09-02 15:30:10 -04:00
parent 92666dca21
commit 65c2d2ea0b
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/mobileAI/MobAI.java
+10 -8
View File
@@ -309,16 +309,18 @@ public class MobAI {
if (mob == null) if (mob == null)
return false; return false;
int contractID = 0;
if (mob.isPlayerGuard() == true) { if (mob.isPlayerGuard() == true) {
int contractID; if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION))
if (mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN))
contractID = mob.guardCaptain.contract.getContractID(); contractID = mob.guardCaptain.contract.getContractID();
else else
contractID = mob.contract.getContractID(); contractID = mob.contract.getContractID();
//exception for werewolf and werebear guard captains //exception for werewolf and werebear guard captains
if (Enum.MinionType.ContractToMinionMap.get(contractID).isMage() == false && contractID != 980111 && contractID != 980110) if (Enum.MinionType.ContractToMinionMap.get(contractID).isMage() == false && contractID != 980111 && contractID != 980110)
return false; return false;
} }
@@ -331,7 +333,7 @@ public class MobAI {
// Mobile has no powers defined in mobbase or contract.. // Mobile has no powers defined in mobbase or contract..
if (PowersManager.getPowersForRune(mob.getMobBaseID()).isEmpty() && if (PowersManager.getPowersForRune(mob.getMobBaseID()).isEmpty() &&
mob.getContract() != null && PowersManager.getPowersForRune(mob.getContract().getObjectUUID()).isEmpty()) PowersManager.getPowersForRune(contractID).isEmpty())
return false; return false;
if (mob.nextCastTime == 0) if (mob.nextCastTime == 0)
@@ -372,10 +374,10 @@ public class MobAI {
ArrayList<RunePowerEntry> contractEntries = new ArrayList<>(); ArrayList<RunePowerEntry> contractEntries = new ArrayList<>();
if (mob.contract != null) if (mob.contract != null)
contractEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.contractUUID)); contractEntries = PowersManager.getPowersForRune(mob.contractUUID);
if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION)) if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION))
contractEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.guardCaptain.contractUUID)); contractEntries = PowersManager.getPowersForRune(mob.guardCaptain.contractUUID);
powerEntries.addAll(contractEntries); powerEntries.addAll(contractEntries);
@@ -473,10 +475,10 @@ public class MobAI {
ArrayList<RunePowerEntry> contractEntries = new ArrayList<>(); ArrayList<RunePowerEntry> contractEntries = new ArrayList<>();
if (mob.contract != null) if (mob.contract != null)
contractEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.contractUUID)); contractEntries = PowersManager.getPowersForRune(mob.contractUUID);
if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION)) if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION))
contractEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.guardCaptain.contractUUID)); contractEntries = PowersManager.getPowersForRune(mob.guardCaptain.contractUUID);
powerEntries.addAll(contractEntries); powerEntries.addAll(contractEntries);