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

Update to ordering of logic

Browse Source
This commit is contained in:
MagicBot
2023-09-09 08:34:09 -04:00
parent 7d49395c41
commit c93e3bc947
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/BuildingManager.java
+7 -9
View File
@@ -310,11 +310,9 @@ public enum BuildingManager {
public static void removeHireling(Building building, AbstractCharacter hireling) { public static void removeHireling(Building building, AbstractCharacter hireling) {
Mob guardCaptain = null;
if (hireling.getObjectType().equals(GameObjectType.Mob)) { if (hireling.getObjectType().equals(GameObjectType.Mob)) {
guardCaptain = (Mob) hireling; Mob guardCaptain = (Mob) hireling;
// Clear minions from database if a guard captain // Clear minions from database if a guard captain
@@ -338,6 +336,12 @@ public enum BuildingManager {
building.getHirelings().remove(hireling); building.getHirelings().remove(hireling);
// Unload hireling from world
DbManager.removeFromCache(hireling);
WorldGrid.RemoveWorldObject(hireling);
WorldGrid.removeObject(hireling);
// Delete hireling from database // Delete hireling from database
if (hireling.getObjectType().equals(GameObjectType.Mob)) if (hireling.getObjectType().equals(GameObjectType.Mob))
@@ -345,12 +349,6 @@ public enum BuildingManager {
else else
DbManager.NPCQueries.DELETE_NPC((NPC) hireling); DbManager.NPCQueries.DELETE_NPC((NPC) hireling);
// Unload hireling from world
DbManager.removeFromCache(hireling);
WorldGrid.RemoveWorldObject(hireling);
WorldGrid.removeObject(hireling);
} }