MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 Pull Requests Projects Releases Wiki Activity

Workorders cleared with hireling removal.

Browse Source
This commit is contained in:
MagicBot
2024-05-11 07:51:56 -04:00
parent 52e0b5be4d
commit 408e3a45ca
10 changed files with 61 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/AbstractIntelligenceAgent.java
+4 -2
View File
@@ -154,9 +154,11 @@ public abstract class AbstractIntelligenceAgent extends AbstractCharacter {
WorldGrid.RemoveWorldObject(this);
if (this.getObjectType() == GameObjectType.Mob)
if (((Mob) this).getParentZone() != null)
if (this.getObjectType() == GameObjectType.Mob) {
if (((Mob) this).getParentZone() != null) {
((Mob) this).getParentZone().zoneMobSet.remove(this);
}
}
} else { //revert charmed pet
this.agentType = mbEnums.AIAgentType.MOBILE;
src/engine/objects/NPC.java
+3 -2
View File
@@ -651,8 +651,9 @@ public class NPC extends AbstractCharacter {
Logger.error(e.getMessage());
}
if (minionMob.getParentZone() != null)
minionMob.getParentZone().zoneMobSet.remove(minionMob);
if (minionMob.parentZone != null) {
minionMob.parentZone.zoneMobSet.remove(minionMob);
}
WorldGrid.RemoveWorldObject(minionMob);
DbManager.removeFromCache(minionMob);
src/engine/objects/PlayerCharacter.java
+3 -3
View File
@@ -4172,9 +4172,9 @@ public class PlayerCharacter extends AbstractCharacter {
currentPet.setCombatTarget(null);
if (currentPet.getParentZone() != null)
currentPet.getParentZone().zoneMobSet.remove(currentPet);
if (currentPet.parentZone != null) {
currentPet.parentZone.zoneMobSet.remove(currentPet);
}
try {
currentPet.clearEffects();