consolidated all guards to GuardLogic

src/engine/db/handlers/dbMobHandler.java

@@ -127,7 +127,7 @@ public class dbMobHandler extends dbHandlerBase {
         }
     }
 
-    public boolean ADD_TO_GUARDS(final long captainUID, final String minionName) {
+    public boolean ADD_GUARD_MINION(final long captainUID, final String minionName) {
 
         try (Connection connection = DbManager.getConnection();
              PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_guards` (`captainUID`, `minionName`) VALUES (?,?)")) {
@@ -143,7 +143,7 @@ public class dbMobHandler extends dbHandlerBase {
         }
     }
 
-    public boolean REMOVE_FROM_GUARDS(final long captainUID, final String minionName) {
+    public boolean REMOVE_GUARD_MINION(final long captainUID, final String minionName) {
 
         try (Connection connection = DbManager.getConnection();
              PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=? AND `minionName`=? LIMIT 1;")) {
@@ -159,6 +159,20 @@ public class dbMobHandler extends dbHandlerBase {
         }
     }
 
+    public boolean REMOVE_ALL_MINIONS(final long captainUID) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=?;")) {
+
+            preparedStatement.setLong(1, captainUID);
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+            return false;
+        }
+    }
 
     public ArrayList<Mob> GET_ALL_MOBS_FOR_ZONE(Zone zone) {
 

src/engine/devcmd/cmds/RemoveObjectCmd.java

@@ -11,7 +11,6 @@ package engine.devcmd.cmds;
 
 import engine.Enum.BuildingGroup;
 import engine.Enum.DbObjectType;
-import engine.Enum.GameObjectType;
 import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.BuildingManager;
@@ -138,54 +137,16 @@ public class RemoveObjectCmd extends AbstractDevCmd {
             Warehouse.warehouseByBuildingUUID.remove(building.getObjectUUID());
         }
 
-
         //remove cached shrines.
         if ((building.getBlueprintUUID() != 0)
                 && (building.getBlueprint().getBuildingGroup() == BuildingGroup.SHRINE))
             Shrine.RemoveShrineFromCacheByBuilding(building);
 
-        for (AbstractCharacter ac : building.getHirelings().keySet()) {
-            NPC npc = null;
-            Mob mobA = null;
+        // Remove hirelings for this building
 
-            if (ac.getObjectType() == GameObjectType.NPC)
-                npc = (NPC) ac;
-            else if (ac.getObjectType() == GameObjectType.Mob)
-                mobA = (Mob) ac;
+        for (AbstractCharacter abstractCharacter : building.getHirelings().keySet())
+            BuildingManager.removeHireling(building, abstractCharacter);
 
-            if (npc != null) {
-
-                for (Integer minionUUID : npc.minions) {
-                    Mob minionMob = Mob.getMob(minionUUID);
-                    WorldGrid.RemoveWorldObject(minionMob);
-                    WorldGrid.removeObject(minionMob, pc);
-
-                    if (minionMob.getParentZone() != null)
-                        minionMob.getParentZone().zoneMobSet.remove(minionMob);
-                }
-
-                DbManager.NPCQueries.DELETE_NPC(npc);
-                DbManager.removeFromCache(npc);
-                WorldGrid.RemoveWorldObject(npc);
-                WorldGrid.removeObject(npc, pc);
-            } else if (mobA != null) {
-
-                for (Integer minionUUID : mobA.minions) {
-                    Mob minionMob = Mob.getMob(minionUUID);
-                    WorldGrid.RemoveWorldObject(minionMob);
-                    WorldGrid.removeObject(minionMob, pc);
-
-                    if (minionMob.getParentZone() != null)
-                        minionMob.getParentZone().zoneMobSet.remove(minionMob);
-                }
-                DbManager.MobQueries.DELETE_MOB(mobA);
-                DbManager.removeFromCache(mobA);
-                WorldGrid.RemoveWorldObject(mobA);
-                WorldGrid.removeObject(mobA, pc);
-            }
-
-
-        }
         Zone zone = building.getParentZone();
         DbManager.BuildingQueries.DELETE_FROM_DATABASE(building);
         DbManager.removeFromCache(building);

src/engine/gameManager/BuildingManager.java

@@ -308,6 +308,72 @@ public enum BuildingManager {
 
     }
 
+    public static void removeHireling(Building building, AbstractCharacter hireling) {
+
+        if (hireling.getObjectType().equals(GameObjectType.Mob)) {
+
+            Mob guardCaptain = (Mob) hireling;
+
+            // Clear minions from database if a guard captain
+
+            if (guardCaptain.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN))
+                DbManager.MobQueries.REMOVE_ALL_MINIONS(hireling.getObjectUUID());
+        }
+
+        // Clear minions from world
+
+        for (Integer minionUUID : hireling.minions) {
+            Mob minionMob = Mob.getMob(minionUUID);
+            DbManager.removeFromCache(minionMob);
+            WorldGrid.RemoveWorldObject(minionMob);
+            WorldGrid.unloadObject(minionMob);
+
+            if (minionMob.getParentZone() != null)
+                minionMob.getParentZone().zoneMobSet.remove(minionMob);
+        }
+
+        // Remove hireling from building
+
+        building.getHirelings().remove(hireling);
+
+        // Remove from zone mob set
+
+        if (hireling.getObjectType().equals(GameObjectType.Mob)) {
+
+            Mob hirelingMob = (Mob) hireling;
+
+            if (hirelingMob.getParentZone() != null)
+                if (hirelingMob.getParentZone().zoneMobSet.contains(hirelingMob))
+                    hirelingMob.getParentZone().zoneMobSet.remove(hireling);
+
+        }
+
+        if (hireling.getObjectType().equals(GameObjectType.NPC)) {
+
+            NPC hirelingNPC = (NPC) hireling;
+
+            if (hirelingNPC.getParentZone() != null)
+                if (hirelingNPC.getParentZone().zoneNPCSet.contains(hirelingNPC))
+                    hirelingNPC.getParentZone().zoneNPCSet.remove(hireling);
+
+        }
+
+        // Unload hireling from world
+
+        DbManager.removeFromCache(hireling);
+        WorldGrid.RemoveWorldObject(hireling);
+        WorldGrid.removeObject(hireling);
+
+        // Delete hireling from database
+
+        if (hireling.getObjectType().equals(GameObjectType.Mob))
+            DbManager.MobQueries.DELETE_MOB((Mob) hireling);
+        else
+            DbManager.NPCQueries.DELETE_NPC((NPC) hireling);
+
+    }
+
+
     public static void cleanupHirelings(Building building) {
 
         // Early exit:  Cannot have hirelings in a building
@@ -320,42 +386,18 @@ public enum BuildingManager {
 
         if (building.getRank() < 1) {
 
-            for (AbstractCharacter slottedNPC : building.getHirelings().keySet()) {
+            for (AbstractCharacter slottedNPC : building.getHirelings().keySet())
+                BuildingManager.removeHireling(building, slottedNPC);
 
-                if (slottedNPC.getObjectType() == Enum.GameObjectType.NPC)
-                    ((NPC) slottedNPC).remove();
-                else if (slottedNPC.getObjectType() == Enum.GameObjectType.Mob)
-                    NPCManager.removeMobileFromBuilding(((Mob) slottedNPC), building);
-            }
             return;
         }
 
         // Delete hireling if building has deranked.
+
         for (AbstractCharacter hireling : building.getHirelings().keySet()) {
 
-            NPC npc = null;
-            Mob mob = null;
-
-            if (hireling.getObjectType() == Enum.GameObjectType.NPC)
-                npc = (NPC) hireling;
-            else if (hireling.getObjectType() == Enum.GameObjectType.Mob)
-                mob = (Mob) hireling;
-
             if (building.getHirelings().get(hireling) > building.getBlueprint().getSlotsForRank(building.getRank()))
-
-                if (npc != null) {
-                    if (!npc.remove())
-                        Logger.error("Failed to remove npc " + npc.getObjectUUID()
-                                + "from Building " + building.getObjectUUID());
-                    else
-                        building.getHirelings().remove(npc);
-                } else if (mob != null) {
-                    if (!NPCManager.removeMobileFromBuilding(mob, building))
-                        Logger.error("Failed to remove npc " + npc.getObjectUUID()
-                                + "from Building " + building.getObjectUUID());
-                    else
-                        building.getHirelings().remove(npc);
-                }
+                BuildingManager.removeHireling(building, hireling);
 
         }
 

src/engine/gameManager/CombatManager.java

@@ -141,11 +141,6 @@ public enum CombatManager {
             if (off == null)
                 CombatManager.createTimer(playerCharacter, MBServerStatics.SLOT_OFFHAND, 1, true); // attack in 0.1 of a second
         }
-
-        City playerCity = ZoneManager.getCityAtLocation(playerCharacter.getLoc());
-
-        if (playerCity != null && playerCity.cityOutlaws.contains(playerCharacter.getObjectUUID()) == false)
-            playerCity.cityOutlaws.add(playerCharacter.getObjectUUID());
     }
 
     public static void setAttackTarget(PetAttackMsg msg, ClientConnection origin) throws MsgSendException {
@@ -825,12 +820,6 @@ public enum CombatManager {
                     if (tarAc.isSit())
                         damage *= 2.5f; //increase damage if sitting
 
-                    if (tarAc.getObjectType() == GameObjectType.Mob) {
-                        if (ac.getObjectType().equals(GameObjectType.PlayerCharacter))
-                            ((Mob) tarAc).playerAgroMap.put(ac.getObjectUUID(), ((Mob) tarAc).playerAgroMap.get(ac.getObjectUUID()) + damage);
-                        ((Mob) tarAc).handleDirectAggro(ac);
-                    }
-
                     if (tarAc.getHealth() > 0)
                         d = tarAc.modifyHealth(-damage, ac, false);
 
@@ -1323,12 +1312,6 @@ public enum CombatManager {
                 if (attackedMobile.guardCaptain.combatTarget == null)
                     attackedMobile.guardCaptain.setCombatTarget(attacker);
 
-                // Add to city outlaw list
-
-                if (attacker.getObjectType().equals(GameObjectType.PlayerCharacter) &&
-                        attackedMobile.guardedCity.cityOutlaws.contains(attacker.getObjectUUID()) == false)
-                    attackedMobile.guardedCity.cityOutlaws.add(attacker.getObjectUUID());
-
             }
 
             // Mobile already has a target; don't switch.

src/engine/gameManager/NPCManager.java

@@ -119,82 +119,6 @@ public enum NPCManager {
         playerCharacter.necroPets.clear();
     }
 
-
-    public static void removeSiegeMinions(Mob mobile) {
-
-        for (Integer minionUUID : mobile.minions) {
-
-            Mob siegeMinion = Mob.getMob(minionUUID);
-
-            if (mobile.isMoving()) {
-
-                mobile.stopMovement(mobile.getLoc());
-
-                if (siegeMinion.parentZone != null)
-                    siegeMinion.parentZone.zoneMobSet.remove(siegeMinion);
-            }
-
-            try {
-                siegeMinion.clearEffects();
-            } catch (Exception e) {
-                Logger.error(e.getMessage());
-            }
-
-            if (siegeMinion.parentZone != null)
-                siegeMinion.parentZone.zoneMobSet.remove(siegeMinion);
-
-            WorldGrid.RemoveWorldObject(siegeMinion);
-            WorldGrid.removeObject(siegeMinion);
-            DbManager.removeFromCache(siegeMinion);
-
-
-            PlayerCharacter petOwner = (PlayerCharacter) siegeMinion.guardCaptain;
-
-            if (petOwner != null) {
-
-                petOwner.setPet(null);
-
-                siegeMinion.guardCaptain = null;
-
-                PetMsg petMsg = new PetMsg(5, null);
-                Dispatch dispatch = Dispatch.borrow(petOwner, petMsg);
-                DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.PRIMARY);
-            }
-        }
-    }
-
-    public static boolean removeMobileFromBuilding(Mob mobile, Building building) {
-
-        // Remove npc from it's building
-
-        try {
-            mobile.clearEffects();
-        } catch (Exception e) {
-            Logger.error(e.getMessage());
-        }
-
-        if (mobile.parentZone != null)
-            mobile.parentZone.zoneMobSet.remove(mobile);
-
-        if (building != null) {
-            building.getHirelings().remove(mobile);
-            removeSiegeMinions(mobile);
-        }
-
-        // Delete npc from database
-
-        if (DbManager.MobQueries.DELETE_MOB(mobile) == 0)
-            return false;
-
-        // Remove npc from the simulation
-
-        mobile.removeFromCache();
-        DbManager.removeFromCache(mobile);
-        WorldGrid.RemoveWorldObject(mobile);
-        WorldGrid.removeObject(mobile);
-        return true;
-    }
-
     public static void loadAllPirateNames() {
 
         DbManager.NPCQueries.LOAD_PIRATE_NAMES();

src/engine/mobileAI/MobAI.java

@@ -266,24 +266,25 @@ public class MobAI {
 
             //guards inherit barracks patrol points dynamically
 
-            if (mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN) || mob.agentType.equals(Enum.AIAgentType.GUARDMINION)) {
+            if (mob.patrolPoints == null || mob.patrolPoints.isEmpty())
+                if (mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN) || mob.agentType.equals(Enum.AIAgentType.GUARDMINION)) {
 
-                Building barracks = mob.building;
+                    Building barracks = mob.building;
 
-                if (barracks != null && barracks.patrolPoints != null && !barracks.getPatrolPoints().isEmpty()) {
-                    mob.patrolPoints = barracks.patrolPoints;
-                } else {
-                    randomGuardPatrolPoint(mob);
-                    return;
+                    if (barracks != null && barracks.patrolPoints != null && !barracks.getPatrolPoints().isEmpty()) {
+                        mob.patrolPoints = barracks.patrolPoints;
+                    } else {
+                        randomGuardPatrolPoint(mob);
+                        return;
+                    }
                 }
-            }
 
             if (mob.lastPatrolPointIndex > mob.patrolPoints.size() - 1)
                 mob.lastPatrolPointIndex = 0;
 
             // Minions are given marching orders by the captain if he is alive
 
-            if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION) && mob.guardCaptain.isAlive()) {
+            if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION)) {
                 Mob captain = (Mob) mob.guardCaptain;
                 mob.destination = captain.destination.add(Formation.getOffset(2, mob.guardCaptain.minions.indexOf(mob.getObjectUUID()) + 3));
                 mob.lastPatrolPointIndex = captain.lastPatrolPointIndex;
@@ -322,6 +323,8 @@ public class MobAI {
 
             if (mob.isPlayerGuard() == true) {
 
+                if(mob.agentType.equals(Enum.AIAgentType.GUARDWALLARCHER))
+                    return false; //wall archers don't cast
                 if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION))
                     contractID = mob.guardCaptain.contract.getContractID();
                 else
@@ -613,10 +616,8 @@ public class MobAI {
             switch (mob.behaviourType) {
                 case GuardCaptain:
                 case GuardMinion:
-                    GuardLogic(mob);
-                    break;
                 case GuardWallArcher:
-                    GuardWallArcherLogic(mob);
+                    GuardLogic(mob);
                     break;
                 case Pet1:
                 case SiegeEngine:
@@ -739,7 +740,7 @@ public class MobAI {
                             return;
 
                         mob.destination = mob.guardCaptain.getLoc();
-                        MovementUtilities.moveToLocation(mob, mob.destination, 5);
+                        MovementUtilities.moveToLocation(mob, mob.destination, 5, false);
                     } else
                         chaseTarget(mob);
                     break;
@@ -890,7 +891,7 @@ public class MobAI {
             if (CombatUtilities.inRange2D(mob, mob.getCombatTarget(), mob.getRange()) == false) {
                 if (mob.getRange() > 15) {
                     mob.destination = mob.getCombatTarget().getLoc();
-                    MovementUtilities.moveToLocation(mob, mob.destination, 0);
+                    MovementUtilities.moveToLocation(mob, mob.destination, 0, false);
                 } else {
 
                     //check if building
@@ -899,11 +900,11 @@ public class MobAI {
                         case PlayerCharacter:
                         case Mob:
                             mob.destination = MovementUtilities.GetDestinationToCharacter(mob, (AbstractCharacter) mob.getCombatTarget());
-                            MovementUtilities.moveToLocation(mob, mob.destination, mob.getRange() + 1);
+                            MovementUtilities.moveToLocation(mob, mob.destination, mob.getRange() + 1, false);
                             break;
                         case Building:
                             mob.destination = mob.getCombatTarget().getLoc();
-                            MovementUtilities.moveToLocation(mob, mob.getCombatTarget().getLoc(), 0);
+                            MovementUtilities.moveToLocation(mob, mob.getCombatTarget().getLoc(), 0, false);
                             break;
                     }
                 }
@@ -950,40 +951,33 @@ public class MobAI {
     public static void GuardLogic(Mob mob) {
 
         try {
-            if (mob.getCombatTarget() == null)
+            if (mob.getCombatTarget() == null) {
                 CheckForPlayerGuardAggro(mob);
+            } else {
+                //do not need to look to change target if target is already null
+                AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);
 
-            AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);
+                if (newTarget != null) {
 
-            if (newTarget != null) {
-
-                if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
-                    if (GuardCanAggro(mob, (PlayerCharacter) newTarget))
+                    if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
+                        if (GuardCanAggro(mob, (PlayerCharacter) newTarget))
+                            mob.setCombatTarget(newTarget);
+                    } else
                         mob.setCombatTarget(newTarget);
-                } else
-                    mob.setCombatTarget(newTarget);
-
+                }
             }
 
-            CheckMobMovement(mob);
-            CheckForAttack(mob);
+            if(mob.behaviourType.canRoam)
+                CheckMobMovement(mob);//all guards that can move check to move
+
+            if(mob.combatTarget != null)
+                CheckForAttack(mob); //only check to attack if combat target is not null
+
         } catch (Exception e) {
             Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardLogic" + " " + e.getMessage());
         }
     }
 
-    public static void GuardWallArcherLogic(Mob mob) {
-
-        try {
-            if (mob.getCombatTarget() == null)
-                CheckForPlayerGuardAggro(mob);
-            else
-                CheckForAttack(mob);
-        } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardWallArcherLogic" + " " + e.getMessage());
-        }
-    }
-
     private static void PetLogic(Mob mob) {
 
         try {

src/engine/mobileAI/utilities/MovementUtilities.java

@@ -147,7 +147,7 @@ public class MovementUtilities {
         return aiAgent.getLoc().ClosestPointOnLine(aggroTarget.getLoc(), aggroTarget.getEndLoc());
     }
 
-    public static void moveToLocation(Mob agent, Vector3fImmutable newLocation, float offset) {
+    public static void moveToLocation(Mob agent, Vector3fImmutable newLocation, float offset, boolean isWalking) {
         try {
 
             //don't move farther than 30 units from player.
@@ -158,7 +158,7 @@ public class MovementUtilities {
 
             agent.setFaceDir(newLoc.subtract2D(agent.getLoc()).normalize());
 
-            aiMove(agent, newLoc, false);
+            aiMove(agent, newLoc, isWalking);
         } catch (Exception e) {
             Logger.error(e.toString());
         }

src/engine/net/client/handlers/MinionTrainingMsgHandler.java

@@ -182,7 +182,7 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
                         if (!npc.minions.contains(toRemove.getObjectUUID()))
                             return true;
 
-                        if (!DbManager.MobQueries.REMOVE_FROM_GUARDS(npc.getObjectUUID(), toRemove.firstName))
+                        if (!DbManager.MobQueries.REMOVE_GUARD_MINION(npc.getObjectUUID(), toRemove.firstName))
                             return true;
 
                         npc.minions.remove(Integer.valueOf(toRemove.getObjectUUID()));
@@ -273,7 +273,7 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
                         if (toCreate == null)
                             return true;
 
-                        if (!DbManager.MobQueries.ADD_TO_GUARDS(npc.getObjectUUID(), pirateName))
+                        if (!DbManager.MobQueries.ADD_GUARD_MINION(npc.getObjectUUID(), pirateName))
                             return true;
 
                         if (toCreate != null) {

src/engine/net/client/handlers/OrderNPCMsgHandler.java

@@ -7,7 +7,6 @@ import engine.Enum.ProfitType;
 import engine.exception.MsgSendException;
 import engine.gameManager.BuildingManager;
 import engine.gameManager.DbManager;
-import engine.gameManager.NPCManager;
 import engine.gameManager.SessionManager;
 import engine.math.FastMath;
 import engine.math.Vector3fImmutable;
@@ -37,7 +36,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         super(OrderNPCMsg.class);
     }
 
-    public static void processRedeedMob(Mob mob, Building building, ClientConnection origin) {
+    public static void processRedeedHireling(AbstractCharacter hireling, Building building, ClientConnection origin) {
 
         PlayerCharacter player;
         Contract contract;
@@ -48,33 +47,28 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         player = SessionManager.getPlayerCharacter(origin);
         itemMan = player.getCharItemManager();
 
-        contract = mob.getContract();
+        contract = hireling.contract;
 
         if (!player.getCharItemManager().hasRoomInventory((short) 1)) {
             ErrorPopupMsg.sendErrorPopup(player, 21);
             return;
         }
 
-        if (!building.getHirelings().containsKey(mob))
+        if (!building.getHirelings().containsKey(hireling))
             return;
 
-        if (!NPCManager.removeMobileFromBuilding(mob, building)) {
-            PlaceAssetMsg.sendPlaceAssetError(player.getClientConnection(), 1, "A Serious error has occurred. Please post details for to ensure transaction integrity");
-            return;
-        }
-
-        building.getHirelings().remove(mob);
+        BuildingManager.removeHireling(building, hireling);
 
         itemBase = ItemBase.getItemBase(contract.getContractID());
 
         if (itemBase == null) {
-            Logger.error("Could not find Contract for npc: " + mob.getObjectUUID());
+            Logger.error("Could not find Contract for npc: " + hireling.getObjectUUID());
             return;
         }
 
         boolean itemWorked = false;
 
-        item = new Item(itemBase, player.getObjectUUID(), Enum.OwnerType.PlayerCharacter, (byte) ((byte) mob.getRank() - 1), (byte) ((byte) mob.getRank() - 1), (short) 1, (short) 1, true, false, Enum.ItemContainerType.INVENTORY, (byte) 0, new ArrayList<>(), "");
+        item = new Item(itemBase, player.getObjectUUID(), Enum.OwnerType.PlayerCharacter, (byte) ((byte) hireling.getRank() - 1), (byte) ((byte) hireling.getRank() - 1), (short) 1, (short) 1, true, false, Enum.ItemContainerType.INVENTORY, (byte) 0, new ArrayList<>(), "");
         item.setNumOfItems(1);
         item.containerType = Enum.ItemContainerType.INVENTORY;
 
@@ -282,28 +276,6 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         }
     }
 
-    private static synchronized void processRedeedNPC(AbstractCharacter abstractCharacter, Building building, ClientConnection origin) {
-
-        // Member variable declaration
-
-        switch (abstractCharacter.getObjectType()) {
-            case NPC:
-                NPC npc = (NPC) abstractCharacter;
-
-                Building cityBuilding = npc.getBuilding();
-
-                if (cityBuilding == null)
-                    return;
-
-                BuildingManager.processRedeedNPC(npc, npc.building, origin);
-                break;
-            case Mob:
-                Mob mob = (Mob) abstractCharacter;
-                processRedeedMob(mob, mob.building, origin);
-                break;
-        }
-    }
-
     private static boolean AddPatrolPoints(int buildingID, ArrayList<Vector3fImmutable> patrolPoints) {
 
         Building building = BuildingManager.getBuildingFromCache(buildingID);
@@ -494,7 +466,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
                     if (BuildingManager.PlayerCanControlNotOwner(building, player) == false)
                         return true;
 
-                    processRedeedNPC(npc, building, origin);
+                    processRedeedHireling(npc, building, origin);
                     return true;
                 //MB TODO HANDLE all profits.
                 case 7:
@@ -562,10 +534,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
                     if (building.getHirelings().containsKey(mob) == false)
                         return true;
 
-                    if (NPCManager.removeMobileFromBuilding(mob, building) == false) {
-                        PlaceAssetMsg.sendPlaceAssetError(player.getClientConnection(), 1, "A Serious error has occurred. Please post details for to ensure transaction integrity");
-                        return true;
-                    }
+                    BuildingManager.removeHireling(building, mob);
 
                     ManageCityAssetsMsg manageCityAssetsMsg = new ManageCityAssetsMsg();
                     manageCityAssetsMsg.actionType = SVR_CLOSE_WINDOW;
@@ -600,7 +569,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
                     if (BuildingManager.PlayerCanControlNotOwner(building, player) == false)
                         return true;
 
-                    processRedeedNPC(mob, building, origin);
+                    processRedeedHireling(mob, building, origin);
                     return true;
                 //MB TODO HANDLE all profits.
                 case 7:

src/engine/objects/AbstractCharacter.java

@@ -1244,11 +1244,21 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
                     CombatManager.handleRetaliate(this, attacker);
                 }
 
+                if(this.getObjectType().equals(GameObjectType.Mob)){
+                    //handle hate value addition
+                    Mob target = (Mob)this;
+                    if (attacker.getObjectType().equals(GameObjectType.PlayerCharacter)) {
+                        target.playerAgroMap.put(attacker.getObjectUUID(), target.playerAgroMap.get(attacker.getObjectUUID()) + value);
+                        if (target.isPlayerGuard()){
+                            if(target.guardedCity != null && target.guardedCity.cityOutlaws.contains(attacker.getObjectUUID()) == false)
+                                target.guardedCity.cityOutlaws.add(attacker.getObjectUUID());
+                        }
+                    }
+                }
                 return newHealth - oldHealth;
             } finally {
                 this.healthLock.writeLock().unlock();
             }
-
         } catch (InterruptedException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();

src/engine/objects/Mob.java

@@ -20,7 +20,6 @@ import engine.jobs.DeferredPowerJob;
 import engine.jobs.UpgradeNPCJob;
 import engine.math.Bounds;
 import engine.math.Vector3fImmutable;
-import engine.mobileAI.utilities.MovementUtilities;
 import engine.net.ByteBufferWriter;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
@@ -1692,16 +1691,6 @@ public class Mob extends AbstractIntelligenceAgent {
         if (this.agentType.equals(AIAgentType.MOBILE))
             NPCManager.AssignPatrolPoints(this);
 
-        if (this.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN)) {
-
-            Building barracks = this.building;
-
-            if (barracks != null && barracks.patrolPoints != null && !barracks.getPatrolPoints().isEmpty()) {
-                this.patrolPoints = barracks.patrolPoints;
-                MovementUtilities.aiMove(this, this.patrolPoints.get(0), true);
-            }
-        }
-
         this.deathTime = 0;
     }