NPc Manager for static NPC classes

src/engine/InterestManagement/InterestManager.java

@@ -12,6 +12,7 @@ import engine.Enum;
 import engine.Enum.DispatchChannel;
 import engine.Enum.GameObjectType;
 import engine.gameManager.GroupManager;
+import engine.gameManager.PlayerManager;
 import engine.gameManager.SessionManager;
 import engine.job.JobScheduler;
 import engine.jobs.RefreshGroupJob;
@@ -233,7 +234,7 @@ public enum InterestManager implements Runnable {
 
         if (distanceSquared > sqr(64))
             player.setLastStaticLoc(player.getLoc());
-        else if (player.isDirtyLoad() == false)
+        else if (PlayerManager.isDirtyLoad(player) == false)
             return;
 
         // Get Statics in range
@@ -286,14 +287,14 @@ public enum InterestManager implements Runnable {
                 lsm.addObject((Building) awo);
             else if (awo.getObjectType().equals(GameObjectType.Corpse)) {
                 Corpse corpse = (Corpse) awo;
-                lcm = new LoadCharacterMsg(corpse, PlayerCharacter.hideNonAscii());
+                lcm = new LoadCharacterMsg(corpse, PlayerManager.hideNonAscii());
 
                 Dispatch dispatch = Dispatch.borrow(player, lcm);
                 DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
 
             } else if (awo.getObjectType().equals(GameObjectType.NPC)) {
                 NPC npc = (NPC) awo;
-                lcm = new LoadCharacterMsg(npc, PlayerCharacter.hideNonAscii());
+                lcm = new LoadCharacterMsg(npc, PlayerManager.hideNonAscii());
 
                 lcmList.add(lcm);
             }
@@ -311,7 +312,7 @@ public enum InterestManager implements Runnable {
         }
 
         loadedStaticObjects.addAll(toLoad);
-        player.setDirtyLoad(false);
+        PlayerManager.setDirtyLoad(player, false);
     }
 
     private void updateMobileList(PlayerCharacter player, ClientConnection origin) {
@@ -437,7 +438,7 @@ public enum InterestManager implements Runnable {
                     if (player.getSeeInvis() < awopc.getHidden())
                         continue;
 
-                    lcm = new LoadCharacterMsg(awopc, PlayerCharacter.hideNonAscii());
+                    lcm = new LoadCharacterMsg(awopc, PlayerManager.hideNonAscii());
                     players.add(awo);
 
                     // check if in a group with the person being loaded
@@ -466,11 +467,11 @@ public enum InterestManager implements Runnable {
 
                     awonpc.playerAgroMap.put(player.getObjectUUID(), false);
                     ((Mob) awonpc).setCombatTarget(null);
-                    lcm = new LoadCharacterMsg(awonpc, PlayerCharacter.hideNonAscii());
+                    lcm = new LoadCharacterMsg(awonpc, PlayerManager.hideNonAscii());
 
                 } else if ((awo.getObjectTypeMask() & MBServerStatics.MASK_NPC) != 0) {
                     NPC awonpc = (NPC) awo;
-                    lcm = new LoadCharacterMsg(awonpc, PlayerCharacter.hideNonAscii());
+                    lcm = new LoadCharacterMsg(awonpc, PlayerManager.hideNonAscii());
                 } else if ((awo.getObjectTypeMask() & MBServerStatics.MASK_PET) != 0) {
                     Mob awonpc = (Mob) awo;
 
@@ -482,7 +483,7 @@ public enum InterestManager implements Runnable {
                     if ((awonpc.agentType.equals(Enum.AIAgentType.MOBILE)))
                         ((Mob) awonpc).setCombatTarget(null);
 
-                    lcm = new LoadCharacterMsg(awonpc, PlayerCharacter.hideNonAscii());
+                    lcm = new LoadCharacterMsg(awonpc, PlayerManager.hideNonAscii());
                 }
 
                 addToList.add(awo);
@@ -518,8 +519,8 @@ public enum InterestManager implements Runnable {
 
         // Update loaded upbjects lists
 
-        player.isBoxed = PlayerCharacter.checkIfBoxed(player);
-        player.setDirtyLoad(true);
+        player.isBoxed = PlayerManager.checkIfBoxed(player);
+        PlayerManager.setDirtyLoad(player, true);
         updateStaticList(player, origin);
         updateMobileList(player, origin);
     }
@@ -536,7 +537,7 @@ public enum InterestManager implements Runnable {
 
         // Update loaded upbjects lists
 
-        playerCharacter.setDirtyLoad(true);
+        PlayerManager.setDirtyLoad(playerCharacter, true);
         updateStaticList(playerCharacter, origin);
         updateMobileList(playerCharacter, origin);
 
@@ -552,7 +553,7 @@ public enum InterestManager implements Runnable {
         for (AbstractWorldObject playerObject : playerList) {
 
             PlayerCharacter playerCharacter = (PlayerCharacter) playerObject;
-            playerCharacter.setDirtyLoad(true);
+            PlayerManager.setDirtyLoad(playerCharacter, true);
         }
     }
 }

src/engine/QuestSystem/QuestManager.java

@@ -1,131 +0,0 @@
-package engine.QuestSystem;
-
-import engine.InterestManagement.WorldGrid;
-import engine.gameManager.ChatManager;
-import engine.net.client.msg.ErrorPopupMsg;
-import engine.objects.*;
-import engine.server.MBServerStatics;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Random;
-
-public class QuestManager {
-    public static HashMap<PlayerCharacter,QuestObject> acceptedQuests = new HashMap<>();
-    public static HashMap<PlayerCharacter,ArrayList<String>> completedQuests = new HashMap<>();
-
-    public static boolean grantsQuest(NPC npc){
-        if(npc == null)
-            return false;
-
-        if(npc.contract == null)
-            return false;
-
-        return npc.contract.getName().contains("ZoneLore") || npc.contract.getName().equals("Barrowlands Sentry");
-    }
-
-    public static void displayCurrentQuest(PlayerCharacter pc){
-        if(acceptedQuests.containsKey(pc)){
-            QuestObject obj = acceptedQuests.get(pc);
-            String output = "You have embarked on the noble quest: ";
-            output += obj.QuestName + ". ";
-            output += obj.description;
-            output += ". " + obj.objectiveCount + " / " + obj.objectiveCountRequired;
-            ErrorPopupMsg.sendErrorMsg(pc, output);
-        }else{
-            ErrorPopupMsg.sendErrorMsg(pc, "You have no active quest.");
-        }
-    }
-
-    public static void acceptQuest(PlayerCharacter pc, QuestObject obj){
-        if (completedQuests.containsKey(pc)) {
-            if(completedQuests.get(pc).contains(obj.QuestName)){
-                ErrorPopupMsg.sendErrorMsg(pc, "You have already completed the quest: " + obj.QuestName);
-                return;
-            }
-        }
-
-        if(acceptedQuests.containsKey(pc)){
-            if(acceptedQuests.get(pc)!= null){
-                ErrorPopupMsg.sendErrorMsg(pc, "You have already embarked on a noble quest.");
-                return;
-            }
-        }
-
-        acceptedQuests.put(pc,obj);
-        displayCurrentQuest(pc);
-    }
-
-    public static void completeQuest(PlayerCharacter pc, QuestObject obj){
-
-        if(obj.objectiveCount < obj.objectiveCountRequired) {
-            ChatManager.chatSystemInfo(pc, obj.QuestName + " Progress: " + obj.objectiveCount + " / " + obj.objectiveCountRequired);
-            return;
-        }
-
-        //notify the player they have completed their quest
-        ErrorPopupMsg.sendErrorMsg(pc, "You have completed the quest: " + obj.QuestName +"!");
-
-        //add completed quest to completion log
-        if (completedQuests.containsKey(pc)) {
-            completedQuests.get(pc).add(obj.QuestName);
-        }else{
-            ArrayList<String> completed = new ArrayList<>();
-            completed.add(obj.QuestName);
-            completedQuests.put(pc,completed);
-        }
-
-        //remove current quest from active log
-        if(acceptedQuests.containsKey(pc))
-            acceptedQuests.remove(pc);
-
-        //grant rewards
-        //only grant XP if level is below 75
-        if(pc.level < 75) {
-            int xpGrant = (int) (Experience.maxXPPerKill(pc.getLevel()) * 10);
-            pc.grantXP(xpGrant);
-            ChatManager.chatSystemInfo(pc, "Your Quest Has Granted you: " + xpGrant + " Experience Points");
-        }
-
-        int goldGrant = (int) Experience.maxXPPerKill(pc.getLevel());
-        pc.getCharItemManager().addGoldToInventory(goldGrant,false);
-        ChatManager.chatSystemInfo(pc, "Your Quest Has Granted you: " + goldGrant + " Gold Coins");
-
-        pc.getCharItemManager().updateInventory();
-    }
-
-    public static QuestObject getQuestForContract(NPC npc){
-        QuestObject obj = new QuestObject();
-        obj.QuestName = npc.getFirstName() + "'s Quest";
-
-        HashSet<AbstractWorldObject> mobs = WorldGrid.getObjectsInRangePartial(npc.loc,2048, MBServerStatics.MASK_MOB);
-        if (mobs.isEmpty())
-            return null; // Handle the case where the set is empty
-
-        // Convert HashSet to a List
-        ArrayList<AbstractWorldObject> mobList = new ArrayList<>(mobs);
-
-        Mob mob = null;
-
-        while(mob == null || Mob.discDroppers.contains(mob)) {
-            // Generate a random index
-            Random random = new Random();
-            int randomIndex = random.nextInt(mobList.size());
-
-            if (mobList.get(randomIndex) == null) {
-                continue;
-            }
-
-            mob = (Mob) mobList.get(randomIndex);
-        }
-        obj.progressionNames = new ArrayList<>();
-        obj.progressionNames.add(mob.getFirstName());
-
-        obj.objectiveCountRequired = 10;
-        obj.objectiveCount = 0;
-
-        obj.description = "These lands are plagued with " + mob.getFirstName() + " complete the quest by slaying 10 of them!";
-        return obj;
-    }
-}

src/engine/QuestSystem/QuestObject.java

@@ -1,27 +0,0 @@
-package engine.QuestSystem;
-
-import engine.objects.ItemBase;
-import engine.objects.NPC;
-import engine.objects.PlayerCharacter;
-
-import java.util.ArrayList;
-
-public class QuestObject {
-
-    public String QuestName;
-    public String description;
-    public int objectiveCount;
-    public int objectiveCountRequired;
-    public ArrayList<String> progressionNames;
-    public PlayerCharacter owner;
-
-    public QuestObject(){
-
-    }
-    public void tryProgress(String option){
-        if(this.progressionNames.contains(option))
-            this.objectiveCount++;
-        else
-            return;
-    }
-}

src/engine/db/handlers/dbAccountHandler.java

@@ -13,6 +13,7 @@ import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.gameManager.ConfigManager;
 import engine.gameManager.DbManager;
+import engine.gameManager.PlayerManager;
 import engine.objects.Account;
 import engine.objects.PlayerCharacter;
 import org.pmw.tinylog.Logger;
@@ -140,7 +141,7 @@ public class dbAccountHandler extends dbHandlerBase {
                 int playerID;
 
                 playerID = rs.getInt(1);
-                trashPlayer = PlayerCharacter.getPlayerCharacter(playerID);
+                trashPlayer = PlayerManager.getPlayerCharacter(playerID);
 
                 if (trashPlayer == null)
                     continue;

src/engine/db/handlers/dbCSSessionHandler.java

@@ -10,8 +10,8 @@
 package engine.db.handlers;
 
 import engine.gameManager.DbManager;
+import engine.gameManager.PlayerManager;
 import engine.objects.Account;
-import engine.objects.PlayerCharacter;
 import engine.session.CSSession;
 import engine.util.StringUtils;
 import org.pmw.tinylog.Logger;
@@ -103,7 +103,7 @@ public class dbCSSessionHandler extends dbHandlerBase {
             ResultSet rs = preparedStatement.executeQuery();
 
             if (rs.next())
-                css = new CSSession(secKey, DbManager.AccountQueries.GET_ACCOUNT(rs.getInt("accountID")), PlayerCharacter.getPlayerCharacter(rs.getInt("characterID")), rs.getString("machineID"));
+                css = new CSSession(secKey, DbManager.AccountQueries.GET_ACCOUNT(rs.getInt("accountID")), PlayerManager.getPlayerCharacter(rs.getInt("characterID")), rs.getString("machineID"));
 
         } catch (SQLException e) {
             Logger.error(e);

src/engine/db/handlers/dbGuildHandler.java

@@ -12,6 +12,7 @@ package engine.db.handlers;
 import engine.Enum;
 import engine.Enum.GuildHistoryType;
 import engine.gameManager.DbManager;
+import engine.gameManager.PlayerManager;
 import engine.objects.*;
 import engine.server.world.WorldServer;
 import org.joda.time.DateTime;
@@ -222,7 +223,7 @@ public class dbGuildHandler extends dbHandlerBase {
 
             while (rs.next()) {
                 int playerUUID = rs.getInt(1);
-                PlayerCharacter kosPlayer = PlayerCharacter.getPlayerCharacter(playerUUID);
+                PlayerCharacter kosPlayer = PlayerManager.getPlayerCharacter(playerUUID);
 
                 if (kosPlayer != null)
                     kosList.add(kosPlayer);

src/engine/db/handlers/dbNPCHandler.java

@@ -11,6 +11,7 @@ package engine.db.handlers;
 
 import engine.Enum.ProfitType;
 import engine.gameManager.DbManager;
+import engine.gameManager.NPCManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.NPC;
 import engine.objects.NPCProfits;
@@ -330,12 +331,12 @@ public class dbNPCHandler extends dbHandlerBase {
 
                 // Handle new mobbbase entries
 
-                if (NPC._pirateNames.get(mobBase) == null)
-                    NPC._pirateNames.putIfAbsent(mobBase, new ArrayList<>());
+                if (NPCManager._pirateNames.get(mobBase) == null)
+                    NPCManager._pirateNames.putIfAbsent(mobBase, new ArrayList<>());
 
                 // Insert name into proper arraylist
 
-                NPC._pirateNames.get(mobBase).add(pirateName);
+                NPCManager._pirateNames.get(mobBase).add(pirateName);
             }
 
         } catch (SQLException e) {
@@ -343,7 +344,7 @@ public class dbNPCHandler extends dbHandlerBase {
         }
 
         Logger.info("names read: " + recordsRead + " for "
-                + NPC._pirateNames.size() + " mobBases");
+                + NPCManager._pirateNames.size() + " mobBases");
     }
 
     public boolean ADD_TO_PRODUCTION_LIST(final long ID, final long npcUID, final long itemBaseID, DateTime dateTime, String prefix, String suffix, String name, boolean isRandom, int playerID) {

src/engine/devcmd/AbstractDevCmd.java

@@ -12,6 +12,7 @@ package engine.devcmd;
 import engine.Enum.GameObjectType;
 import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
+import engine.gameManager.NPCManager;
 import engine.objects.*;
 
 import java.util.ArrayList;
@@ -71,7 +72,7 @@ public abstract class AbstractDevCmd {
         int targetType = pc.getLastTargetType().ordinal();
         int targetID = pc.getLastTargetID();
         if (targetType == GameObjectType.NPC.ordinal()) {
-            NPC b = NPC.getFromCache(targetID);
+            NPC b = NPCManager.getFromCache(targetID);
             if (b == null) {
                 ChatManager.chatSystemError(pc,
                         "Command Failed. Could not find NPC of ID " + targetID);

src/engine/devcmd/cmds/AddNPCCmd.java

@@ -10,12 +10,10 @@
 package engine.devcmd.cmds;
 
 import engine.Enum.GameObjectType;
-import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.*;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
-import org.pmw.tinylog.Logger;
 
 /**
  * @author Eighty
@@ -77,7 +75,7 @@ public class AddNPCCmd extends AbstractDevCmd {
         } else{
             loc = pc.loc;
         }
-        created = NPC.createNPC(name, contractID, loc, guild, zone, (short)level, building);
+        created = NPCManager.createNPC(name, contractID, loc, guild, zone, (short)level, building);
         created.bindLoc = loc;
         if(building != null) {
             created.buildingUUID = building.getObjectUUID();

src/engine/devcmd/cmds/AuditFailedItemsCmd.java

@@ -11,6 +11,8 @@ package engine.devcmd.cmds;
 
 import engine.Enum.ModType;
 import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.NPCManager;
+import engine.gameManager.PlayerManager;
 import engine.gameManager.PowersManager;
 import engine.net.ItemProductionManager;
 import engine.objects.*;
@@ -46,7 +48,7 @@ public class AuditFailedItemsCmd extends AbstractDevCmd {
             String prefix = "";
             String suffix = "";
             String itemName = "";
-            NPC npc = NPC.getFromCache(failedItem.getNpcUID());
+            NPC npc = NPCManager.getFromCache(failedItem.getNpcUID());
 
             if (npc == null) {
                 npcName = "null";
@@ -57,7 +59,7 @@ public class AuditFailedItemsCmd extends AbstractDevCmd {
                     contractName = npc.getContract().getName();
             }
 
-            PlayerCharacter roller = PlayerCharacter.getFromCache(failedItem.getPlayerID());
+            PlayerCharacter roller = PlayerManager.getFromCache(failedItem.getPlayerID());
 
             if (roller == null)
                 playerName = "null";

src/engine/devcmd/cmds/DecachePlayerCmd.java

@@ -12,6 +12,7 @@ package engine.devcmd.cmds;
 import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.DbManager;
+import engine.gameManager.PlayerManager;
 import engine.objects.AbstractGameObject;
 import engine.objects.PlayerCharacter;
 
@@ -34,8 +35,8 @@ public class DecachePlayerCmd extends AbstractDevCmd {
         int objectUUID = Integer.parseInt(words[0]);
 
         if (DbManager.inCache(Enum.GameObjectType.PlayerCharacter, objectUUID)) {
-            this.setTarget(PlayerCharacter.getFromCache(objectUUID)); //for logging
-            PlayerCharacter.getFromCache(objectUUID).removeFromCache();
+            this.setTarget(PlayerManager.getFromCache(objectUUID)); //for logging
+            PlayerManager.getFromCache(objectUUID).removeFromCache();
         } else {
             this.sendHelp(pc);
         }

src/engine/devcmd/cmds/GotoBoundsCmd.java

@@ -11,6 +11,7 @@ package engine.devcmd.cmds;
 
 import engine.Enum.GameObjectType;
 import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.PlayerManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.AbstractGameObject;
 import engine.objects.Building;
@@ -89,7 +90,7 @@ public class GotoBoundsCmd extends AbstractDevCmd {
             return;
         }
 
-        player.teleport(targetLoc);
+        PlayerManager.teleport(player, targetLoc);
 
     }
 

src/engine/devcmd/cmds/GotoCmd.java

@@ -12,6 +12,7 @@ package engine.devcmd.cmds;
 import engine.Enum.GameObjectType;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.DbManager;
+import engine.gameManager.PlayerManager;
 import engine.gameManager.SessionManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
@@ -35,7 +36,7 @@ public class GotoCmd extends AbstractDevCmd {
 
         if (target != null && words[0].isEmpty()) {
             AbstractWorldObject targetAgo = (AbstractWorldObject) target;
-            pc.teleport(targetAgo.getLoc());
+            PlayerManager.teleport(pc, targetAgo.getLoc());
             return;
         }
 
@@ -50,7 +51,7 @@ public class GotoCmd extends AbstractDevCmd {
             }
 
             if (loc != null)
-                pc.teleport(loc);
+                PlayerManager.teleport(pc, loc);
 
             return;
         }
@@ -61,7 +62,7 @@ public class GotoCmd extends AbstractDevCmd {
             }
 
             if (loc != null)
-                pc.teleport(loc);
+                PlayerManager.teleport(pc, loc);
 
             return;
         }
@@ -164,7 +165,7 @@ public class GotoCmd extends AbstractDevCmd {
             }
         }
         if (loc != null) {
-            pc.teleport(loc);
+            PlayerManager.teleport(pc, loc);
         }
     }
 

src/engine/devcmd/cmds/GotoObj.java

@@ -12,6 +12,7 @@ package engine.devcmd.cmds;
 import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.DbManager;
+import engine.gameManager.PlayerManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
 
@@ -84,7 +85,7 @@ public class GotoObj extends AbstractDevCmd {
             return;
         }
 
-        player.teleport(targetLoc);
+        PlayerManager.teleport(player, targetLoc);
 
     }
 

src/engine/devcmd/cmds/InfoCmd.java

@@ -15,12 +15,10 @@ import engine.Enum.GameObjectType;
 import engine.Enum.TargetColor;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.BuildingManager;
-import engine.gameManager.PowersManager;
+import engine.gameManager.PlayerManager;
 import engine.gameManager.SessionManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
-import engine.powers.EffectsBase;
-import engine.powers.PowersBase;
 import engine.server.MBServerStatics;
 import engine.util.StringUtils;
 
@@ -338,7 +336,7 @@ public class InfoCmd extends AbstractDevCmd {
 
                 output += "Altitude : " + targetPC.getLoc().y;
 
-                output += "Swimming : " + targetPC.isSwimming();
+                output += "Swimming : " + PlayerManager.isSwimming(targetPC);
                 output += newline;
                 output += "isMoving : " + targetPC.isMoving();
                 output += newline;
@@ -497,16 +495,13 @@ public class InfoCmd extends AbstractDevCmd {
                     output += newline;
                     output += "No building found." + newline;
                 }
-
-                output += "Damage: " + targetMob.mobBase.getDamageMin() + " - " + targetMob.mobBase.getDamageMax() + newline;
-                output += "ATR: " + targetMob.mobBase.getAttackRating() + newline;
-                output += "DEF: " + targetMob.defenseRating + newline;
-                output += "RANGE: " + targetMob.getRange() + newline;
-                output += "Effects:" + newline;
-                for(MobBaseEffects mbe : targetMob.mobBase.mobbaseEffects){
-                    EffectsBase eb = PowersManager.getEffectByToken(mbe.getToken());
-                    output += eb.getName() + " " + eb.getIDString() + newline;
+                int max = (int)(4.882 * targetMob.level + 121.0);
+                if(max > 321){
+                    max = 321;
                 }
+                int min = (int)(4.469 * targetMob.level - 3.469);
+                output += "Min Loot Roll = " + min;
+                output += "Max Loot Roll = " + max;
                 break;
             case Item:  //intentional passthrough
             case MobLoot:

src/engine/devcmd/cmds/JumpCmd.java

@@ -10,6 +10,7 @@
 package engine.devcmd.cmds;
 
 import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.PlayerManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.AbstractGameObject;
 import engine.objects.PlayerCharacter;
@@ -36,7 +37,7 @@ public class JumpCmd extends AbstractDevCmd {
             try {
                 float range = Float.parseFloat(words[1]);
                 Vector3fImmutable newLoc = pc.getFaceDir().scaleAdd(range, pc.getLoc());
-                pc.teleport(newLoc);
+                PlayerManager.teleport(pc, newLoc);
 
 
             } catch (NumberFormatException e) {
@@ -68,7 +69,7 @@ public class JumpCmd extends AbstractDevCmd {
 
         Vector3fImmutable loc = pc.getLoc();
         loc = loc.add(lat, 0f, -lon);
-        pc.teleport(loc);
+        PlayerManager.teleport(pc, loc);
     }
 
     @Override

src/engine/devcmd/cmds/MakeBaneCmd.java

@@ -12,10 +12,7 @@ package engine.devcmd.cmds;
 import engine.Enum.ProtectionState;
 import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.BuildingManager;
-import engine.gameManager.ChatManager;
-import engine.gameManager.DbManager;
-import engine.gameManager.ZoneManager;
+import engine.gameManager.*;
 import engine.math.Vector3f;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
@@ -74,7 +71,7 @@ public class MakeBaneCmd extends AbstractDevCmd {
             return;
         }
 
-        PlayerCharacter player = PlayerCharacter.getPlayerCharacter(attackerID);
+        PlayerCharacter player = PlayerManager.getPlayerCharacter(attackerID);
 
 
         if (player.getGuild().isEmptyGuild()) {
@@ -194,7 +191,7 @@ public class MakeBaneCmd extends AbstractDevCmd {
         Vector3fImmutable movePlayerOutsideStone = player.getLoc();
         movePlayerOutsideStone = movePlayerOutsideStone.setX(movePlayerOutsideStone.x + 10);
         movePlayerOutsideStone = movePlayerOutsideStone.setZ(movePlayerOutsideStone.z + 10);
-        player.teleport(movePlayerOutsideStone);
+        PlayerManager.teleport(player, movePlayerOutsideStone);
 
         throwbackInfo(pc, "The city has been succesfully baned.");
     }

src/engine/devcmd/cmds/RemoveObjectCmd.java

@@ -14,10 +14,7 @@ import engine.Enum.DbObjectType;
 import engine.Enum.GameObjectType;
 import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.BuildingManager;
-import engine.gameManager.ChatManager;
-import engine.gameManager.DbManager;
-import engine.gameManager.ZoneManager;
+import engine.gameManager.*;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
 
@@ -94,7 +91,7 @@ public class RemoveObjectCmd extends AbstractDevCmd {
                 removeBuilding(player, targetBuilding);
                 break;
             case NPC:
-                targetNPC = NPC.getNPC(targetID);
+                targetNPC = NPCManager.getNPC(targetID);
                 removeNPC(player, targetNPC);
                 break;
             case MOB:

src/engine/devcmd/cmds/ResetLevelCmd.java

@@ -1,6 +1,7 @@
 package engine.devcmd.cmds;
 
 import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.PlayerManager;
 import engine.objects.AbstractGameObject;
 import engine.objects.PlayerCharacter;
 
@@ -16,7 +17,7 @@ public class ResetLevelCmd extends AbstractDevCmd {
     protected void _doCmd(PlayerCharacter player, String[] args,
                           AbstractGameObject target) {
 
-        player.ResetLevel(Short.parseShort(args[0]));
+        PlayerManager.ResetLevel(player, Short.parseShort(args[0]));
     }
 
     @Override

src/engine/devcmd/cmds/RotateCmd.java

@@ -14,6 +14,7 @@ import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.BuildingManager;
 import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
+import engine.gameManager.NPCManager;
 import engine.math.Vector3f;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
@@ -96,7 +97,7 @@ public class RotateCmd extends AbstractDevCmd {
                         // building failed, try npc
                         NPC npc;
                         if (id != 0)
-                            npc = NPC.getNPC(id);
+                            npc = NPCManager.getNPC(id);
                         else
                             npc = getTargetAsNPC(pc);
                         if (npc != null) {
@@ -156,7 +157,7 @@ public class RotateCmd extends AbstractDevCmd {
             // building failed, try npc
             NPC npc;
             if (id != 0)
-                npc = NPC.getNPC(id);
+                npc = NPCManager.getNPC(id);
             else
                 npc = getTargetAsNPC(pc);
             if (npc != null) {

src/engine/devcmd/cmds/SetNpcEquipSetCmd.java

@@ -12,6 +12,7 @@ package engine.devcmd.cmds;
 import engine.Enum.GameObjectType;
 import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.NPCManager;
 import engine.objects.AbstractGameObject;
 import engine.objects.MobBase;
 import engine.objects.NPC;
@@ -52,7 +53,7 @@ public class SetNpcEquipSetCmd extends AbstractDevCmd {
             boolean complete = false;
 
             while (complete == false) {
-                complete = NPC.UpdateEquipSetID(npc, SetNpcEquipSetCmd.lastEquipSetID);
+                complete = NPCManager.UpdateEquipSetID(npc, SetNpcEquipSetCmd.lastEquipSetID);
 
                 if (!complete) {
                     SetNpcEquipSetCmd.lastEquipSetID++;
@@ -81,7 +82,7 @@ public class SetNpcEquipSetCmd extends AbstractDevCmd {
             boolean complete = false;
 
             while (complete == false) {
-                complete = NPC.UpdateEquipSetID(npc, SetNpcEquipSetCmd.lastEquipSetID);
+                complete = NPCManager.UpdateEquipSetID(npc, SetNpcEquipSetCmd.lastEquipSetID);
 
                 if (!complete) {
                     SetNpcEquipSetCmd.lastEquipSetID--;
@@ -109,7 +110,7 @@ public class SetNpcEquipSetCmd extends AbstractDevCmd {
             this.throwbackError(pc, e.getMessage());
         }
 
-        if (!NPC.UpdateEquipSetID(npc, equipSetID)) {
+        if (!NPCManager.UpdateEquipSetID(npc, equipSetID)) {
             this.throwbackError(pc, "Unable to find Equipset for ID " + equipSetID);
             return;
         }

src/engine/devcmd/cmds/SetNpcMobbaseCmd.java

@@ -12,6 +12,7 @@ package engine.devcmd.cmds;
 import engine.Enum.GameObjectType;
 import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.NPCManager;
 import engine.objects.AbstractGameObject;
 import engine.objects.MobBase;
 import engine.objects.NPC;
@@ -47,7 +48,7 @@ public class SetNpcMobbaseCmd extends AbstractDevCmd {
             this.throwbackError(player, "Cannot find Mobbase for ID " + mobBaseID);
             return;
         }
-        NPC.UpdateRaceID(npc, mobBaseID);
+        NPCManager.UpdateRaceID(npc, mobBaseID);
 
         WorldGrid.updateObject(npc);
 

src/engine/devcmd/cmds/SetNpcNameCmd.java

@@ -12,6 +12,7 @@ package engine.devcmd.cmds;
 import engine.Enum.GameObjectType;
 import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.NPCManager;
 import engine.objects.AbstractGameObject;
 import engine.objects.NPC;
 import engine.objects.PlayerCharacter;
@@ -43,7 +44,7 @@ public class SetNpcNameCmd extends AbstractDevCmd {
 
         String name = words[0];
 
-        NPC.UpdateName(npc, name);
+        NPCManager.UpdateName(npc, name);
 
         WorldGrid.updateObject(npc);
 

src/engine/devcmd/cmds/SlotTestCmd.java

@@ -13,6 +13,7 @@ import engine.Enum.GameObjectType;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.BuildingManager;
 import engine.gameManager.ChatManager;
+import engine.gameManager.PlayerManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
 
@@ -56,7 +57,7 @@ public class SlotTestCmd extends AbstractDevCmd {
             BuildingLocation buildingLocation = BuildingManager._slotLocations.get(building.meshUUID).get(slot - 1);
             slotLocation = building.getLoc().add(buildingLocation.getLocation());
             slotLocation = Vector3fImmutable.rotateAroundPoint(building.getLoc(), slotLocation, building.getBounds().getQuaternion().angleY);
-            playerCharacter.teleport(slotLocation);
+            PlayerManager.teleport(playerCharacter, slotLocation);
             return;
         }
 

src/engine/devcmd/cmds/SummonCmd.java

@@ -10,6 +10,7 @@
 package engine.devcmd.cmds;
 
 import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.PlayerManager;
 import engine.gameManager.SessionManager;
 import engine.gameManager.ZoneManager;
 import engine.math.Vector3fImmutable;
@@ -91,7 +92,7 @@ public class SummonCmd extends AbstractDevCmd {
         this.setTarget(pcToSummon); //for logging
 
         Vector3fImmutable loc = pc.getLoc();
-        pcToSummon.teleport(loc);
+        PlayerManager.teleport(pcToSummon, loc);
 
         this.throwbackInfo(pc, "Player " + pcToSummon.getCombinedName()
                 + " has been summoned to your location.");

src/engine/devcmd/cmds/aiInfoCmd.java

@@ -11,6 +11,7 @@ package engine.devcmd.cmds;
 
 import engine.Enum.GameObjectType;
 import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.PlayerManager;
 import engine.objects.AbstractGameObject;
 import engine.objects.Mob;
 import engine.objects.PlayerCharacter;
@@ -77,7 +78,7 @@ public class aiInfoCmd extends AbstractDevCmd {
             output += "Players Loaded:" + newline;
         }
         for (Map.Entry<Integer, Boolean> entry : mob.playerAgroMap.entrySet()) {
-            output += "Player ID: " + entry.getKey() + " Hate Value: " + (PlayerCharacter.getPlayerCharacter(entry.getKey())).getHateValue() + newline;
+            output += "Player ID: " + entry.getKey() + " Hate Value: " + (PlayerManager.getPlayerCharacter(entry.getKey())).getHateValue() + newline;
         }
         if (mob.getCombatTarget() != null)
             output += "Current Target: " + mob.getCombatTarget().getName() + newline;

src/engine/gameManager/BuildingManager.java

@@ -513,7 +513,7 @@ public enum BuildingManager {
 
         NPC npc = null;
 
-        npc = NPC.createNPC(pirateName, NpcID.getObjectUUID(), NpcLoc, null, zone, (short) rank, building);
+        npc = NPCManager.createNPC(pirateName, NpcID.getObjectUUID(), NpcLoc, null, zone, (short) rank, building);
 
         if (npc == null)
             return false;
@@ -568,7 +568,7 @@ public enum BuildingManager {
         Mob mob;
         NPC npc;
 
-        if (NPC.ISWallArcher(contract)) {
+        if (NPCManager.ISWallArcher(contract)) {
 
             mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), true, zone, building, contract.getContractID(), pirateName, rank);
 
@@ -580,7 +580,7 @@ public enum BuildingManager {
             return true;
         }
 
-        if (NPC.ISGuardCaptain(contract.getContractID())) {
+        if (NPCManager.ISGuardCaptain(contract.getContractID())) {
 
             mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), true, zone, building, contract.getContractID(), pirateName, rank);
 
@@ -604,7 +604,7 @@ public enum BuildingManager {
             return true;
         }
 
-        npc = NPC.createNPC(pirateName, contract.getObjectUUID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, (short) rank, building);
+        npc = NPCManager.createNPC(pirateName, contract.getObjectUUID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, (short) rank, building);
 
         if (npc == null)
             return false;
@@ -810,7 +810,7 @@ public enum BuildingManager {
             }
 
             ManageCityAssetsMsg mca = new ManageCityAssetsMsg();
-            mca.actionType = NPC.SVR_CLOSE_WINDOW;
+            mca.actionType = NPCManager.SVR_CLOSE_WINDOW;
             mca.setTargetType(building.getObjectType().ordinal());
             mca.setTargetID(building.getObjectUUID());
             origin.sendMsg(mca);

src/engine/gameManager/ChatManager.java

@@ -14,7 +14,6 @@ import engine.Enum.GameObjectType;
 import engine.Enum.ModType;
 import engine.Enum.SourceType;
 import engine.InterestManagement.WorldGrid;
-import engine.QuestSystem.QuestManager;
 import engine.db.archive.BaneRecord;
 import engine.db.archive.PvpRecord;
 import engine.net.Dispatch;
@@ -109,9 +108,9 @@ public enum ChatManager {
                 ChatManager.chatIC(pc, (ChatICMsg) msg);
                 return;
             case LEADERCHANNELMESSAGE:
-            case GLOBALCHANNELMESSAGE:
                 ChatManager.chatGlobal(pc, msg.getMessage(), isFlood);
                 return;
+            case GLOBALCHANNELMESSAGE:
             case CHATPVP:
             case CHATCITY:
             case CHATINFO:
@@ -200,11 +199,6 @@ public enum ChatManager {
             return;
         }
 
-        if(text.equalsIgnoreCase("show_quest()")){
-            QuestManager.displayCurrentQuest(pcSender);
-            return;
-        }
-
         if (ChatManager.isVersionRequest(text) == true) {
             sendSystemMessage(pcSender, ConfigManager.MB_WORLD_GREETING.getValue());
             return;

src/engine/gameManager/CombatManager.java

@@ -65,7 +65,7 @@ public enum CombatManager {
         targetType = msg.getTargetType();
 
         if (targetType == GameObjectType.PlayerCharacter.ordinal()) {
-            target = PlayerCharacter.getFromCache(msg.getTargetID());
+            target = PlayerManager.getFromCache(msg.getTargetID());
         } else if (targetType == GameObjectType.Building.ordinal()) {
             target = BuildingManager.getBuildingFromCache(msg.getTargetID());
         } else if (targetType == GameObjectType.Mob.ordinal()) {
@@ -171,7 +171,7 @@ public enum CombatManager {
         targetType = msg.getTargetType();
 
         if (targetType == GameObjectType.PlayerCharacter.ordinal())
-            target = PlayerCharacter.getFromCache(msg.getTargetID());
+            target = PlayerManager.getFromCache(msg.getTargetID());
         else if (targetType == GameObjectType.Building.ordinal())
             target = BuildingManager.getBuildingFromCache(msg.getTargetID());
         else if (targetType == GameObjectType.Mob.ordinal())
@@ -662,8 +662,9 @@ public enum CombatManager {
 
             DeferredPowerJob dpj = null;
 
-            boolean hitLanded = LandHit((int)atr,(int)defense);
-            if (hitLanded) {
+
+
+            if (LandHit((int)atr,(int)defense)) {
 
                 if (ac.getObjectType().equals(GameObjectType.PlayerCharacter))
                     updateAttackTimers((PlayerCharacter) ac, target, true);
@@ -692,13 +693,7 @@ public enum CombatManager {
 
                         PlayerBonuses bonus = ac.getBonuses();
                         float attackRange = getWeaponRange(wb, bonus);
-                        if(specialCaseHitRoll(dpj.getPowerToken())) {
-                            if(hitLanded) {
-                                dpj.attack(target, attackRange);
-                            }
-                        }else{
-                            dpj.attack(target, attackRange);
-                        }
+                        dpj.attack(target, attackRange);
 
                         if (dpj.getPower() != null && (dpj.getPowerToken() == -1851459567 || dpj.getPowerToken() == -1851489518))
                             ((PlayerCharacter) ac).setWeaponPower(dpj);
@@ -713,13 +708,7 @@ public enum CombatManager {
 
                     if (dpj != null && dpj.getPower() != null && (dpj.getPowerToken() == -1851459567 || dpj.getPowerToken() == -1851489518)) {
                         float attackRange = getWeaponRange(wb, bonuses);
-                        if(specialCaseHitRoll(dpj.getPowerToken())) {
-                            if(hitLanded) {
-                                dpj.attack(target, attackRange);
-                            }
-                        }else{
-                            dpj.attack(target, attackRange);
-                        }
+                        dpj.attack(target, attackRange);
                     }
                 }
 
@@ -927,13 +916,7 @@ public enum CombatManager {
                         if (wp.requiresHitRoll() == false) {
                             PlayerBonuses bonus = ac.getBonuses();
                             float attackRange = getWeaponRange(wb, bonus);
-                            if(specialCaseHitRoll(dpj.getPowerToken())) {
-                                if(hitLanded) {
-                                    dpj.attack(target, attackRange);
-                                }
-                            }else{
-                                dpj.attack(target, attackRange);
-                            }
+                            dpj.attack(target, attackRange);
                         } else
                             ((PlayerCharacter) ac).setWeaponPower(null);
                     }
@@ -1266,7 +1249,7 @@ public enum CombatManager {
         if (pc == null)
             return;
 
-        if(pc.isFlying())
+        if(PlayerManager.isFlying(pc))
             pc.setSit(false);
         else
             pc.setSit(toggle);
@@ -1470,28 +1453,19 @@ public enum CombatManager {
             ((AbstractCharacter) awo).getCharItemManager().damageRandomArmor(1);
     }
 
-    public static boolean LandHit(int C5, int D5){
-
-        float chance = (C5-((C5+D5)*.315f)) / ((D5-((C5+D5)*.315f)) + (C5-((C5+D5)*.315f)));
-        int convertedChance = Math.round(chance * 100);
-        //convertedChance = Math.max(5, Math.min(95, convertedChance));
+    public static boolean LandHit(int atr, int defense){
 
         int roll = ThreadLocalRandom.current().nextInt(101);
+        float chance = (float)((atr-((atr+defense)*0.315))/((defense-((atr+defense)*0.315))+(atr-((atr+defense)*0.315))));
 
-        if(roll < 5)//always 5% chance ot miss
-            return false;
+        int connvertedChance = (int)(chance * 100);
 
-        return roll <= convertedChance;
-    }
+        if(connvertedChance < 5)
+            connvertedChance = 5;
 
-    public static boolean specialCaseHitRoll(int powerID){
-        switch(powerID) {
-            case 563200808: // Naargal's Bite
-            case 563205337: // Naargal's Dart
-            case 563205930: // Sword of Saint Malorn
-                return true;
-            default:
-                return false;
-        }
+        if(connvertedChance > 95)
+            connvertedChance = 95;
+
+        return connvertedChance > roll;
     }
 }

src/engine/gameManager/DbManager.java

@@ -85,10 +85,10 @@ public enum DbManager {
 
         switch (objectType) {
             case PlayerCharacter:
-                outObject = PlayerCharacter.getPlayerCharacter(objectUUID);
+                outObject = PlayerManager.getPlayerCharacter(objectUUID);
                 break;
             case NPC:
-                outObject = NPC.getNPC(objectUUID);
+                outObject = NPCManager.getNPC(objectUUID);
                 break;
             case Mob:
                 outObject = Mob.getFromCache(objectUUID);

src/engine/gameManager/GuildManager.java

@@ -74,16 +74,16 @@ public enum GuildManager {
             }
         }
 
-        playerCharacter.setInnerCouncil(false);
-        playerCharacter.setGuildLeader(false);
+        PlayerManager.setInnerCouncil(playerCharacter, false);
+        PlayerManager.setGuildLeader(playerCharacter, false);
         playerCharacter.setGuild(guild);
 
         // Cleanup guild stuff
-        playerCharacter.resetGuildStatuses();
+        PlayerManager.resetGuildStatuses(playerCharacter);
 
         // send success message to client
         if (fromTeleportScreen && guild.isNPCGuild())
-            playerCharacter.setFullMember(true);
+            PlayerManager.setFullMember(playerCharacter, true);
 
         msg = new AcceptInviteToGuildMsg(guild.getObjectUUID(), 1, 0);
 
@@ -178,7 +178,7 @@ public enum GuildManager {
                         bindBuilding = city.getTOL();
 
                 if (bindBuilding == null)
-                    bindBuilding = PlayerCharacter.getBindBuildingForGuild(playerCharacter);
+                    bindBuilding = PlayerManager.getBindBuildingForGuild(playerCharacter);
 
                 playerCharacter.setBindBuildingID(bindBuilding != null ? bindBuilding.getObjectUUID() : 0);
             }

src/engine/gameManager/LootManager.java

@@ -75,11 +75,6 @@ public enum LootManager {
     }
 
     public static void GenerateMobLoot(Mob mob) {
-
-        if(mob == null){
-            return;
-        }
-
         //determine if mob is in hotzone
         boolean inHotzone = false;
 
@@ -185,16 +180,14 @@ public enum LootManager {
 
 
         // Iterate all entries in this bootySet and process accordingly
-        Zone zone = ZoneManager.findSmallestZone(mob.loc);
         for (BootySetEntry bse : entries) {
             switch (bse.bootyType) {
                 case "GOLD":
-                    if (zone != null && zone.getSafeZone() == (byte)1)
-                        return; // no loot to drop in safezones
                     GenerateGoldDrop(mob, bse, inHotzone);
                     break;
                 case "LOOT":
-                    if (zone != null && zone.getSafeZone() == (byte)1)
+
+                    if (mob.getSafeZone())
                         return; // no loot to drop in safezones
 
                     dropRate = LootManager.NORMAL_DROP_RATE;

src/engine/gameManager/NPCManager.java

@@ -2,14 +2,17 @@ package engine.gameManager;
 
 import engine.Enum;
 import engine.InterestManagement.WorldGrid;
+import engine.exception.SerializationException;
 import engine.math.Quaternion;
 import engine.math.Vector3f;
 import engine.math.Vector3fImmutable;
+import engine.net.ByteBufferWriter;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.msg.PetMsg;
 import engine.objects.*;
 import engine.powers.EffectsBase;
+import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
@@ -22,6 +25,8 @@ public enum NPCManager {
 
     NPC_MANAGER;
     public static HashMap<Integer, ArrayList<Integer>> _runeSetMap = new HashMap<>();
+    public static int SVR_CLOSE_WINDOW = 4;
+    public static HashMap<Integer, ArrayList<String>> _pirateNames = new HashMap<>();
 
     public static void LoadAllRuneSets() {
         _runeSetMap = DbManager.ItemBaseQueries.LOAD_RUNES_FOR_NPC_AND_MOBS();
@@ -286,10 +291,10 @@ public enum NPCManager {
         // If we cannot find name for this mobbase then
         // fallback to human male
 
-        if (NPC._pirateNames.containsKey(mobBaseID))
-            nameList = NPC._pirateNames.get(mobBaseID);
+        if (_pirateNames.containsKey(mobBaseID))
+            nameList = _pirateNames.get(mobBaseID);
         else
-            nameList = NPC._pirateNames.get(2111);
+            nameList = _pirateNames.get(2111);
 
         if (nameList == null) {
             Logger.error("Null name list for 2111!");
@@ -370,4 +375,384 @@ public enum NPCManager {
 
         return buildingSlot;
     }
+
+    public static boolean ISWallArcher(Contract contract) {
+
+        if (contract == null)
+            return false;
+
+        //838, 950, 1051, 1181, 1251, 1351, 1451, 1501, 1526, 1551, 980101,
+
+        return contract.getAllowedBuildings().contains(Enum.BuildingGroup.WALLCORNER) ||
+                contract.getAllowedBuildings().contains(Enum.BuildingGroup.WALLSTRAIGHTTOWER);
+    }
+
+    public static NPC getFromCache(int id) {
+        return (NPC) DbManager.getFromCache(Enum.GameObjectType.NPC, id);
+    }
+
+    public static boolean UpdateName(NPC npc, String value) {
+
+        if (!DbManager.NPCQueries.UPDATE_NAME(npc, value))
+            return false;
+
+        npc.setName(value);
+        return true;
+
+    }
+
+    public static void serializeNpcForClientMsgOtherPlayer(NPC npc, ByteBufferWriter writer, boolean hideAsciiLastName)
+            throws SerializationException {
+        serializeForClientMsgOtherPlayer(npc, writer);
+    }
+
+    public static void serializeForClientMsgOtherPlayer(NPC npc, ByteBufferWriter writer)
+            throws SerializationException {
+
+        writer.putInt(0);
+        writer.putInt(0);
+
+        //num Runes
+        int cnt = 3;
+        boolean isVamp = false, isHealer = false, isArcher = false, isTrainer = false;
+        int contractID = 0, classID = 0;
+        int extraRune = 0;
+
+        if (npc.contract != null) {
+            contractID = npc.contract.getContractID();
+            classID = npc.contract.getClassID();
+            extraRune = npc.contract.getExtraRune();
+
+            if (extraRune == contractID)
+                extraRune = 0;
+
+        }
+
+        if ((contractID > 252642 && contractID < 252647) || contractID == 252652) {
+            isVamp = true;
+            cnt++;
+        }
+
+        if (contractID == 252582 || contractID == 252579 || contractID == 252581
+                || contractID == 252584 || contractID == 252597 || contractID == 252598
+                || contractID == 252628 || extraRune == 252582 || extraRune == 252579
+                || extraRune == 252581 || extraRune == 252584 || extraRune == 252597
+                || extraRune == 252598 || extraRune == 252628) {
+            isHealer = true;
+            cnt++;
+        }
+
+        if (contractID == 252570) {
+            isArcher = true;
+            cnt++;
+        }
+
+        if (classID != 0)
+            cnt++;
+
+        if (extraRune != 0 && extraRune != contractID)
+            cnt++;
+
+        writer.putInt(cnt);
+
+        //Race
+        writer.putInt(1);
+        writer.putInt(0);
+
+        if (npc.getMobBase() != null)
+            writer.putInt(npc.getMobBase().getLoadID());
+        else
+            writer.putInt(2011);
+
+        writer.putInt(Enum.GameObjectType.NPCRaceRune.ordinal());
+        writer.putInt(npc.currentID);
+
+        //Class/Trainer/Whatever
+        writer.putInt(5);
+        writer.putInt(0);
+
+        if (npc.contract != null)
+            writer.putInt(contractID);
+        else
+            writer.putInt(2500);
+
+        writer.putInt(Enum.GameObjectType.NPCClassRune.ordinal());
+        writer.putInt(npc.currentID);
+
+        //vampire trainer
+        cnt = 0;
+
+        if (extraRune != 0)
+            cnt = serializeExtraRune(npc, extraRune, cnt, writer);
+        if (isVamp)
+            cnt = serializeExtraRune(npc, 252647, cnt, writer);
+
+        //Healer trainer
+        if (isHealer)
+            cnt = serializeExtraRune(npc, 252592, cnt, writer);
+
+        if (classID != 0) {
+            writer.putInt(4);
+            writer.putInt(0);
+            writer.putInt(classID);
+            writer.putInt(Enum.GameObjectType.NPCExtraRune.ordinal());
+            writer.putInt(npc.currentID);
+        }
+
+        //Scout trainer
+        if (isArcher)
+            cnt = serializeExtraRune(npc, 252654, cnt, writer);
+
+        //Shopkeeper
+        writer.putInt(5);
+        writer.putInt(0);
+        writer.putInt(0x3DACC);
+        writer.putInt(Enum.GameObjectType.NPCShopkeeperRune.ordinal());
+        writer.putInt(npc.currentID);
+
+        //Send Stats
+        writer.putInt(5);
+        writer.putInt(0x8AC3C0E6); //Str
+        writer.putInt(0);
+        writer.putInt(0xACB82E33); //Dex
+        writer.putInt(0);
+        writer.putInt(0xB15DC77E); //Con
+        writer.putInt(0);
+        writer.putInt(0xE07B3336); //Int
+        writer.putInt(0);
+        writer.putInt(0xFF665EC3); //Spi
+        writer.putInt(0);
+
+        writer.putString(npc.getName());
+        writer.putString("");
+
+        writer.putInt(0);
+        writer.putInt(0);
+        writer.putInt(0);
+        writer.putInt(0);
+
+        writer.put((byte) 0);
+        writer.putInt(npc.getObjectType().ordinal());
+        writer.putInt(npc.currentID);
+
+        writer.putFloat(1.0f);
+        writer.putFloat(1.0f);
+        writer.putFloat(1.0f);
+
+        if (npc.region != null)
+            writer.putVector3f(ZoneManager.convertWorldToLocal(npc.building, npc.getLoc()));
+        else
+            writer.putVector3f(npc.getLoc());
+
+        //Rotation
+        float radians = (float) Math.acos(npc.getRot().y) * 2;
+
+        if (npc.building != null)
+            if (npc.building.getBounds() != null && npc.building.getBounds().getQuaternion() != null)
+                radians += (npc.building.getBounds().getQuaternion()).angleY;
+
+        writer.putFloat(radians);
+
+        //Running Speed
+        writer.putInt(0);
+
+        // get a copy of the equipped items.
+
+        if (npc.equip != null) {
+            writer.putInt(npc.equip.size());
+
+            for (MobEquipment me : npc.equip.values())
+                MobEquipment.serializeForClientMsg(me, writer);
+        } else
+            writer.putInt(0);
+
+        writer.putInt((npc.level / 10));
+        writer.putInt(npc.level);
+        writer.putInt(npc.getIsSittingAsInt()); //Standing
+        writer.putInt(npc.getIsWalkingAsInt()); //Walking
+        writer.putInt(npc.getIsCombatAsInt()); //Combat
+        writer.putInt(2); //Unknown
+        writer.putInt(1); //Unknown - Headlights?
+        writer.putInt(0);
+
+        if (npc.building != null && npc.region != null) {
+            writer.putInt(npc.building.getObjectType().ordinal());
+            writer.putInt(npc.building.getObjectUUID());
+        } else {
+            writer.putInt(0); //<-Building Object Type
+            writer.putInt(0); //<-Building Object ID
+        }
+        writer.put((byte) 0);
+        writer.put((byte) 0);
+        writer.put((byte) 0);
+
+        //npc dialog menus from contracts
+
+        if (npc.contract != null) {
+            ArrayList<Integer> npcMenuOptions = npc.contract.getNPCMenuOptions();
+            writer.putInt(npcMenuOptions.size());
+            for (Integer val : npcMenuOptions) {
+                writer.putInt(val);
+            }
+
+        } else
+            writer.putInt(0);
+
+        writer.put((byte) 1);
+
+        if (npc.building != null) {
+            writer.putInt(Enum.GameObjectType.StrongBox.ordinal());
+            writer.putInt(npc.currentID);
+            writer.putInt(Enum.GameObjectType.StrongBox.ordinal());
+            writer.putInt(npc.building.getObjectUUID());
+        } else {
+            writer.putLong(0);
+            writer.putLong(0);
+        }
+
+        if (npc.contract != null)
+            writer.putInt(npc.contract.getIconID());
+        else
+            writer.putInt(0); //npc icon ID
+
+        writer.putInt(0);
+        writer.putShort((short) 0);
+
+        if (npc.contract != null && npc.contract.isTrainer()) {
+            writer.putInt(classID);
+        } else {
+            writer.putInt(0);
+        }
+
+        if (npc.contract != null && npc.contract.isTrainer())
+            writer.putInt(classID);
+        else
+            writer.putInt(0);
+
+        writer.putInt(0);
+        writer.putInt(0);
+
+        writer.putFloat(4);
+        writer.putInt(0);
+        writer.putInt(0);
+        writer.putInt(0);
+        writer.put((byte) 0);
+
+        //Pull guild info from building if linked to one
+
+        Guild.serializeForClientMsg(npc.guild, writer, null, true);
+
+        writer.putInt(1);
+        writer.putInt(0x8A2E);
+        writer.putInt(0);
+        writer.putInt(0);
+
+        //TODO Guard
+        writer.put((byte) 0); //Is guard..
+
+        writer.putFloat(1500f); //npc.healthMax
+        writer.putFloat(1500f); //npc.health
+
+        //TODO Peace Zone
+        writer.put((byte) 1); //0=show tags, 1=don't
+        writer.putInt(0);
+        writer.put((byte) 0);
+    }
+
+    private static int serializeExtraRune(NPC npc, int runeID, int cnt, ByteBufferWriter writer) {
+
+        writer.putInt(5);
+        writer.putInt(0);
+        writer.putInt(runeID);
+
+        if (cnt == 0)
+            writer.putInt(Enum.GameObjectType.NPCClassRuneTwo.ordinal());
+        else
+            writer.putInt(Enum.GameObjectType.NPCClassRuneThree.ordinal());
+
+        writer.putInt(npc.currentID);
+        return cnt + 1;
+    }
+
+    public static NPC createNPC(String name, int contractID, Vector3fImmutable spawn, Guild guild, Zone parent, short level, Building building) {
+
+        NPC newNPC = new NPC();
+
+        newNPC.setName(name);
+        newNPC.contractUUID = contractID;
+
+        if (building == null)
+            newNPC.bindLoc = spawn;
+        else
+            newNPC.bindLoc = Vector3fImmutable.ZERO;
+
+        newNPC.parentZoneUUID = parent.getObjectUUID();
+        newNPC.guildUUID = guild.getObjectUUID();
+
+        if (building == null)
+            newNPC.buildingUUID = 0;
+        else
+            newNPC.buildingUUID = building.getObjectUUID();
+
+        newNPC.level = level;
+
+        newNPC.buyPercent = .33f;
+        newNPC.sellPercent = 1;
+
+        NPC npc;
+
+        try {
+            npc = DbManager.NPCQueries.PERSIST(newNPC);
+            npc.setObjectTypeMask(MBServerStatics.MASK_NPC);
+        } catch (Exception e) {
+            Logger.error(e);
+            npc = null;
+        }
+
+        return npc;
+    }
+
+    public static NPC getNPC(int id) {
+
+        if (id == 0)
+            return null;
+
+        NPC npc = (NPC) DbManager.getFromCache(Enum.GameObjectType.NPC, id);
+
+        if (npc != null)
+            return npc;
+
+        return DbManager.NPCQueries.GET_NPC(id);
+    }
+
+    public static boolean ISGuardCaptain(int contractID) {
+        return Enum.MinionType.ContractToMinionMap.containsKey(contractID);
+    }
+
+    public static boolean UpdateEquipSetID(NPC npc, int equipSetID) {
+
+        if (!LootManager._bootySetMap.containsKey(equipSetID))
+            return false;
+
+        if (!DbManager.NPCQueries.UPDATE_EQUIPSET(npc, equipSetID))
+            return false;
+
+        npc.equipmentSetID = equipSetID;
+
+        return true;
+    }
+
+    public static boolean UpdateRaceID(NPC npc, int raceID) {
+
+        if (!DbManager.NPCQueries.UPDATE_MOBBASE(npc, raceID))
+            return false;
+
+        npc.loadID = raceID;
+        npc.mobBase = MobBase.getMobBase(npc.loadID);
+        return true;
+    }
+
+    public static NPCProfits GetNPCProfits(NPC npc) {
+        return NPCProfits.ProfitCache.get(npc.currentID);
+    }
 }

src/engine/gameManager/PowersManager.java

@@ -165,7 +165,7 @@ public enum PowersManager {
 
         PlayerCharacter pc = SessionManager.getPlayerCharacter(origin);
 
-        if(!pc.isFlying() && powersBaseByToken.get(msg.getPowerUsedID()) != null && powersBaseByToken.get(msg.getPowerUsedID()).isSpell) //cant be sitting if flying
+        if(!PlayerManager.isFlying(pc)) //cant be sitting if flying
             CombatManager.toggleSit(false,origin);
 
         if(pc.isMoving())
@@ -294,7 +294,7 @@ public enum PowersManager {
         }
 
         //check for movement buffs while flying
-        if(playerCharacter.isFlying()) {
+        if(PlayerManager.isFlying(playerCharacter)) {
             switch(pb.token){
                 case 429005674:
                 case 429505739:
@@ -349,10 +349,8 @@ public enum PowersManager {
             msg.setNumTrains(trains);
         }
 
-        //double stack point values for some useless disc spells
         switch(pb.token){
             case 429420458: // BH eyes
-            case 429601664: // huntsman skin the beast
                 msg.setNumTrains(msg.getNumTrains() * 2);
                 break;
         }
@@ -604,12 +602,12 @@ public enum PowersManager {
         }
 
         // update cast (use skill) fail condition
-        if(pb.token != 429396028 && pb.breaksForm) {
+        if(pb.token != 429396028) {
             playerCharacter.cancelOnCast();
         }
 
         // update castSpell (use spell) fail condition if spell
-        if (pb.isSpell() && pb.breaksForm)
+        if (pb.isSpell())
             playerCharacter.cancelOnSpell();
 
         // get cast time in ms.
@@ -750,11 +748,10 @@ public enum PowersManager {
 
         // make person casting stand up if spell (unless they're casting a chant which does not make them stand up)
         // update cast (use skill) fail condition
-        if(pb.breaksForm)
-            caster.cancelOnCast();
+        caster.cancelOnCast();
 
         // update castSpell (use spell) fail condition if spell
-        if (pb.isSpell() && pb.breaksForm)
+        if (pb.isSpell())
             caster.cancelOnSpell();
 
         // get cast time in ms.
@@ -790,11 +787,13 @@ public enum PowersManager {
         if (playerCharacter == null || msg == null)
             return;
 
-        if(msg.getPowerUsedID() == 429005674){ //bard sprint
-            //use sprint instead of ballad of beregund the bold
-            //applyPower(playerCharacter,playerCharacter,playerCharacter.loc,429611355,msg.getNumTrains(),false);
-            msg.setPowerUsedID(429611355);
-        }
+        //if((msg.getPowerUsedID() == 429495514 || msg.getPowerUsedID() == 429407306) && playerCharacter.getRace().getName().toLowerCase().contains("shade")){
+        //    //use sneak instead of hide
+        //    PowersBase pb = PowersManager.getPowerByToken(429397210);
+        //    int offsetTrains = (40 - msg.getNumTrains()) ;
+        //    applyPower(playerCharacter,playerCharacter,playerCharacter.loc,429397210,msg.getNumTrains(),false);
+        //    applyPower(playerCharacter,playerCharacter,playerCharacter.loc,427857146,offsetTrains,false);
+        //}
         if(msg.getPowerUsedID() == 429494441) {//wildkins chase
             playerCharacter.removeEffectBySource(EffectSourceType.Root,40,true);
             playerCharacter.removeEffectBySource(EffectSourceType.Snare,40,true);
@@ -1364,7 +1363,7 @@ public enum PowersManager {
         if (pc == null)
             return;
 
-        PlayerCharacter source = PlayerCharacter.getFromCache(msg.getSourceID());
+        PlayerCharacter source = PlayerManager.getFromCache(msg.getSourceID());
         if (source == null)
             return;
 
@@ -2845,123 +2844,6 @@ public enum PowersManager {
         }
     }
 
-    public static boolean breakForm(int token) {
-        switch (token) {
-            case 429505865:
-            case 429407561:
-            case 429492073:
-            case 429644123:
-            case 429393769:
-            case 429545819:
-            case 429426537:
-            case 429590377:
-            case 429508425:
-            case 429541193:
-            case 429573961:
-            case 427924330:
-            case 429402918:
-            case 429545688:
-            case 429005674:
-            case 429637823:
-            case 429590426:
-            case 428066972:
-            case 429441862:
-            case 431611756:
-            case 431578988:
-            case 429502506:
-            case 429398191:
-            case 429447384:
-            case 428892191:
-            case 431579167:
-            case 430977067:
-            case 429409100:
-            case 429441868:
-            case 429594877:
-            case 427908971:
-            case 683741153:
-            case 429770569:
-            case 429452379:
-            case 429605055:
-            case 429086971:
-            case 429443230:
-            case 429505400:
-            case 429492122:
-            case 429643992:
-            case 550062236:
-            case 429498252:
-            case 429611224:
-            case 429441834:
-            case 428918940:
-            case 429633739:
-            case 429633579:
-            case 429568043:
-            case 429048646:
-            case 428392639:
-            case 428425407:
-            case 429054168:
-            case 429021400:
-            case 428955864:
-            case 429119704:
-            case 428890328:
-            case 428923096:
-            case 429218008:
-            case 429086936:
-            case 428988632:
-            case 428688204:
-            case 429514603:
-            case 428924959:
-            case 429393818:
-            case 429720966:
-            case 428982463:
-            case 427933887:
-            case 429572287:
-            case 429501222:
-            case 430694431:
-            case 429436131:
-            case 430006124:
-            case 429611355:
-            case 428005600:
-            case 427935608:
-            case 428949695:
-            case 427988218:
-            case 429414616:
-            case 429496495:
-            case 429428796:
-            case 563795754:
-            case 428988217:
-            case 429432716:
-            case 428955899:
-            case 429393286:
-            case 550062220:
-            case 429495557:
-            case 429401278:
-            case 428377478:
-            case 429409094:
-            case 428191947:
-            case 429434474:
-            case 429403363:
-            case 429512920:
-            case 429419611:
-            case 429645676:
-            case 429602895:
-            case 429605071:
-            case 429592428:
-            case 429500010:
-            case 429406602:
-            case 429426586:
-            case 429633898:
-            case 550062212:
-            case 429994027:
-            case 430813227:
-            case 429928491:
-            case 430026795:
-            case 429517915:
-            case 431854842:
-            case 429767544:
-                return false;
-        }
-        return true;
-    }
 }
 
 

src/engine/gameManager/TradeManager.java

@@ -151,7 +151,7 @@ public enum TradeManager {
     }
 
     public static void invalidTradeRequest(InvalidTradeRequestMsg msg) {
-        PlayerCharacter requester = PlayerCharacter.getFromCache(msg.getRequesterID());
+        PlayerCharacter requester = PlayerManager.getFromCache(msg.getRequesterID());
         Dispatch dispatch;
 
         dispatch = Dispatch.borrow(requester, msg);

src/engine/jobs/AbstractEffectJob.java

@@ -117,7 +117,7 @@ public abstract class AbstractEffectJob extends AbstractScheduleJob {
     }
 
     public void endEffect() {
-        if (this.eb == null || this.power == null)
+        if (this.eb == null)
             return;
         this.eb.endEffect(this.source, this.target, this.trains, this.power, this);
     }

src/engine/jobs/DatabaseUpdateJob.java

@@ -11,6 +11,7 @@ package engine.jobs;
 
 import engine.Enum.GameObjectType;
 import engine.gameManager.DbManager;
+import engine.gameManager.PlayerManager;
 import engine.job.AbstractScheduleJob;
 import engine.objects.AbstractGameObject;
 import engine.objects.Building;
@@ -39,7 +40,7 @@ public class DatabaseUpdateJob extends AbstractScheduleJob {
 
             switch (this.type) {
                 case "Skills":
-                    pc.updateSkillsAndPowersToDatabase();
+                    PlayerManager.updateSkillsAndPowersToDatabase(pc);
                     break;
                 case "Stats":
                     DbManager.PlayerCharacterQueries.UPDATE_CHARACTER_STATS(pc);

src/engine/jobs/FinishSummonsJob.java

@@ -11,7 +11,7 @@ package engine.jobs;
 
 import engine.Enum.ModType;
 import engine.Enum.SourceType;
-import engine.gameManager.PowersManager;
+import engine.gameManager.PlayerManager;
 import engine.job.AbstractScheduleJob;
 import engine.job.JobContainer;
 import engine.net.client.msg.ErrorPopupMsg;
@@ -64,7 +64,7 @@ public class FinishSummonsJob extends AbstractScheduleJob {
         if (this.source.region != null)
             this.target.setRegion(this.source.region);
         //teleport target to source
-        target.teleport(source.getLoc());
+        PlayerManager.teleport(target, source.getLoc());
     }
 
     @Override

src/engine/jobs/StuckJob.java

@@ -9,6 +9,7 @@
 package engine.jobs;
 
 import engine.InterestManagement.WorldGrid;
+import engine.gameManager.PlayerManager;
 import engine.job.AbstractScheduleJob;
 import engine.math.Bounds;
 import engine.math.Vector3fImmutable;
@@ -69,7 +70,7 @@ public class StuckJob extends AbstractScheduleJob {
             return;
         }
 
-        player.teleport(stuckLoc);
+        PlayerManager.teleport(player, stuckLoc);
 
     }
 

src/engine/jobs/TeleportJob.java

@@ -9,6 +9,7 @@
 
 package engine.jobs;
 
+import engine.gameManager.PlayerManager;
 import engine.job.AbstractScheduleJob;
 import engine.math.Vector3fImmutable;
 import engine.net.client.ClientConnection;
@@ -52,7 +53,7 @@ public class TeleportJob extends AbstractScheduleJob {
             return;
         }
 
-        pc.teleport(loc);
+        PlayerManager.teleport(pc, loc);
 
         if (this.setSafeMode)
             pc.setSafeMode();

src/engine/jobs/UpgradeBuildingJob.java

@@ -1,9 +1,7 @@
 package engine.jobs;
 
-import engine.gameManager.ZoneManager;
 import engine.job.AbstractScheduleJob;
 import engine.objects.Building;
-import engine.objects.City;
 import org.pmw.tinylog.Logger;
 
 /*
@@ -43,18 +41,6 @@ public class UpgradeBuildingJob extends AbstractScheduleJob {
 
         rankingBuilding.setRank(rankingBuilding.getRank() + 1);
 
-        if(rankingBuilding.getBlueprint().isWallPiece()){
-            City cityObject = ZoneManager.getCityAtLocation(rankingBuilding.loc);
-            if(cityObject.getTOL().getRank() == 8) {
-                if (rankingBuilding.getBlueprint() != null && rankingBuilding.getBlueprint().getBuildingGroup() != null && rankingBuilding.getBlueprint().isWallPiece()) {
-                    float currentHealthRatio = rankingBuilding.getCurrentHitpoints() / rankingBuilding.healthMax;
-                    float newMax = rankingBuilding.healthMax * 1.1f;
-                    rankingBuilding.setMaxHitPoints(newMax);
-                    rankingBuilding.setHealth(rankingBuilding.healthMax * currentHealthRatio);
-                }
-            }
-        }
-
         // Reload the object
 
 

src/engine/mobileAI/MobAI.java

@@ -16,9 +16,7 @@ import engine.math.Vector3fImmutable;
 import engine.mobileAI.Threads.MobAIThread;
 import engine.mobileAI.utilities.CombatUtilities;
 import engine.mobileAI.utilities.MovementUtilities;
-import engine.net.DispatchMessage;
 import engine.net.client.msg.PerformActionMsg;
-import engine.net.client.msg.UpdateStateMsg;
 import engine.objects.*;
 import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
@@ -84,7 +82,7 @@ public class MobAI {
             if(mob.StrongholdGuardian || mob.StrongholdEpic){
                 // attempt to ground all players in attack range
                 for(int i : mob.playerAgroMap.keySet()){
-                    PlayerCharacter tar = PlayerCharacter.getFromCache(i);
+                    PlayerCharacter tar = PlayerManager.getFromCache(i);
                     if(tar != null && tar.loc.distanceSquared(mob.loc) < 80){
                         PowersManager.applyPower(mob,tar,tar.loc, 111111,40,false);
                     }
@@ -108,7 +106,7 @@ public class MobAI {
             if (mob.BehaviourType.callsForHelp)
                 MobCallForHelp(mob);
 
-            if (MovementUtilities.outOfAggroRange(mob, target)) {
+            if (!MovementUtilities.inRangeDropAggro(mob, target)) {
                 mob.setCombatTarget(null);
                 return;
             }
@@ -320,20 +318,20 @@ public class MobAI {
             if (mob == null)
                 return false;
 
-            if(mob.isPlayerGuard){
+            if(mob.isPlayerGuard == true){
 
-                int contractID = 0;
+                int contractID;
 
-                if(mob.BehaviourType.equals(Enum.MobBehaviourType.GuardMinion) && mob.npcOwner != null)
+                if(mob.BehaviourType.equals(Enum.MobBehaviourType.GuardMinion))
                     contractID = mob.npcOwner.contract.getContractID();
-                 else if(mob.contract != null)
+                 else
                     contractID = mob.contract.getContractID();
 
-                if(Enum.MinionType.ContractToMinionMap.containsKey(contractID) && !Enum.MinionType.ContractToMinionMap.get(contractID).isMage())
+                if(Enum.MinionType.ContractToMinionMap.get(contractID).isMage() == false)
                     return false;
             }
 
-            if (mob.mobPowers == null || mob.mobPowers.isEmpty())
+            if (mob.mobPowers.isEmpty())
                 return false;
 
             if (!mob.canSee((PlayerCharacter) mob.getCombatTarget())) {
@@ -726,7 +724,7 @@ public class MobAI {
             for (Entry playerEntry : loadedPlayers.entrySet()) {
 
                 int playerID = (int) playerEntry.getKey();
-                PlayerCharacter loadedPlayer = PlayerCharacter.getFromCache(playerID);
+                PlayerCharacter loadedPlayer = PlayerManager.getFromCache(playerID);
 
                 //Player is null, let's remove them from the list.
 
@@ -883,7 +881,6 @@ public class MobAI {
                             return;
                         }
                     }
-                return;
                 }
 
             if(Mob.discDroppers.contains(aiAgent))
@@ -892,7 +889,7 @@ public class MobAI {
             if(aiAgent.StrongholdGuardian || aiAgent.StrongholdEpic || aiAgent.StrongholdCommander)
                 return;
 
-            if (aiAgent.despawned && System.currentTimeMillis() > (aiAgent.deathTime + (aiAgent.spawnTime * 1000L))) {
+            if (System.currentTimeMillis() > (aiAgent.deathTime + (aiAgent.spawnTime * 1000L))) {
                 if (!Zone.respawnQue.contains(aiAgent)) {
                     Zone.respawnQue.add(aiAgent);
                 }
@@ -913,10 +910,8 @@ public class MobAI {
             if (mob.getCombatTarget() == null)
                 return;
 
-            if(!mob.isCombat())
-                enterCombat(mob);
+            if (mob.getCombatTarget().getObjectType().equals(Enum.GameObjectType.PlayerCharacter) && MovementUtilities.inRangeDropAggro(mob, (PlayerCharacter) mob.getCombatTarget()) == false && mob.BehaviourType.ordinal() != Enum.MobBehaviourType.Pet1.ordinal()) {
 
-            if (mob.getCombatTarget().getObjectType().equals(Enum.GameObjectType.PlayerCharacter) && MovementUtilities.outOfAggroRange(mob, (PlayerCharacter) mob.getCombatTarget()) && mob.BehaviourType.ordinal() != Enum.MobBehaviourType.Pet1.ordinal()) {
                 mob.setCombatTarget(null);
                 return;
             }
@@ -982,7 +977,7 @@ public class MobAI {
                 mob.setCombatTarget(null);
 
                 for (Entry playerEntry : mob.playerAgroMap.entrySet())
-                    PlayerCharacter.getFromCache((int) playerEntry.getKey()).setHateValue(0);
+                    PlayerManager.getFromCache((int) playerEntry.getKey()).setHateValue(0);
                 mob.setCombatTarget(null);
             }
         } catch (Exception e) {
@@ -1068,8 +1063,8 @@ public class MobAI {
         if(mob.combatTarget == null)
             return;
 
-        //if(city._playerMemory.contains(mob.combatTarget.getObjectUUID()) && mob.combatTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
-        //    mob.setCombatTarget(null);
+        if(city._playerMemory.contains(mob.combatTarget.getObjectUUID()) && mob.combatTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
+            mob.setCombatTarget(null);
     }
 
     public static void GuardCaptainLogic(Mob mob) {
@@ -1220,7 +1215,7 @@ public class MobAI {
             for (Entry playerEntry : loadedPlayers.entrySet()) {
 
                 int playerID = (int) playerEntry.getKey();
-                PlayerCharacter loadedPlayer = PlayerCharacter.getFromCache(playerID);
+                PlayerCharacter loadedPlayer = PlayerManager.getFromCache(playerID);
 
                 //Player is null, let's remove them from the list.
 
@@ -1381,7 +1376,7 @@ public class MobAI {
 
             for (Entry playerEntry : mob.playerAgroMap.entrySet()) {
 
-                PlayerCharacter potentialTarget = PlayerCharacter.getFromCache((int) playerEntry.getKey());
+                PlayerCharacter potentialTarget = PlayerManager.getFromCache((int) playerEntry.getKey());
 
                 if (potentialTarget.equals(mob.getCombatTarget()))
                     continue;
@@ -1419,11 +1414,4 @@ public class MobAI {
             Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: RecoverHealth" + " " + e.getMessage());
         }
     }
-
-    public static void enterCombat(Mob mob){
-        mob.setCombat(true);
-        UpdateStateMsg rwss = new UpdateStateMsg();
-        rwss.setPlayer(mob);
-        DispatchMessage.sendToAllInRange(mob, rwss);
-    }
 }

src/engine/mobileAI/Threads/MobAIThread.java

@@ -28,26 +28,18 @@ public class MobAIThread implements Runnable{
         AI_BASE_AGGRO_RANGE = (int)(60 * Float.parseFloat(ConfigManager.MB_AI_AGGRO_RANGE.getValue()));
         while (true) {
             for (Zone zone : ZoneManager.getAllZones()) {
-                if (zone != null && zone.zoneMobSet != null) {
-                    synchronized (zone.zoneMobSet) {
-                        for (Mob mob : zone.zoneMobSet) {
-                            try {
-                                if (mob != null) {
-                                    MobAI.DetermineAction(mob);
-                                }
-                            } catch (Exception e) {
-                                Logger.error("Error processing Mob [Name: {}, UUID: {}]", mob.getName(), mob.getObjectUUID(), e);
-                            }
-                        }
+
+                for (Mob mob : zone.zoneMobSet) {
+
+                    try {
+                        if (mob != null)
+                            MobAI.DetermineAction(mob);
+                    } catch (Exception e) {
+                        Logger.error("Mob: " + mob.getName() + " UUID: " + mob.getObjectUUID() + " ERROR: " + e);
+                        e.printStackTrace();
                     }
                 }
             }
-            try {
-                Thread.sleep(100);
-            } catch (InterruptedException e) {
-                Logger.error("AI Thread interrupted", e);
-                Thread.currentThread().interrupt();
-            }
         }
     }
     public static void startAIThread() {

src/engine/mobileAI/Threads/MobRespawnThread.java

@@ -13,9 +13,6 @@ import engine.objects.Mob;
 import engine.objects.Zone;
 import org.pmw.tinylog.Logger;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
 /**
  * Thread blocks until MagicBane dispatch messages are
  * enqueued then processes them in FIFO order. The collection
@@ -28,48 +25,41 @@ import java.util.Collection;
 
 public class MobRespawnThread implements Runnable {
 
-    private volatile boolean running = true;
-    private static final long RESPAWN_INTERVAL = 100; // Configurable interval
 
     public MobRespawnThread() {
-        Logger.info("MobRespawnThread initialized.");
+        Logger.info(" MobRespawnThread thread has started!");
+
     }
 
     @Override
     public void run() {
-        while (running) {
-            try {
-                Collection<Zone> zones = ZoneManager.getAllZones();
-                if (zones != null) {
-                    for (Zone zone : zones) {
-                        synchronized (zone) { // Optional: Synchronize on zone
-                            if (!zone.respawnQue.isEmpty() &&
-                                    zone.lastRespawn + RESPAWN_INTERVAL < System.currentTimeMillis()) {
 
-                                Mob respawner = zone.respawnQue.iterator().next();
-                                if (respawner != null) {
-                                    respawner.respawn();
-                                    zone.respawnQue.remove(respawner);
-                                    zone.lastRespawn = System.currentTimeMillis();
-                                }
-                            }
-                        }
+        while (true) {
+
+            try {
+                for (Zone zone : ZoneManager.getAllZones()) {
+
+                    if (zone.respawnQue.isEmpty() == false && zone.lastRespawn + 100 < System.currentTimeMillis()) {
+
+                        Mob respawner = zone.respawnQue.iterator().next();
+
+                        if (respawner == null)
+                            continue;
+
+                        respawner.respawn();
+                        zone.respawnQue.remove(respawner);
+                        zone.lastRespawn = System.currentTimeMillis();
                     }
                 }
-                Thread.sleep(100); // Prevent busy-waiting
             } catch (Exception e) {
-                Logger.error("Error in MobRespawnThread", e);
+                Logger.error(e);
             }
+
         }
-        Logger.info("MobRespawnThread stopped.");
     }
-
-    public void stop() {
-        running = false;
-    }
-
     public static void startRespawnThread() {
-        Thread respawnThread = new Thread(new MobRespawnThread());
+        Thread respawnThread;
+        respawnThread = new Thread(new MobRespawnThread());
         respawnThread.setName("respawnThread");
         respawnThread.start();
     }

src/engine/mobileAI/utilities/CombatUtilities.java

@@ -140,11 +140,7 @@ public class CombatUtilities {
 
     public static boolean triggerDefense(Mob agent, AbstractWorldObject target) {
         int defense = 0;
-        int atr = agent.mobBase.getAtr();
-        if(agent.getBonuses() != null){
-            atr += agent.getBonuses().getFloat(ModType.OCV,SourceType.None);
-            atr *= 1 + agent.getBonuses().getFloatPercentAll(ModType.OCV,SourceType.None);
-        }
+        int atr = agent.getAtrHandOne();
         switch (target.getObjectType()) {
             case PlayerCharacter:
                 defense = ((AbstractCharacter) target).getDefenseRating();
@@ -158,7 +154,7 @@ public class CombatUtilities {
             case Building:
                 return false;
         }
-        return !CombatManager.LandHit(atr,defense);
+        return CombatManager.LandHit(atr,defense);
     }
 
     public static boolean triggerBlock(Mob agent, AbstractWorldObject ac) {
@@ -256,12 +252,12 @@ public class CombatUtilities {
             if (agent.getEquip().get(1) != null && agent.getEquip().get(2) != null && agent.getEquip().get(2).getItemBase().isShield() == false) {
                 //mob is duel wielding and should conduct an attack for each hand
                 ItemBase weapon1 = agent.getEquip().get(1).getItemBase();
-                double range1 = getMaxDmg(agent) - getMinDmg(agent);
-                double damage1 = getMinDmg(agent) + ((ThreadLocalRandom.current().nextFloat() * range1) + (ThreadLocalRandom.current().nextFloat() * range1)) / 2;
+                double range1 = getMaxDmg(weapon1.getMinDamage(), agent, weapon1) - getMinDmg(weapon1.getMinDamage(), agent, weapon1);
+                double damage1 = getMinDmg(weapon1.getMinDamage(), agent, weapon1) + ((ThreadLocalRandom.current().nextFloat() * range1) + (ThreadLocalRandom.current().nextFloat() * range1)) / 2;
                 swingIsDamage(agent, target, (float) damage1, CombatManager.getSwingAnimation(weapon1, null, true));
                 ItemBase weapon2 = agent.getEquip().get(2).getItemBase();
-                double range2 = getMaxDmg(agent) - getMinDmg(agent);
-                double damage2 = getMinDmg(agent) + ((ThreadLocalRandom.current().nextFloat() * range2) + (ThreadLocalRandom.current().nextFloat() * range2)) / 2;
+                double range2 = getMaxDmg(weapon2.getMinDamage(), agent, weapon2) - getMinDmg(weapon2.getMinDamage(), agent, weapon2);
+                double damage2 = getMinDmg(weapon2.getMinDamage(), agent, weapon2) + ((ThreadLocalRandom.current().nextFloat() * range2) + (ThreadLocalRandom.current().nextFloat() * range2)) / 2;
                 swingIsDamage(agent, target, (float) damage2, CombatManager.getSwingAnimation(weapon1, null, false));
             } else {
                 swingIsDamage(agent, target, determineDamage(agent), anim);
@@ -311,9 +307,9 @@ public class CombatUtilities {
         float damage = 0;
 
         DamageType dt = getDamageType(agent);
-        if (agent.BehaviourType.equals(MobBehaviourType.Pet1)) {
-            damage = calculateMobDamage(agent);
-        } else if (agent.isPlayerGuard()) {
+        if ((agent.agentType.equals(AIAgentType.PET)) == true || agent.isPet() == true || agent.isNecroPet() == true) {
+            damage = calculatePetDamage(agent);
+        } else if (agent.isPlayerGuard() == true) {
             //damage = calculateGuardDamage(agent);
             damage = calculateMobDamage(agent);
         } else if (agent.getLevel() > 80) {
@@ -353,8 +349,8 @@ public class CombatUtilities {
         float min = 40;
         float max = 60;
         float dmgMultiplier = 1 + agent.getBonuses().getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None);
-        double minDmg = getMinDmg(agent);
-        double maxDmg = getMaxDmg(agent);
+        double minDmg = getMinDmg(min, agent, null);
+        double maxDmg = getMaxDmg(max, agent, null);
         dmgMultiplier += agent.getLevel() * 0.1f;
         range = (float) (maxDmg - minDmg);
         damage = min + ((ThreadLocalRandom.current().nextFloat() * range) + (ThreadLocalRandom.current().nextFloat() * range)) / 2;
@@ -370,8 +366,8 @@ public class CombatUtilities {
 
         double minDmg = weapon.getMinDamage();
         double maxDmg = weapon.getMaxDamage();
-        double min = getMinDmg(agent);
-        double max = getMaxDmg(agent);
+        double min = getMinDmg(minDmg, agent, weapon);
+        double max = getMaxDmg(maxDmg, agent, weapon);
 
         DamageType dt = weapon.getDamageType();
 
@@ -412,48 +408,92 @@ public class CombatUtilities {
     }
 
     public static int calculateMobDamage(Mob agent) {
-        double minDmg = getMinDmg(agent);
-        double maxDmg = getMaxDmg(agent);
-        DamageType dt = getDamageType(agent);
+        ItemBase weapon = null;
+        double minDmg;
+        double maxDmg;
+        DamageType dt;
+
+        //main hand or offhand damage
+
+        if (agent.getEquip().get(1) != null)
+            weapon = agent.getEquip().get(1).getItemBase();
+        else if (agent.getEquip().get(2) != null)
+            weapon = agent.getEquip().get(2).getItemBase();
+
+        if (weapon != null) {
+            minDmg = getMinDmg(weapon.getMinDamage(), agent, weapon);
+            maxDmg = getMaxDmg(weapon.getMaxDamage(), agent, weapon);
+            dt = weapon.getDamageType();
+        } else {
+            minDmg = agent.getMobBase().getDamageMin();
+            maxDmg = agent.getMobBase().getDamageMax();
+            dt = DamageType.Crush;
+        }
 
         AbstractWorldObject target = agent.getCombatTarget();
 
-        double damage = ThreadLocalRandom.current().nextInt((int)minDmg,(int)maxDmg + 1);
+        float dmgMultiplier = 1 + agent.getBonuses().getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None);
+        double range = maxDmg - minDmg;
+        double damage = minDmg + ((ThreadLocalRandom.current().nextFloat() * range) + (ThreadLocalRandom.current().nextFloat() * range)) / 2;
 
         if (AbstractWorldObject.IsAbstractCharacter(target))
             if (((AbstractCharacter) target).isSit())
                 damage *= 2.5f; //increase damage if sitting
         if (AbstractWorldObject.IsAbstractCharacter(target))
-            return (int) (((AbstractCharacter) target).getResists().getResistedDamage(agent, (AbstractCharacter) target, dt, (float) damage, 0));
+            return (int) (((AbstractCharacter) target).getResists().getResistedDamage(agent, (AbstractCharacter) target, dt, (float) damage, 0) * dmgMultiplier);
         return 0;
     }
 
-    public static double getMinDmg(Mob agent) {
-            if(agent.getEquip() != null){
-                if(agent.getEquip().get(ItemSlotType.RHELD) != null){
-                    return agent.minDamageHandOne;
-                }else if(agent.getEquip().get(ItemSlotType.LHELD) != null){
-                    return agent.getMinDamageHandTwo();
-                }else{
-                    return agent.minDamageHandOne;
+    public static double getMinDmg(double min, Mob agent, ItemBase weapon) {
+
+        int primary = agent.getStatStrCurrent();
+        int secondary = agent.getStatDexCurrent();
+        int focusLevel = 0;
+        int masteryLevel = 0;
+
+        if (weapon != null) {
+            if (weapon.isStrBased() == true) {
+                primary = agent.getStatStrCurrent();
+                secondary = agent.getStatDexCurrent();
+            } else {
+                primary = agent.getStatDexCurrent();
+                secondary = agent.getStatStrCurrent();
+                if (agent.getSkills().containsKey(weapon.getSkillRequired())) {
+                    focusLevel = (int) agent.getSkills().get(weapon.getSkillRequired()).getModifiedAmount();
+                }
+                if (agent.getSkills().containsKey(weapon.getMastery())) {
+                    masteryLevel = (int) agent.getSkills().get(weapon.getMastery()).getModifiedAmount();
                 }
-            }else{
-                return agent.minDamageHandOne;
             }
+        }
+        return min * (pow(0.0048 * primary + .049 * (primary - 0.75), 0.5) + pow(0.0066 * secondary + 0.064 * (secondary - 0.75), 0.5) + +0.01 * (focusLevel + masteryLevel));
     }
 
-    public static double getMaxDmg(Mob agent) {
-            if(agent.getEquip() != null){
-                if(agent.getEquip().get(ItemSlotType.RHELD) != null){
-                    return agent.maxDamageHandOne;
-                }else if(agent.getEquip().get(ItemSlotType.LHELD) != null){
-                    return agent.getMaxDamageHandTwo();
-                }else{
-                    return agent.maxDamageHandOne;
-                }
-            }else{
-                return agent.maxDamageHandOne;
+    public static double getMaxDmg(double max, Mob agent, ItemBase weapon) {
+
+        int primary = agent.getStatStrCurrent();
+        int secondary = agent.getStatDexCurrent();
+        int focusLevel = 0;
+        int masteryLevel = 0;
+
+        if (weapon != null) {
+
+            if (weapon.isStrBased() == true) {
+                primary = agent.getStatStrCurrent();
+                secondary = agent.getStatDexCurrent();
+            } else {
+                primary = agent.getStatDexCurrent();
+                secondary = agent.getStatStrCurrent();
             }
+
+            if (agent.getSkills().containsKey(weapon.getSkillRequired()))
+                focusLevel = (int) agent.getSkills().get(weapon.getSkillRequired()).getModifiedAmount();
+
+            if (agent.getSkills().containsKey(weapon.getSkillRequired()))
+                masteryLevel = (int) agent.getSkills().get(weapon.getMastery()).getModifiedAmount();
+
+        }
+        return max * (pow(0.0124 * primary + 0.118 * (primary - 0.75), 0.5) + pow(0.0022 * secondary + 0.028 * (secondary - 0.75), 0.5) + 0.0075 * (focusLevel + masteryLevel));
     }
 
 }

src/engine/mobileAI/utilities/MovementUtilities.java

@@ -98,24 +98,20 @@ public class MovementUtilities {
 
     }
 
-    public static boolean outOfAggroRange(Mob agent, AbstractCharacter target) {
+    public static boolean inRangeDropAggro(Mob agent, AbstractCharacter target) {
 
         Vector3fImmutable sl = agent.getLoc();
         Vector3fImmutable tl = target.getLoc();
 
-        float disSq = sl.distanceSquared(tl);
+        float distanceSquaredToTarget = sl.distanceSquared2D(tl) - sqr(agent.calcHitBox() + target.calcHitBox()); //distance to center of target
+
         float range = agent.getRange() + 150;
 
-
-        //float distanceSquaredToTarget = sl.distanceSquared2D(tl) - sqr(agent.calcHitBox() + target.calcHitBox()); //distance to center of target
-
-
-
         if (range > 200)
             range = 200;
 
 
-        return disSq > (range * range);
+        return distanceSquaredToTarget < sqr(range);
 
     }
 

src/engine/net/client/ClientConnection.java

@@ -227,10 +227,10 @@ public class ClientConnection extends AbstractConnection {
             SessionManager.remSession(
                     SessionManager.getSession(sessionID));
         } catch (NullPointerException e) {
-            //Logger
-                    //.error(
-                            //"Tried to remove improperly initialized session. Skipping." +
-                                    //e);
+            Logger
+                    .error(
+                            "Tried to remove improperly initialized session. Skipping." +
+                                    e);
         }
     }
 

src/engine/net/client/ClientMessagePump.java

@@ -603,19 +603,19 @@ public class ClientMessagePump implements NetMsgHandler {
 
         switch (type) {
             case MBServerStatics.STAT_STR_ID:
-                pc.addStr(msg.getAmount());
+                PlayerManager.addStr(pc, msg.getAmount());
                 break;
             case MBServerStatics.STAT_DEX_ID:
-                pc.addDex(msg.getAmount());
+                PlayerManager.addDex(pc, msg.getAmount());
                 break;
             case MBServerStatics.STAT_CON_ID:
-                pc.addCon(msg.getAmount());
+                PlayerManager.addCon(pc, msg.getAmount());
                 break;
             case MBServerStatics.STAT_INT_ID:
-                pc.addInt(msg.getAmount());
+                PlayerManager.addInt(pc, msg.getAmount());
                 break;
             case MBServerStatics.STAT_SPI_ID:
-                pc.addSpi(msg.getAmount());
+                PlayerManager.addSpi(pc, msg.getAmount());
                 break;
         }
     }
@@ -641,7 +641,7 @@ public class ClientMessagePump implements NetMsgHandler {
         // ResetAfterDeath player
         sourcePlayer.respawnLock.writeLock().lock();
         try {
-            sourcePlayer.respawn(true, false, true);
+            PlayerManager.respawn(sourcePlayer, true, false, true);
 
         } catch (Exception e) {
             Logger.error(e);
@@ -705,7 +705,7 @@ public class ClientMessagePump implements NetMsgHandler {
         switch (targetType) {
             case PlayerCharacter:
 
-                characterTarget = PlayerCharacter.getFromCache(msg.getTargetID());
+                characterTarget = PlayerManager.getFromCache(msg.getTargetID());
                 if (characterTarget == null)
                     return;
                 if (characterTarget.isAlive())
@@ -719,7 +719,7 @@ public class ClientMessagePump implements NetMsgHandler {
                 lwrm = new LootWindowResponseMsg(characterTarget.getObjectType().ordinal(), characterTarget.getObjectUUID(), characterTarget.getInventory(true));
                 break;
             case NPC:
-                characterTarget = NPC.getFromCache(msg.getTargetID());
+                characterTarget = NPCManager.getFromCache(msg.getTargetID());
                 if (characterTarget == null)
                     return;
                 break;
@@ -809,7 +809,7 @@ public class ClientMessagePump implements NetMsgHandler {
                 if (targetType == GameObjectType.PlayerCharacter.ordinal() || targetType == GameObjectType.Mob.ordinal()) {
 
                     if (targetType == GameObjectType.PlayerCharacter.ordinal()) {
-                        tar = PlayerCharacter.getFromCache(targetID);
+                        tar = PlayerManager.getFromCache(targetID);
 
                         if (tar == null)
                             return;
@@ -818,7 +818,7 @@ public class ClientMessagePump implements NetMsgHandler {
                             return;
 
                     } else if (targetType == GameObjectType.NPC.ordinal())
-                        tar = NPC.getFromCache(targetID);
+                        tar = NPCManager.getFromCache(targetID);
                     else if (targetType == GameObjectType.Mob.ordinal())
                         tar = Mob.getFromCache(targetID);
                     if (tar == null)
@@ -1013,9 +1013,9 @@ public class ClientMessagePump implements NetMsgHandler {
         AbstractCharacter tar = null;
 
         if (targetType == GameObjectType.PlayerCharacter.ordinal())
-            tar = PlayerCharacter.getFromCache(msg.getTargetID());
+            tar = PlayerManager.getFromCache(msg.getTargetID());
         else if (targetType == GameObjectType.NPC.ordinal())
-            tar = NPC.getFromCache(msg.getTargetID());
+            tar = NPCManager.getFromCache(msg.getTargetID());
         else if (targetType == GameObjectType.Mob.ordinal())
             tar = Mob.getFromCache(msg.getTargetID());
 
@@ -1150,7 +1150,7 @@ public class ClientMessagePump implements NetMsgHandler {
         if (sourcePlayer == null)
             return;
 
-        NPC npc = NPC.getFromCache(msg.getNPCID());
+        NPC npc = NPCManager.getFromCache(msg.getNPCID());
 
         if (npc == null)
             return;
@@ -1166,7 +1166,7 @@ public class ClientMessagePump implements NetMsgHandler {
 
         if (con == null)
             return;
-        float bargain = sourcePlayer.getBargain();
+        float bargain = PlayerManager.getBargain(sourcePlayer);
 
         float profit = npc.getBuyPercent(sourcePlayer) + bargain;
 
@@ -1199,7 +1199,7 @@ public class ClientMessagePump implements NetMsgHandler {
         if (itemMan == null)
             return;
 
-        NPC npc = NPC.getFromCache(msg.getNPCID());
+        NPC npc = NPCManager.getFromCache(msg.getNPCID());
 
         if (npc == null)
             return;
@@ -1271,7 +1271,7 @@ public class ClientMessagePump implements NetMsgHandler {
                 float durabilityMax = sell.getDurabilityMax();
                 float damagedModifier = durabilityCurrent / durabilityMax;
                 cost *= damagedModifier;
-                float bargain = player.getBargain();
+                float bargain = PlayerManager.getBargain(player);
 
                 float profit = npc.getBuyPercent(player) + bargain;
 
@@ -1363,7 +1363,7 @@ public class ClientMessagePump implements NetMsgHandler {
         if (sourcePlayer == null)
             return;
 
-        NPC npc = NPC.getFromCache(msg.getNpcID());
+        NPC npc = NPCManager.getFromCache(msg.getNpcID());
 
         if (npc == null)
             return;
@@ -1391,7 +1391,7 @@ public class ClientMessagePump implements NetMsgHandler {
                 if (itemMan == null) {
                     return;
                 }
-                NPC npc = NPC.getFromCache(msg.getNPCID());
+                NPC npc = NPCManager.getFromCache(msg.getNPCID());
                 if (npc == null) {
                     return;
                 }
@@ -1422,7 +1422,7 @@ public class ClientMessagePump implements NetMsgHandler {
                                 return;
                             }
                             int cost = me.getMagicValue();
-                            float bargain = sourcePlayer.getBargain();
+                            float bargain = PlayerManager.getBargain(sourcePlayer);
                             switch(npc.getContractID()){
                                 case 1201:
                                     cost = ItemBase.getDiscPrice(ib.getUUID());
@@ -1503,7 +1503,7 @@ public class ClientMessagePump implements NetMsgHandler {
                     int cost = buy.getBaseValue();
                     if (buy.isID() || buy.isCustomValue())
                         cost = buy.getMagicValue();
-                    float bargain = sourcePlayer.getBargain();
+                    float bargain = PlayerManager.getBargain(sourcePlayer);
                     float profit = npc.getSellPercent(sourcePlayer) - bargain;
                     if (profit < 1)
                         profit = 1;
@@ -1623,7 +1623,7 @@ public class ClientMessagePump implements NetMsgHandler {
         if (player == null)
             return;
 
-        NPC npc = NPC.getFromCache(msg.getNPCID());
+        NPC npc = NPCManager.getFromCache(msg.getNPCID());
 
         if (npc == null)
             return;
@@ -1821,7 +1821,7 @@ public class ClientMessagePump implements NetMsgHandler {
             long type = player.getTimeStamp("LastRecallType");
 
             if (type == 1) { //recall to bind
-                player.teleport(player.getBindLoc());
+                PlayerManager.teleport(player, player.getBindLoc());
                 player.setSafeMode();
             } else { //recall to rg
                 float dist = 9999999999f;
@@ -1842,7 +1842,7 @@ public class ClientMessagePump implements NetMsgHandler {
                 //nearest runegate found. teleport characterTarget
 
                 if (rg != null) {
-                    player.teleport(rg.getLoc());
+                    PlayerManager.teleport(player, rg.getLoc());
                     player.setSafeMode();
                 }
             }

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

@@ -13,10 +13,7 @@ import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.Enum.GuildHistoryType;
 import engine.exception.MsgSendException;
-import engine.gameManager.ChatManager;
-import engine.gameManager.DbManager;
-import engine.gameManager.GuildManager;
-import engine.gameManager.SessionManager;
+import engine.gameManager.*;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -83,7 +80,7 @@ public class AcceptInviteToGuildHandler extends AbstractClientMsgHandler {
         player.setGuild(guild);
 
         // Cleanup guild stuff
-        player.resetGuildStatuses();
+        PlayerManager.resetGuildStatuses(player);
 
         Dispatch dispatch = Dispatch.borrow(player, msg);
         DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);

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

@@ -78,7 +78,7 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler {
                 return false;
             }
 
-            if (building.getBlueprint().getMaxSlots() == building.getHirelings().size() && building.getRank() != 8)
+            if (building.getBlueprint().getMaxSlots() == building.getHirelings().size())
                 return false;
 
             Item contractItem = Item.getFromCache(msg.getContractItem());

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

@@ -53,7 +53,7 @@ public class ArcLoginNotifyMsgHandler extends AbstractClientMsgHandler {
             GroupManager.RefreshOthersGroupList(player);
         }
 
-        player.setEnteredWorld(true);
+        PlayerManager.setEnteredWorld(player, true);
         // Set player active
         player.resetRegenUpdateTime();
         player.setActive(true);

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

@@ -144,7 +144,7 @@ public class AssetSupportMsgHandler extends AbstractClientMsgHandler {
         if (player == null)
             return true;
 
-        vendor = NPC.getFromCache(msg.getNpcID());
+        vendor = NPCManager.getFromCache(msg.getNpcID());
 
         if (msg.getMessageType() != 6 && msg.getMessageType() != 7) {
             if (vendor == null)

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

@@ -14,6 +14,7 @@ import engine.Enum.GuildHistoryType;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
+import engine.gameManager.PlayerManager;
 import engine.gameManager.SessionManager;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
@@ -55,7 +56,7 @@ public class BanishUnbanishHandler extends AbstractClientMsgHandler {
 
         boolean success = false;
         Guild guild = source.getGuild();
-        PlayerCharacter realizedTarget = PlayerCharacter.getFromCache(target);
+        PlayerCharacter realizedTarget = PlayerManager.getFromCache(target);
 
         if (realizedTarget != null) {
             // Guild leader can't leave guild. must pass GL or disband
@@ -83,7 +84,7 @@ public class BanishUnbanishHandler extends AbstractClientMsgHandler {
             }
         } else {
             if (guild.getGuildLeaderUUID() != target) {
-                PlayerCharacter toBanish = PlayerCharacter.getPlayerCharacter(target);
+                PlayerCharacter toBanish = PlayerManager.getPlayerCharacter(target);
                 if (toBanish == null)
                     return true;
                 //already added previously.
@@ -110,7 +111,7 @@ public class BanishUnbanishHandler extends AbstractClientMsgHandler {
             //DbManager.GuildQueries.ADD_TO_BANISHED_FROM_GUILDLIST(guild.getobjectUUID(), target);
 
             // Send left guild message to rest of guild
-            String targetName = PlayerCharacter.getFirstName(target);
+            String targetName = PlayerManager.getFirstName(target);
             ChatManager.chatGuildInfo(guild,
                     targetName + " has been banished from " + guild.getName() + '.');
             GuildListMsg guildListMsg = new GuildListMsg(guild);

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

@@ -9,9 +9,9 @@
 
 package engine.net.client.handlers;
 
-import engine.Enum;
 import engine.Enum.DispatchChannel;
 import engine.exception.MsgSendException;
+import engine.gameManager.PlayerManager;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ChangeAltitudeMsg;
@@ -43,10 +43,7 @@ public class ChangeAltitudeHandler extends AbstractClientMsgHandler {
         if (!AbstractCharacter.CanFly(pc))
             return false;
 
-        if(pc.getBonuses().getBool(Enum.ModType.Stunned, Enum.SourceType.None))
-            return false;
-
-        if (pc.isSwimming())
+        if (PlayerManager.isSwimming(pc))
             return false;
         if (pc.region != null && !pc.region.isOutside())
             return false;

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

@@ -14,6 +14,7 @@ import engine.Enum.GameObjectType;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
+import engine.gameManager.PlayerManager;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -97,9 +98,9 @@ public class ChangeGuildLeaderHandler extends AbstractClientMsgHandler {
         }
 
 
-        targetPlayer.setGuildLeader(true);
-        targetPlayer.setInnerCouncil(true);
-        targetPlayer.setFullMember(true);
+        PlayerManager.setGuildLeader(targetPlayer, true);
+        PlayerManager.setInnerCouncil(targetPlayer, true);
+        PlayerManager.setFullMember(targetPlayer, true);
         targetPlayer.incVer();
         targetName = targetPlayer.getFirstName();
         updateTarget = true;
@@ -113,9 +114,9 @@ public class ChangeGuildLeaderHandler extends AbstractClientMsgHandler {
 
 
         //updateOldGuildLeader
-        sourcePlayer.setInnerCouncil(true);
-        sourcePlayer.setFullMember(true);
-        sourcePlayer.setGuildLeader(false);
+        PlayerManager.setInnerCouncil(sourcePlayer, true);
+        PlayerManager.setFullMember(sourcePlayer, true);
+        PlayerManager.setGuildLeader(sourcePlayer, false);
         sourcePlayer.incVer();
 
         GuildInfoMsg guildInfoMsg = new GuildInfoMsg(sourcePlayer, sourcePlayer.getGuild(), 2);

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

@@ -14,6 +14,7 @@ import engine.Enum.GameObjectType;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
+import engine.gameManager.PlayerManager;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -63,14 +64,14 @@ public class ChangeRankHandler extends AbstractClientMsgHandler {
             Enum.GuildType t = Enum.GuildType.getGuildTypeFromInt(sourcePlayer.getGuild().getCharter());
 
             if (targetPlayer != null) {
-                targetPlayer.setGuildTitle(msg.getNewRank());
+                PlayerManager.setGuildTitle(targetPlayer, msg.getNewRank());
 
                 targetName = targetPlayer.getFirstName();
                 isMale = targetPlayer.getRace().getRaceType().getCharacterSex().equals(Enum.CharacterSex.MALE);
             } else {
                 DbManager.GuildQueries.UPDATE_GUILD_RANK_OFFLINE(msg.getPlayerUUID(), msg.getNewRank(), sourcePlayer.getGuild().getObjectUUID());
 
-                targetName = PlayerCharacter.getFirstName(msg.getPlayerUUID());
+                targetName = PlayerManager.getFirstName(msg.getPlayerUUID());
                 isMale = true;
             }
 
@@ -98,7 +99,7 @@ public class ChangeRankHandler extends AbstractClientMsgHandler {
             taxUpdate = (updateMask & 1) > 0;
 
             if (targetName == null && updateMask > 0)
-                targetName = PlayerCharacter.getFirstName(msg.getPlayerUUID());
+                targetName = PlayerManager.getFirstName(msg.getPlayerUUID());
         } else {
             icUpdate = (GuildStatusController.isInnerCouncil(targetPlayer.getGuildStatus()) != (msg.getIc() > 0)) && GuildStatusController.isGuildLeader(sourcePlayer.getGuildStatus());
             recruitUpdate = (GuildStatusController.isRecruiter(targetPlayer.getGuildStatus()) != (msg.getRec() > 0)) && GuildStatusController.isGuildLeader(sourcePlayer.getGuildStatus());
@@ -106,16 +107,16 @@ public class ChangeRankHandler extends AbstractClientMsgHandler {
 
             //This logic branch only executes if targetPlayer has passed a null check...
             if (icUpdate) {
-                targetPlayer.setInnerCouncil(msg.getIc() > 0);
-                targetPlayer.setFullMember(true);
+                PlayerManager.setInnerCouncil(targetPlayer, msg.getIc() > 0);
+                PlayerManager.setFullMember(targetPlayer, true);
                 targetPlayer.incVer();
             }
 
             if (recruitUpdate)
-                targetPlayer.setRecruiter(msg.getRec() > 0);
+                PlayerManager.setRecruiter(targetPlayer, msg.getRec() > 0);
 
             if (taxUpdate)
-                targetPlayer.setTaxCollector(msg.getTax() > 0);
+                PlayerManager.setTaxCollector(targetPlayer, msg.getTax() > 0);
 
             if (targetName == null)
                 targetName = targetPlayer.getFirstName();

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

@@ -17,6 +17,7 @@ import engine.db.archive.GuildRecord;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
+import engine.gameManager.PlayerManager;
 import engine.gameManager.SessionManager;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
@@ -98,8 +99,8 @@ public class DisbandGuildHandler extends AbstractClientMsgHandler {
 
         //Save Guild data
 
-        player.setGuildLeader(false);
-        player.setInnerCouncil(false);
+        PlayerManager.setGuildLeader(player, false);
+        PlayerManager.setInnerCouncil(player, false);
         guild.setGuildLeaderUUID(0);
         guild.setNation(null);
 

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

@@ -11,6 +11,7 @@ package engine.net.client.handlers;
 
 import engine.Enum;
 import engine.exception.MsgSendException;
+import engine.gameManager.PlayerManager;
 import engine.gameManager.SessionManager;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
@@ -60,7 +61,7 @@ public class GuildControlHandler extends AbstractClientMsgHandler {
             PlayerCharacter player = SessionManager.getPlayerCharacter(origin);
 
             //If we don't get a valid PC for whatever reason.. just ignore it.
-            PlayerCharacter pc = PlayerCharacter.getFromCache(msg.getUnknown03());
+            PlayerCharacter pc = PlayerManager.getFromCache(msg.getUnknown03());
 
             if (pc != null) {
                 dispatch = Dispatch.borrow(player, new GuildListMsg(pc));

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

@@ -15,10 +15,7 @@ import engine.Enum.GuildHistoryType;
 import engine.Enum.ItemType;
 import engine.Enum.OwnerType;
 import engine.exception.MsgSendException;
-import engine.gameManager.ChatManager;
-import engine.gameManager.DbManager;
-import engine.gameManager.GuildManager;
-import engine.gameManager.SessionManager;
+import engine.gameManager.*;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -130,10 +127,10 @@ public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler {
         GuildManager.joinGuild(player, newGuild, GuildHistoryType.CREATE);
 
         newGuild.setGuildLeader(player);
-        player.setGuildLeader(true);
-        player.setInnerCouncil(true);
-        player.setFullMember(true);
-        player.setGuildTitle(charterType.getNumberOfRanks() - 1);
+        PlayerManager.setGuildLeader(player, true);
+        PlayerManager.setInnerCouncil(player, true);
+        PlayerManager.setFullMember(player, true);
+        PlayerManager.setGuildTitle(player, charterType.getNumberOfRanks() - 1);
         player.getCharItemManager().delete(charter);
         player.getCharItemManager().updateInventory();
         player.incVer();

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

@@ -11,6 +11,7 @@ package engine.net.client.handlers;
 
 import engine.Enum.GameObjectType;
 import engine.exception.MsgSendException;
+import engine.gameManager.PlayerManager;
 import engine.gameManager.SessionManager;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
@@ -43,7 +44,7 @@ public class GuildInfoHandler extends AbstractClientMsgHandler {
         } else if (msg.getMsgType() == 5) {
 
             if (msg.getObjectType() == GameObjectType.PlayerCharacter.ordinal()) {
-                PlayerCharacter pc = PlayerCharacter.getPlayerCharacter(msg.getObjectID());
+                PlayerCharacter pc = PlayerManager.getPlayerCharacter(msg.getObjectID());
                 dispatch = Dispatch.borrow(sourcePlayer, new GuildInfoMsg(pc, pc.getGuild(), 5));
                 DispatchMessage.dispatchMsgDispatch(dispatch, engine.Enum.DispatchChannel.SECONDARY);
             } else {

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

@@ -13,6 +13,7 @@ package engine.net.client.handlers;
 import engine.Enum.DispatchChannel;
 import engine.exception.MsgSendException;
 import engine.gameManager.BuildingManager;
+import engine.gameManager.NPCManager;
 import engine.gameManager.SessionManager;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
@@ -52,7 +53,7 @@ public class HirelingServiceMsgHandler extends AbstractClientMsgHandler {
                 if (building == null)
                     return true;
 
-                NPC npc = NPC.getFromCache(msg.npcID);
+                NPC npc = NPCManager.getFromCache(msg.npcID);
 
                 if (npc == null)
                     return true;

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

@@ -17,7 +17,6 @@ import engine.powers.PowersBase;
 import engine.server.MBServerStatics;
 
 import java.util.ArrayList;
-import java.util.Objects;
 
 /*
  * @Author:
@@ -347,7 +346,7 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
                 TeleportJob tj = new TeleportJob(player, npc, teleportLoc, origin, true);
                 JobScheduler.getInstance().scheduleJob(tj, time * 1000);
             } else if (joinedGuild) {
-                player.teleport(teleportLoc);
+                PlayerManager.teleport(player, teleportLoc);
                 player.setSafeMode();
             }
         }
@@ -416,7 +415,7 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
 
         player = SessionManager.getPlayerCharacter(origin);
         msg = (MerchantMsg) baseMsg;
-        npc = NPC.getNPC(msg.getNPCID());
+        npc = NPCManager.getNPC(msg.getNPCID());
 
         // Early exit if something goes awry
 

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

@@ -45,7 +45,7 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
 
         if (minionMsg.getNpcType() == Enum.GameObjectType.NPC.ordinal()) {
 
-            NPC npc = NPC.getFromCache(minionMsg.getNpcID());
+            NPC npc = NPCManager.getFromCache(minionMsg.getNpcID());
 
             if (npc == null)
                 return true;

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

@@ -346,6 +346,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                             pam.setY(loc.getY());
                             pam.setZ(loc.getZ() + 64); //offset grid from tol
                             pam.addPlacementInfo(ib.getUseID());
+
                             dispatch = Dispatch.borrow(player, pam);
                             DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
 
@@ -416,7 +417,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                             if (!toCommand.isSiege())
                                 return true;
 
-                            if (player.commandSiegeMinion(toCommand)) {
+                            if (PlayerManager.commandSiegeMinion(player, toCommand)) {
                                 itemMan.consume(item);
                             }
                             break;

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

@@ -4,9 +4,7 @@ import engine.Enum;
 import engine.Enum.DispatchChannel;
 import engine.Enum.GameObjectType;
 import engine.exception.MsgSendException;
-import engine.gameManager.BuildingManager;
-import engine.gameManager.DbManager;
-import engine.gameManager.SessionManager;
+import engine.gameManager.*;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -71,9 +69,9 @@ public class OpenFriendsCondemnListMsgHandler extends AbstractClientMsgHandler {
                 }
                 AbstractCharacter toAdd = null;
                 if (msg.getPlayerType() == GameObjectType.PlayerCharacter.ordinal())
-                    toAdd = PlayerCharacter.getFromCache(msg.getPlayerID());
+                    toAdd = PlayerManager.getFromCache(msg.getPlayerID());
                 else if (msg.getPlayerType() == GameObjectType.NPC.ordinal())
-                    toAdd = NPC.getFromCache(msg.getPlayerID());
+                    toAdd = NPCManager.getFromCache(msg.getPlayerID());
                 else if (msg.getPlayerType() == GameObjectType.Mob.ordinal())
                     toAdd = Mob.getFromCache(msg.getPlayerID());
                 else {
@@ -214,7 +212,7 @@ public class OpenFriendsCondemnListMsgHandler extends AbstractClientMsgHandler {
                         if (msg.getPlayerType() != GameObjectType.PlayerCharacter.ordinal())
                             return true;
 
-                        PlayerCharacter playerCharacter = PlayerCharacter.getFromCache(msg.getPlayerID());
+                        PlayerCharacter playerCharacter = PlayerManager.getFromCache(msg.getPlayerID());
 
                         if (playerCharacter == null)
                             return true;
@@ -303,7 +301,7 @@ public class OpenFriendsCondemnListMsgHandler extends AbstractClientMsgHandler {
                 //Check to see if the invited is already on the friends list.
                 switch (msg.getInviteType()) {
                     case 7:
-                        playerCharacter = PlayerCharacter.getFromCache(msg.getPlayerID());
+                        playerCharacter = PlayerManager.getFromCache(msg.getPlayerID());
                         if (playerCharacter == null)
                             return true;
                         if (sourceBuilding.getFriends().containsKey(playerCharacter.getObjectUUID()))

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

@@ -91,7 +91,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         }
 
         ManageCityAssetsMsg mca = new ManageCityAssetsMsg();
-        mca.actionType = NPC.SVR_CLOSE_WINDOW;
+        mca.actionType = NPCManager.SVR_CLOSE_WINDOW;
         mca.setTargetType(building.getObjectType().ordinal());
         mca.setTargetID(building.getObjectUUID());
         origin.sendMsg(mca);
@@ -110,7 +110,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         if (player == null)
             return;
 
-        npc = NPC.getFromCache(msg.getNpcUUID());
+        npc = NPCManager.getFromCache(msg.getNpcUUID());
 
         if (npc == null)
             return;
@@ -120,7 +120,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         if (building == null)
             return;
 
-        NPCProfits profit = NPC.GetNPCProfits(npc);
+        NPCProfits profit = NPCManager.GetNPCProfits(npc);
 
         if (profit == null)
             return;
@@ -155,7 +155,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         if (player == null)
             return;
 
-        npc = NPC.getFromCache(orderNPCMsg.getNpcUUID());
+        npc = NPCManager.getFromCache(orderNPCMsg.getNpcUUID());
 
         if (npc == null)
             return;
@@ -165,7 +165,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         if (building == null)
             return;
 
-        NPCProfits profit = NPC.GetNPCProfits(npc);
+        NPCProfits profit = NPCManager.GetNPCProfits(npc);
 
         if (profit == null)
             return;
@@ -428,7 +428,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
 
         if (orderNPCMsg.getObjectType() == GameObjectType.NPC.ordinal()) {
 
-            npc = NPC.getFromCache(orderNPCMsg.getNpcUUID());
+            npc = NPCManager.getFromCache(orderNPCMsg.getNpcUUID());
 
             if (npc == null)
                 return true;

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

@@ -11,7 +11,6 @@ import engine.db.archive.DataWarehouse;
 import engine.exception.MsgSendException;
 import engine.gameManager.*;
 import engine.math.Bounds;
-import engine.math.Vector3f;
 import engine.math.Vector3fImmutable;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
@@ -139,7 +138,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
     private static boolean validateBuildingPlacement(Zone serverZone, PlaceAssetMsg msg, ClientConnection origin, PlayerCharacter player, PlacementInfo placementInfo) {
 
-        if (serverZone.isPlayerCity() == false && !player.getName().equals("FatBoy")) {
+        if (serverZone.isPlayerCity() == false) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 52, player.getName());
             return false;
         }
@@ -330,24 +329,6 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         playerCharacter = SessionManager.getPlayerCharacter(origin);
 
-        if(playerCharacter.getAccount().status.equals(AccountStatus.ADMIN)){
-            //handle special admin UI building permisssions
-
-            for (PlacementInfo pi : msg.getPlacementInfo()) {
-                int ID = pi.getBlueprintUUID();
-                Zone zone = ZoneManager.findSmallestZone(pi.getLoc());
-                Blueprint blueprint = Blueprint.getBlueprint(ID);
-                Vector3fImmutable localLoc = ZoneManager.worldToLocal(pi.getLoc(), zone);
-                Building building = DbManager.BuildingQueries.CREATE_BUILDING(zone.getObjectUUID(), 0, blueprint.getName(), ID, localLoc, 1.0f, 0, ProtectionState.PROTECTED, 0, 1, null, ID, msg.getFirstPlacementInfo().getW(), msg.getFirstPlacementInfo().getRot().y);
-                building.setObjectTypeMask(MBServerStatics.MASK_BUILDING);
-                building.setRot(new Vector3f(pi.getRot().x, pi.getRot().y, pi.getRot().z));
-                building.setw(pi.getW());
-                WorldGrid.addObject(building, playerCharacter);
-                ChatManager.chatSayInfo(playerCharacter, "Building with ID " + building.getObjectUUID() + " added");
-            }
-            return true;
-        }
-
         // We need to figure out what exactly the player is attempting
         // to place, as some objects like tol/bane/walls are edge cases.
         // So let's get the first item in their list.
@@ -1167,15 +1148,6 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
             wallPiece.setProtectionState(ProtectionState.PROTECTED);
             PlaceAssetMsg.sendPlaceAssetConfirmWall(origin, serverZone);
 
-            //walls in R8 city are immediately granted extra HP by 10%
-            if(cityObject.getTOL().getRank() == 8) {
-                if (wallPiece.getBlueprint() != null && wallPiece.getBlueprint().getBuildingGroup() != null && wallPiece.getBlueprint().isWallPiece()) {
-                    float currentHealthRatio = wallPiece.getCurrentHitpoints() / wallPiece.healthMax;
-                    float newMax = wallPiece.healthMax * 1.1f;
-                    wallPiece.setMaxHitPoints(newMax);
-                    wallPiece.setHealth(wallPiece.healthMax * currentHealthRatio);
-                }
-            }
         }
 
         // Deduct gold from character's inventory

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

@@ -8,6 +8,7 @@ import engine.db.archive.CharacterRecord;
 import engine.db.archive.DataWarehouse;
 import engine.db.archive.PvpRecord;
 import engine.exception.MsgSendException;
+import engine.gameManager.PlayerManager;
 import engine.gameManager.SessionManager;
 import engine.math.Vector3fImmutable;
 import engine.net.Dispatch;
@@ -57,7 +58,7 @@ public class RequestEnterWorldHandler extends AbstractClientMsgHandler {
             return true;
         }
 
-        player.setEnteredWorld(false);
+        PlayerManager.setEnteredWorld(player, false);
 
         Account acc = SessionManager.getAccount(origin);
 
@@ -118,7 +119,7 @@ public class RequestEnterWorldHandler extends AbstractClientMsgHandler {
         try {
             if (!player.isAlive()) {
                 Logger.info("respawning player on enter world.");
-                player.respawn(true, true, true);
+                PlayerManager.respawn(player, true, true, true);
             }
 
         } catch (Exception e) {

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

@@ -12,6 +12,7 @@ package engine.net.client.handlers;
 import engine.Enum;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
+import engine.gameManager.PlayerManager;
 import engine.gameManager.SessionManager;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
@@ -63,7 +64,7 @@ public class SwearInHandler extends AbstractClientMsgHandler {
         }
 
         // Swear target in and send message to guild
-        target.setFullMember(true);
+        PlayerManager.setFullMember(target, true);
         target.incVer();
 
         ChatManager.chatGuildInfo(source, target.getFirstName() + " has been sworn in as a full member!");

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

@@ -4,6 +4,7 @@ import engine.Enum;
 import engine.exception.MsgSendException;
 import engine.gameManager.BuildingManager;
 import engine.gameManager.ChatManager;
+import engine.gameManager.PlayerManager;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.ErrorPopupMsg;
@@ -35,7 +36,7 @@ public class TransferAssetMsgHandler extends AbstractClientMsgHandler {
         int TargetType = transferAssetMsg.getTargetType();  //ToDue later
 
         Building building = BuildingManager.getBuildingFromCache(Buildingid);
-        PlayerCharacter newOwner = PlayerCharacter.getFromCache(TargetID);
+        PlayerCharacter newOwner = PlayerManager.getFromCache(TargetID);
         PlayerCharacter player = origin.getPlayerCharacter();
 
         if (player == null || building == null || newOwner == null)

src/engine/net/client/msg/ApplyRuneMsg.java

@@ -12,6 +12,7 @@ package engine.net.client.msg;
 import engine.Enum;
 import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
+import engine.gameManager.PlayerManager;
 import engine.net.*;
 import engine.net.client.ClientConnection;
 import engine.net.client.Protocol;
@@ -202,7 +203,7 @@ public class ApplyRuneMsg extends ClientNetMsg {
         for (CharacterRune cr : runes) {
             int runeBaseID = cr.getRuneBaseID();
             //count number of discipline runes
-            if(isDiscipline(runeBaseID)){
+            if (runeBaseID > 3000 && runeBaseID < 3049) {
                 discCount++;
             }
             //see if rune is already applied
@@ -331,29 +332,23 @@ public class ApplyRuneMsg extends ClientNetMsg {
                 break;
         }
         //if discipline, check number applied
-        int discAllowed = 0;
         if (isDiscipline(runeID)) {
             switch(playerCharacter.getRank()){
                 case 1:
-                    discAllowed = 0;
-                    break;
                 case 2:
                 case 3:
                 case 4:
                 case 5:
                 case 6:
-                    discAllowed = 3;
+                    if(discCount > 3)
+                        return false;
                     break;
                 case 7:
-                    discAllowed = 4;
-                    break;
                 case 8:
-                    discAllowed = 5;
+                    if(discCount > 5)
+                        return false;
                     break;
             }
-
-            if(discCount >= discAllowed)
-                return false;
         }
         //Everything succeeded. Let's apply the rune
         //Attempt add rune to database
@@ -387,23 +382,23 @@ public class ApplyRuneMsg extends ClientNetMsg {
                 //add any additional stats to match old amount
                 int dif = strTotal - (int) playerCharacter.statStrBase;
                 if (dif > 0 && strTotal < (int) playerCharacter.statStrMax) {
-                    playerCharacter.addStr(dif);
+                    PlayerManager.addStr(playerCharacter, dif);
                 }
                 dif = dexTotal - (int) playerCharacter.statDexBase;
                 if (dif > 0 && dexTotal < (int) playerCharacter.statDexMax) {
-                    playerCharacter.addDex(dif);
+                    PlayerManager.addDex(playerCharacter, dif);
                 }
                 dif = conTotal - (int) playerCharacter.statConBase;
                 if (dif > 0 && conTotal < (int) playerCharacter.statConMax) {
-                    playerCharacter.addCon(dif);
+                    PlayerManager.addCon(playerCharacter, dif);
                 }
                 dif = intTotal - (int) playerCharacter.statIntBase;
                 if (dif > 0 && intTotal < (int) playerCharacter.statIntMax) {
-                    playerCharacter.addInt(dif);
+                    PlayerManager.addInt(playerCharacter, dif);
                 }
                 dif = spiTotal - (int) playerCharacter.statSpiBase;
                 if (dif > 0 && spiTotal < (int) playerCharacter.statSpiMax) {
-                    playerCharacter.addSpi(dif);
+                    PlayerManager.addSpi(playerCharacter, dif);
                 }
                 // recalculate all bonuses/formulas/skills/powers
                 playerCharacter.recalculate();

src/engine/net/client/msg/ArcViewAssetTransactionsMsg.java

@@ -13,6 +13,8 @@ import engine.Enum.GameObjectType;
 import engine.Enum.TransactionType;
 import engine.exception.SerializationException;
 import engine.gameManager.BuildingManager;
+import engine.gameManager.NPCManager;
+import engine.gameManager.PlayerManager;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;
@@ -102,12 +104,12 @@ public class ArcViewAssetTransactionsMsg extends ClientNetMsg {
 
                     break;
                 case PlayerCharacter:
-                    PlayerCharacter pc = PlayerCharacter.getPlayerCharacter(transaction.getTargetUUID());
+                    PlayerCharacter pc = PlayerManager.getPlayerCharacter(transaction.getTargetUUID());
                     if (pc != null)
                         name = pc.getCombinedName();
                     break;
                 case NPC:
-                    NPC npc = NPC.getFromCache(transaction.getTargetUUID());
+                    NPC npc = NPCManager.getFromCache(transaction.getTargetUUID());
                     if (npc != null) {
 
                         if (npc.getBuilding() != null)

src/engine/net/client/msg/BuyFromNPCWindowMsg.java

@@ -11,6 +11,8 @@ package engine.net.client.msg;
 
 import engine.Enum.ItemType;
 import engine.exception.SerializationException;
+import engine.gameManager.NPCManager;
+import engine.gameManager.PlayerManager;
 import engine.net.AbstractConnection;
 import engine.net.AbstractNetMsg;
 import engine.net.ByteBufferReader;
@@ -91,7 +93,7 @@ public class BuyFromNPCWindowMsg extends ClientNetMsg {
 
         float sellPercent = 1;
 
-        NPC npc = NPC.getFromCache(npcID);
+        NPC npc = NPCManager.getFromCache(npcID);
         CharacterItemManager man = null;
         ArrayList<Item> inventory = null;
         ArrayList<MobEquipment> sellInventory = null;
@@ -100,7 +102,7 @@ public class BuyFromNPCWindowMsg extends ClientNetMsg {
             man = npc.getCharItemManager();
             Contract contract = npc.getContract();
             if (player != null) {
-                float barget = player.getBargain();
+                float barget = PlayerManager.getBargain(player);
                 float profit = npc.getSellPercent(player) - barget;
 
                 if (profit < 1)

src/engine/net/client/msg/IgnoreMsg.java

@@ -12,6 +12,7 @@ package engine.net.client.msg;
 
 import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
+import engine.gameManager.PlayerManager;
 import engine.gameManager.SessionManager;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
@@ -81,7 +82,7 @@ public class IgnoreMsg extends ClientNetMsg {
         }
 
         //FIX THIS, USE OUR CACHE!
-        PlayerCharacter pcToIgnore = PlayerCharacter.getByFirstName(nameToIgnore);
+        PlayerCharacter pcToIgnore = PlayerManager.getByFirstName(nameToIgnore);
 
         if (pcSource == null) {
             return;
@@ -114,11 +115,11 @@ public class IgnoreMsg extends ClientNetMsg {
             pcSource.removeIgnoredPlayer(pcToIgnore.getAccount());
             ChatManager.chatSystemInfo(pcSource, "Character " + fn + " is no longer ignored.");
         } else {
-            if (!PlayerCharacter.isIgnorable()) {
+            if (!PlayerManager.isIgnorable()) {
                 ChatManager.chatSystemError(pcSource, "This character cannot be ignored.");
                 return;
             }
-            if (PlayerCharacter.isIgnoreListFull()) {
+            if (PlayerManager.isIgnoreListFull()) {
                 ChatManager.chatSystemError(pcSource, "Your ignore list is already full.");
                 return;
             }

src/engine/net/client/msg/ItemProductionMsg.java

@@ -11,6 +11,7 @@ package engine.net.client.msg;
 
 import engine.Enum.GameObjectType;
 import engine.gameManager.BuildingManager;
+import engine.gameManager.NPCManager;
 import engine.gameManager.PowersManager;
 import engine.net.AbstractConnection;
 import engine.net.AbstractNetMsg;
@@ -291,7 +292,7 @@ public class ItemProductionMsg extends ClientNetMsg {
                     writer.putInt(0);
                 }
 
-                NPC vendor = NPC.getFromCache(this.npcUUID);
+                NPC vendor = NPCManager.getFromCache(this.npcUUID);
                 if (vendor != null) {
                     if (toRoll.isComplete()) {
                         writer.putInt(0);

src/engine/net/client/msg/ManageNPCMsg.java

@@ -178,7 +178,7 @@ public class ManageNPCMsg extends ClientNetMsg {
 
                 if (this.targetType == GameObjectType.NPC.ordinal()) {
 
-                    npc = NPC.getFromCache(this.targetID);
+                    npc = NPCManager.getFromCache(this.targetID);
 
                     if (npc == null) {
                         Logger.error("Missing NPC of ID " + this.targetID);
@@ -233,7 +233,7 @@ public class ManageNPCMsg extends ClientNetMsg {
                     writer.put((byte) 0);
                     writer.putInt(0);
 
-                    NPCProfits profit = NPC.GetNPCProfits(npc);
+                    NPCProfits profit = NPCManager.GetNPCProfits(npc);
 
                     if (profit == null)
                         profit = NPCProfits.defaultProfits;
@@ -598,7 +598,7 @@ public class ManageNPCMsg extends ClientNetMsg {
 
                         }
 
-                        if (NPC.ISGuardCaptain(mobA.getContract().getContractID()) == false)
+                        if (NPCManager.ISGuardCaptain(mobA.getContract().getContractID()) == false)
                             maxSlots = 0;
 
                         writer.putInt(0); //anything other than 0 seems to mess up the client

src/engine/net/client/msg/OpenFriendsCondemnListMsg.java

@@ -11,6 +11,8 @@ package engine.net.client.msg;
 
 import engine.Enum.GameObjectType;
 import engine.gameManager.DbManager;
+import engine.gameManager.NPCManager;
+import engine.gameManager.PlayerManager;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;
@@ -619,7 +621,7 @@ public class OpenFriendsCondemnListMsg extends ClientNetMsg {
         writer.putInt(listSize);
 
         for (BuildingFriends friend : this.friends.values()) {
-            pc = PlayerCharacter.getFromCache(friend.getPlayerUID());
+            pc = PlayerManager.getFromCache(friend.getPlayerUID());
             guild = Guild.getGuild(friend.getGuildUID());
             if (friend.getFriendType() == 7) {
                 if (pc != null)
@@ -718,9 +720,9 @@ public class OpenFriendsCondemnListMsg extends ClientNetMsg {
             AbstractCharacter heraldryCharacter = null;
             int characterType = heraldryMap.get(characterID);
             if (characterType == GameObjectType.PlayerCharacter.ordinal())
-                heraldryCharacter = PlayerCharacter.getFromCache(characterID);
+                heraldryCharacter = PlayerManager.getFromCache(characterID);
             else if (characterType == GameObjectType.NPC.ordinal())
-                heraldryCharacter = NPC.getFromCache(characterID);
+                heraldryCharacter = NPCManager.getFromCache(characterID);
             else if (characterType == GameObjectType.Mob.ordinal())
                 heraldryCharacter = Mob.getFromCache(characterID);
 

src/engine/net/client/msg/RefineMsg.java

@@ -10,6 +10,8 @@
 package engine.net.client.msg;
 
 
+import engine.gameManager.NPCManager;
+import engine.gameManager.PlayerManager;
 import engine.gameManager.SessionManager;
 import engine.net.*;
 import engine.net.client.ClientConnection;
@@ -62,7 +64,7 @@ public class RefineMsg extends ClientNetMsg {
         PlayerCharacter pc = SessionManager.getPlayerCharacter(origin);
         if (pc == null)
             return;
-        NPC npc = NPC.getFromCache(msg.npcID);
+        NPC npc = NPCManager.getFromCache(msg.npcID);
         if (npc == null)
             return;
         int type = msg.type;
@@ -160,15 +162,15 @@ public class RefineMsg extends ClientNetMsg {
 
     private static boolean refineStat(ClientConnection origin, PlayerCharacter pc, int token, RefineMsg msg) {
         if (token == MBServerStatics.STAT_STR_ID)
-            return pc.refineStr();
+            return PlayerManager.refineStr(pc);
         if (token == MBServerStatics.STAT_DEX_ID)
-            return pc.refineDex();
+            return PlayerManager.refineDex(pc);
         if (token == MBServerStatics.STAT_CON_ID)
-            return pc.refineCon();
+            return PlayerManager.refineCon(pc);
         if (token == MBServerStatics.STAT_INT_ID)
-            return pc.refineInt(msg);
+            return PlayerManager.refineInt(pc, msg);
         if (token == MBServerStatics.STAT_SPI_ID)
-            return pc.refineSpi();
+            return PlayerManager.refineSpi(pc);
         return false;
     }
 

src/engine/net/client/msg/SendOwnPlayerMsg.java

@@ -11,6 +11,7 @@ package engine.net.client.msg;
 
 
 import engine.exception.SerializationException;
+import engine.gameManager.PlayerManager;
 import engine.net.AbstractConnection;
 import engine.net.AbstractNetMsg;
 import engine.net.ByteBufferReader;
@@ -90,7 +91,7 @@ public class SendOwnPlayerMsg extends ClientNetMsg {
         }
         writer.putVector3f(ch.getLoc());
         try {
-            PlayerCharacter.serializeForClientMsgFull(this.ch, writer);
+            PlayerManager.serializeForClientMsgFull(this.ch, writer);
         } catch (SerializationException e) {
             Logger.error(e);
         }

src/engine/net/client/msg/TerritoryChangeMessage.java

@@ -11,6 +11,7 @@ package engine.net.client.msg;
 
 
 import engine.exception.SerializationException;
+import engine.gameManager.PlayerManager;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;
@@ -64,7 +65,7 @@ public class TerritoryChangeMessage extends ClientNetMsg {
         writer.putString(realm.getRealmName());
         if (this.realmOwner != null) {
             writer.putString(this.realmOwner.getCombinedName());
-            writer.putInt(PlayerCharacter.GetPlayerRealmTitle(this.realmOwner));
+            writer.putInt(PlayerManager.GetPlayerRealmTitle(this.realmOwner));
             writer.putInt(1);
             writer.put((byte) 1);
             writer.put((byte) 1);

src/engine/net/client/msg/TrackWindowMsg.java

@@ -10,6 +10,8 @@
 package engine.net.client.msg;
 
 import engine.Enum.GameObjectType;
+import engine.gameManager.NPCManager;
+import engine.gameManager.PlayerManager;
 import engine.net.AbstractConnection;
 import engine.net.AbstractNetMsg;
 import engine.net.ByteBufferReader;
@@ -89,7 +91,7 @@ public class TrackWindowMsg extends ClientNetMsg {
         for (int i = 0; i < size; i++) {
             int objectType = reader.getInt();
             int objectID = reader.getInt();
-            this.source = PlayerCharacter.getFromCache(objectID);
+            this.source = PlayerManager.getFromCache(objectID);
             reader.getString(); //name
             reader.get(); //always 00?
             reader.getInt(); //guildObjectType
@@ -106,9 +108,9 @@ public class TrackWindowMsg extends ClientNetMsg {
             //Get the Character from it's Object Type and ID
             AbstractCharacter ac = null;
             if (objectType == GameObjectType.PlayerCharacter.ordinal())
-                ac = PlayerCharacter.getFromCache(objectID);
+                ac = PlayerManager.getFromCache(objectID);
             else if (objectType == GameObjectType.NPC.ordinal())
-                ac = NPC.getFromCache(objectID);
+                ac = NPCManager.getFromCache(objectID);
             else if (objectType == GameObjectType.Mob.ordinal())
                 ac = Mob.getFromCache(objectID);
 

src/engine/net/client/msg/TrainMsg.java

@@ -12,10 +12,7 @@ package engine.net.client.msg;
 import engine.Enum;
 import engine.Enum.ProtectionState;
 import engine.exception.MsgSendException;
-import engine.gameManager.ChatManager;
-import engine.gameManager.DbManager;
-import engine.gameManager.PowersManager;
-import engine.gameManager.SessionManager;
+import engine.gameManager.*;
 import engine.net.*;
 import engine.net.client.ClientConnection;
 import engine.net.client.Protocol;
@@ -65,7 +62,7 @@ public class TrainMsg extends ClientNetMsg {
         if (playerCharacter == null)
             return;
 
-        NPC npc = NPC.getFromCache(msg.npcID);
+        NPC npc = NPCManager.getFromCache(msg.npcID);
 
         if (npc == null)
             return;

src/engine/net/client/msg/VendorDialogMsg.java

@@ -11,12 +11,8 @@ package engine.net.client.msg;
 
 import engine.Enum.DispatchChannel;
 import engine.Enum.GuildHistoryType;
-import engine.QuestSystem.QuestManager;
 import engine.exception.MsgSendException;
-import engine.gameManager.BuildingManager;
-import engine.gameManager.DbManager;
-import engine.gameManager.GuildManager;
-import engine.gameManager.SessionManager;
+import engine.gameManager.*;
 import engine.math.Vector3fImmutable;
 import engine.net.*;
 import engine.net.client.ClientConnection;
@@ -84,7 +80,7 @@ public class VendorDialogMsg extends ClientNetMsg {
         }
 
         // Get NPC that player is talking to
-        NPC npc = NPC.getFromCache(msg.vendorObjectID);
+        NPC npc = NPCManager.getFromCache(msg.vendorObjectID);
         int npcClassID;
 
         if (npc == null)
@@ -126,22 +122,18 @@ public class VendorDialogMsg extends ClientNetMsg {
            vd = Contract.HandleBaneCommanderOptions(msg.unknown03, npc, playerCharacter);
            msg.updateMessage(3, vd);
         }else {
-            if(QuestManager.grantsQuest(npc)){
-                vd = Contract.HandleQuestOptions(msg.unknown03, npc, playerCharacter);
-                msg.updateMessage(3, vd);
-            }else {
-                if (contract == null)
+
+            if (contract == null)
+                vd = VendorDialog.getHostileVendorDialog();
+            else if (npc.getBuilding() != null) {
+                if (npc.getBuilding() != null && BuildingManager.IsPlayerHostile(npc.getBuilding(), playerCharacter))
                     vd = VendorDialog.getHostileVendorDialog();
-                else if (npc.getBuilding() != null) {
-                    if (npc.getBuilding() != null && BuildingManager.IsPlayerHostile(npc.getBuilding(), playerCharacter))
-                        vd = VendorDialog.getHostileVendorDialog();
-                    else
-                        vd = contract.getVendorDialog();
-                } else
+                else
                     vd = contract.getVendorDialog();
-                if (vd == null)
-                    vd = VendorDialog.getHostileVendorDialog();
-            }
+            } else
+                vd = contract.getVendorDialog();
+            if (vd == null)
+                vd = VendorDialog.getHostileVendorDialog();
         if (msg.messageType == 1 || msg.unknown03 == vd.getObjectUUID()) {
             msg.updateMessage(3, vd);
         } else {
@@ -442,7 +434,7 @@ public class VendorDialogMsg extends ClientNetMsg {
         if (level >= minLevel && level <= maxLevel) {
             if (useSquare)
                 loc = getSquare(loc);
-            pc.teleport(loc);
+            PlayerManager.teleport(pc, loc);
             pc.setSafeMode();
             // PowersManager.applyPower(pc, pc, new Vector3f(0f,
             // 0f, 0f), -1661758934, 40, false);
@@ -468,7 +460,7 @@ public class VendorDialogMsg extends ClientNetMsg {
                 // teleport player
                 if (useSquare)
                     loc = getSquare(loc);
-                pc.teleport(loc);
+                PlayerManager.teleport(pc, loc);
                 pc.setSafeMode();
                 // PowersManager.applyPower(pc, pc, new
                 // Vector3f(0f, 0f, 0f), -1661758934, 40, false);
@@ -476,10 +468,10 @@ public class VendorDialogMsg extends ClientNetMsg {
                 // join guild
                 GuildManager.joinGuild(pc, guild, GuildHistoryType.JOIN);
 
-                pc.resetGuildStatuses();
+                PlayerManager.resetGuildStatuses(pc);
 
                 if (guild.isNPCGuild())
-                    pc.setFullMember(true);
+                    PlayerManager.setFullMember(pc, true);
 
                 if (useSquare)
                     loc = loc.add(30, 0, 0);
@@ -488,7 +480,7 @@ public class VendorDialogMsg extends ClientNetMsg {
                 // guild not found, just teleport
                 if (useSquare)
                     loc = getSquare(loc);
-                pc.teleport(loc);
+                PlayerManager.teleport(pc, loc);
                 pc.setSafeMode();
                 // PowersManager.applyPower(pc, pc, new
                 // Vector3f(0f, 0f, 0f), -1661758934, 50, false);
@@ -636,11 +628,6 @@ public class VendorDialogMsg extends ClientNetMsg {
                 .getObjectUUID(), true);
         DispatchMessage.dispatchMsgToInterestArea(pc, arm, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
 
-        if(pc.getCharItemManager() != null && pc.getCharItemManager().getGoldInventory() != null && pc.getCharItemManager().getGoldInventory().getNumOfItems() < 1000) {
-            pc.getCharItemManager().addGoldToInventory(1000, false);
-            pc.getCharItemManager().addItemToInventory(new MobLoot(pc, ItemBase.getItemBase(980066), 1, false).promoteToItem(pc));
-            pc.getCharItemManager().updateInventory();
-        }
 
     }
 

src/engine/net/client/msg/WhoResponseMsg.java

@@ -10,6 +10,7 @@
 package engine.net.client.msg;
 
 import engine.Enum;
+import engine.gameManager.PlayerManager;
 import engine.gameManager.SessionManager;
 import engine.net.*;
 import engine.net.client.ClientConnection;
@@ -63,9 +64,6 @@ public class WhoResponseMsg extends ClientNetMsg {
 
     public static void HandleResponse(int set, int filterType, String filter, ClientConnection origin) {
 
-        if (filter.equals("")) {
-            filter = "Saetor";
-        }
         WhoResponseMsg msg = new WhoResponseMsg();
         WhoResponseMsg.setWorldPop(SessionManager.getAllActivePlayerCharacters().size());
 
@@ -236,8 +234,8 @@ public class WhoResponseMsg extends ClientNetMsg {
             writer.putInt(pc.getObjectUUID());
             writer.putString(pc.getFirstName());
             writer.putString(pc.getLastName());
-            writer.putInt(pc.getRaceToken());
-            writer.putInt(pc.getClassToken());
+            writer.putInt(PlayerManager.getRaceToken(pc));
+            writer.putInt(PlayerManager.getClassToken(pc));
             writer.putInt(pc.getLevel());
             writer.putInt(0); // unknown 0
             writer.putInt(pc.isMale() ? 1 : 2); //gender?

src/engine/net/client/msg/guild/GuildInfoMsg.java

@@ -11,6 +11,8 @@ package engine.net.client.msg.guild;
 
 
 import engine.Enum.GameObjectType;
+import engine.gameManager.NPCManager;
+import engine.gameManager.PlayerManager;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;
@@ -193,7 +195,7 @@ class GuildInfoMessageType2 extends GuildInfoMessageType {
             writer.putString(g.getName());
 
             if (this.objectType == GameObjectType.PlayerCharacter.ordinal()) {
-                PlayerCharacter pc = PlayerCharacter.getFromCache(this.objectID);
+                PlayerCharacter pc = PlayerManager.getFromCache(this.objectID);
 
                 if (pc != null) {
                     writer.putInt(GuildStatusController.getRank(pc.getGuildStatus()));
@@ -254,7 +256,7 @@ class GuildInfoMessageType4 extends GuildInfoMessageType {
         writer.putInt(0);
         writer.putInt(0);
         writer.putInt(0);
-        PlayerCharacter pc = PlayerCharacter.getFromCache(this.objectID);
+        PlayerCharacter pc = PlayerManager.getFromCache(this.objectID);
         if (this.g == null || pc == null) {
             writer.putInt(0);
             writer.putInt(0);
@@ -294,11 +296,11 @@ class GuildInfoMessageType4 extends GuildInfoMessageType {
         AbstractCharacter guildLeader;
         String guildLeaderName = "";
         if (g.isNPCGuild()) {
-            guildLeader = NPC.getFromCache(g.getGuildLeaderUUID());
+            guildLeader = NPCManager.getFromCache(g.getGuildLeaderUUID());
             if (guildLeader != null)
                 guildLeaderName = guildLeader.getName();
         } else {
-            guildLeader = PlayerCharacter.getFromCache(g.getGuildLeaderUUID());
+            guildLeader = PlayerManager.getFromCache(g.getGuildLeaderUUID());
             if (guildLeader != null)
                 guildLeaderName = ((PlayerCharacter) guildLeader).getCombinedName();
         }

src/engine/net/client/msg/guild/GuildListMsg.java

@@ -11,6 +11,7 @@ package engine.net.client.msg.guild;
 
 import engine.Enum;
 import engine.Enum.GameObjectType;
+import engine.gameManager.PlayerManager;
 import engine.gameManager.SessionManager;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
@@ -204,7 +205,7 @@ class GuildListMessageType2 extends GuildListMessageType {
         writer.putInt(GuildStatusController.getTitle(pc.getGuildStatus()));    //Title Maybe?
         writer.putInt(GuildStatusController.getRank(pc.getGuildStatus()));    //Rank?
 
-        writer.putInt(pc.getRaceToken());    //race token
+        writer.putInt(PlayerManager.getRaceToken(pc));    //race token
         writer.putInt(pc.getBaseClassToken());    //class token
 
         writer.putInt(2);    //PAD

src/engine/net/client/msg/login/CharSelectScreenMsg.java

@@ -11,6 +11,7 @@ package engine.net.client.msg.login;
 
 
 import engine.exception.SerializationException;
+import engine.gameManager.PlayerManager;
 import engine.net.AbstractConnection;
 import engine.net.AbstractNetMsg;
 import engine.net.ByteBufferReader;
@@ -162,9 +163,9 @@ public class CharSelectScreenMsg extends ClientNetMsg {
         for (int i = 0; i < this.numChars; ++i) {
             try {
                 if (!fromCommit)
-                    PlayerCharacter.serializeForClientMsgLogin(this.chars.get(i), writer);
+                    PlayerManager.serializeForClientMsgLogin(this.chars.get(i), writer);
                 else
-                    PlayerCharacter.serializeForClientMsgCommit(this.chars.get(i), writer);
+                    PlayerManager.serializeForClientMsgCommit(this.chars.get(i), writer);
             } catch (SerializationException e) {
                 Logger.error("failed to serialize character " + this.chars.get(i).getObjectUUID());
                 // Handled already.

src/engine/objects/AbstractCharacter.java

@@ -57,7 +57,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     protected short statIntCurrent;
     protected short statSpiCurrent;
     protected short unusedStatPoints;
-    protected int exp;
+    public int exp;
     public int buildingUUID;
     public Building building;
 
@@ -67,8 +67,8 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     public int guildUUID;
     public Guild guild;
     protected byte runningTrains;
-    protected ConcurrentHashMap<Integer, CharacterPower> powers;
-    protected ConcurrentHashMap<String, CharacterSkill> skills;
+    public ConcurrentHashMap<Integer, CharacterPower> powers;
+    public ConcurrentHashMap<String, CharacterSkill> skills;
     // Variables NOT to be stored in db
     protected boolean sit = false;
     protected boolean walkMode;
@@ -80,11 +80,11 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     // ticking down so that mobs/players following dont just move away to your projected location
     protected Vector3fImmutable nextEndLoc = Vector3fImmutable.ZERO;
     protected float speed;
-    protected AtomicFloat stamina = new AtomicFloat();
+    public AtomicFloat stamina = new AtomicFloat();
     protected float staminaMax;
-    protected AtomicFloat mana = new AtomicFloat();
+    public AtomicFloat mana = new AtomicFloat();
     protected float manaMax;                                            // Health/Mana/Stamina
-    protected AtomicBoolean isAlive = new AtomicBoolean(true);
+    public AtomicBoolean isAlive = new AtomicBoolean(true);
     protected Resists resists = new Resists("Genric");
     protected ConcurrentHashMap<String, JobContainer> timers;
     protected ConcurrentHashMap<String, Long> timestamps;
@@ -102,7 +102,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     protected boolean isActive; // <-Do not use this for deleting character!
     protected float altitude = 0; // 0=on terrain, 1=tier 1, 2=tier 2, etc.
     protected ConcurrentHashMap<Integer, JobContainer> recycleTimers;
-    protected PlayerBonuses bonuses;
+    public PlayerBonuses bonuses;
     protected JobContainer lastChant;
     protected boolean isCasting = false;
     protected long lastSetLocUpdate = 0L;
@@ -363,13 +363,13 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
 
         switch (abstractCharacter.getObjectType()) {
             case PlayerCharacter:
-                PlayerCharacter.serializePlayerForClientMsgOtherPlayer((PlayerCharacter) abstractCharacter, writer, asciiLastName);
+                PlayerManager.serializePlayerForClientMsgOtherPlayer((PlayerCharacter) abstractCharacter, writer, asciiLastName);
                 break;
             case Mob:
                 Mob.serializeMobForClientMsgOtherPlayer((Mob) abstractCharacter, writer);
                 break;
             case NPC:
-                NPC.serializeNpcForClientMsgOtherPlayer((NPC) abstractCharacter, writer, asciiLastName);
+                NPCManager.serializeNpcForClientMsgOtherPlayer((NPC) abstractCharacter, writer, asciiLastName);
                 break;
         }
 
@@ -445,7 +445,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
                 playerCharacter.calculateItemBonuses();
 
                 //recalculate formulas
-                PlayerCharacter.recalculatePlayerStatsOnLoad(playerCharacter);
+                PlayerManager.recalculatePlayerStatsOnLoad(playerCharacter);
 
             } catch (Exception e) {
                 Logger.error(e);
@@ -500,6 +500,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
             canFly = false;
         }
 
+
         return canFly;
 
     }
@@ -745,7 +746,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         }
 
         if (this.getObjectType().equals(GameObjectType.PlayerCharacter))
-            if (((PlayerCharacter) this).isLastSwimming())
+            if (PlayerManager.isLastSwimming(((PlayerCharacter) this)))
                 return 1; //swimming
 
         return 2; //ground
@@ -1101,7 +1102,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     }
 
     public final void setCombatTarget(final AbstractWorldObject value) {
-        if (this.getObjectTypeMask() == 2050) {//MOB?
+        if(this.getObjectTypeMask() == 2050) {//MOB?
             if (value == null) {
                 if (this.isCombat()) {
                     this.setCombat(false);
@@ -1109,6 +1110,13 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
                     rwss.setPlayer(this);
                     DispatchMessage.sendToAllInRange(this, rwss);
                 }
+                }else {
+                if (!this.isCombat()) {
+                    this.setCombat(true);
+                    UpdateStateMsg rwss = new UpdateStateMsg();
+                    rwss.setPlayer(this);
+                    DispatchMessage.sendToAllInRange(this, rwss);
+                }
             }
         }
         this.combatTarget = value;
@@ -1699,7 +1707,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
 
                 if (CanFly(player) == false &&
                         player.getMovementState().equals(MovementState.FLYING))
-                    PlayerCharacter.GroundPlayer(player);
+                    PlayerManager.GroundPlayer(player);
             }
 
         } catch (Exception e) {

src/engine/objects/AbstractGameObject.java

@@ -12,6 +12,8 @@ package engine.objects;
 import engine.Enum.GameObjectType;
 import engine.gameManager.BuildingManager;
 import engine.gameManager.DbManager;
+import engine.gameManager.NPCManager;
+import engine.gameManager.PlayerManager;
 import engine.job.JobContainer;
 import engine.job.JobScheduler;
 import engine.jobs.DatabaseUpdateJob;
@@ -107,10 +109,10 @@ public abstract class AbstractGameObject {
 
         switch (objectType) {
             case PlayerCharacter:
-                return PlayerCharacter.getPlayerCharacter(tableID);
+                return PlayerManager.getPlayerCharacter(tableID);
 
             case NPC:
-                return NPC.getNPC(tableID);
+                return NPCManager.getNPC(tableID);
 
             case Mob:
                 return Mob.getMob(tableID);

src/engine/objects/AbstractWorldObject.java

@@ -15,6 +15,7 @@ import engine.Enum.GameObjectType;
 import engine.Enum.GridObjectType;
 import engine.InterestManagement.HeightMap;
 import engine.InterestManagement.WorldGrid;
+import engine.gameManager.PlayerManager;
 import engine.job.AbstractScheduleJob;
 import engine.job.JobContainer;
 import engine.job.JobScheduler;
@@ -39,7 +40,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 public abstract class AbstractWorldObject extends AbstractGameObject {
 
-    protected final ReadWriteLock locationLock = new ReentrantReadWriteLock(true);
+    public final ReadWriteLock locationLock = new ReentrantReadWriteLock(true);
     protected final ReadWriteLock updateLock = new ReentrantReadWriteLock(true);
     public float healthMax;
     public ConcurrentHashMap<String, Effect> effects = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
@@ -49,7 +50,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
     public Regions landingRegion = null;
     public Vector3fImmutable lastLoc = Vector3fImmutable.ZERO;
     public Vector3fImmutable loc = new Vector3fImmutable(0.0f, 0.0f, 0.0f);
-    protected AtomicFloat health = new AtomicFloat();
+    public AtomicFloat health = new AtomicFloat();
     protected boolean load = true;
     protected GridObjectType gridObjectType;
     protected float altitude = 0;
@@ -150,7 +151,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
         Regions region = null;
 
         if (worldObject.getObjectType().equals(GameObjectType.PlayerCharacter))
-            if (((PlayerCharacter) worldObject).isFlying())
+            if (PlayerManager.isFlying(((PlayerCharacter) worldObject)))
                 return null;
         //Find building
         for (AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(worldObject.getLoc(), MBServerStatics.STRUCTURE_LOAD_RANGE, MBServerStatics.MASK_BUILDING)) {
@@ -271,7 +272,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
             if (this.getObjectType().equals(GameObjectType.PlayerCharacter))
                 if (name.equals("Flight")) {
                     ((PlayerCharacter) this).update(false);
-                    PlayerCharacter.GroundPlayer((PlayerCharacter) this);
+                    PlayerManager.GroundPlayer((PlayerCharacter) this);
                 }
         }
         applyAllBonuses();
@@ -386,7 +387,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
                         //ground player
                         if (this.getObjectType().equals(GameObjectType.PlayerCharacter)) {
                             ((PlayerCharacter) this).update(false);
-                            PlayerCharacter.GroundPlayer((PlayerCharacter) this);
+                            PlayerManager.GroundPlayer((PlayerCharacter) this);
                         }
                     }
                 } else {
@@ -415,7 +416,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
                     //ground player
                     if (this.getObjectType().equals(GameObjectType.PlayerCharacter)) {
                         ((PlayerCharacter) this).update(false);
-                        PlayerCharacter.GroundPlayer((PlayerCharacter) this);
+                        PlayerManager.GroundPlayer((PlayerCharacter) this);
                     }
                 }
 

src/engine/objects/Account.java

@@ -14,6 +14,7 @@ import engine.Enum.DispatchChannel;
 import engine.Enum.ItemContainerType;
 import engine.gameManager.ConfigManager;
 import engine.gameManager.DbManager;
+import engine.gameManager.PlayerManager;
 import engine.gameManager.SessionManager;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
@@ -163,7 +164,7 @@ public class Account extends AbstractGameObject {
                 ArrayList<PlayerCharacter> playerList = DbManager.PlayerCharacterQueries.GET_CHARACTERS_FOR_ACCOUNT(this.getObjectUUID());
 
                 for (PlayerCharacter player : playerList) {
-                    PlayerCharacter.initializePlayer(player);
+                    PlayerManager.initializePlayer(player);
                     this.characterMap.putIfAbsent(player.getObjectUUID(), player);
                 }
 

src/engine/objects/Bane.java

@@ -261,7 +261,7 @@ public final class Bane {
         Vector3fImmutable movePlayerOutsideStone = player.getLoc();
         movePlayerOutsideStone = movePlayerOutsideStone.setX(movePlayerOutsideStone.x + 10);
         movePlayerOutsideStone = movePlayerOutsideStone.setZ(movePlayerOutsideStone.z + 10);
-        player.teleport(movePlayerOutsideStone);
+        PlayerManager.teleport(player, movePlayerOutsideStone);
 
         // Notify players
 
@@ -303,7 +303,7 @@ public final class Bane {
         if(commanderuuid == 0) {
             //add bane commander NPC
             int contractID = 1502042;
-            baneCommander = NPC.createNPC("Bane Commander", contractID, spawnLoc, bane.getCity().getGuild(), ZoneManager.findSmallestZone(bane.getStone().loc), (short) 70, bane.getStone());
+            baneCommander = NPCManager.createNPC("Bane Commander", contractID, spawnLoc, bane.getCity().getGuild(), ZoneManager.findSmallestZone(bane.getStone().loc), (short) 70, bane.getStone());
             try {
                 NPCManager.slotCharacterInBuilding(baneCommander);
             }catch(Exception e){
@@ -314,7 +314,7 @@ public final class Bane {
         }
         else
         {
-            baneCommander = NPC.getNPC(commanderuuid);
+            baneCommander = NPCManager.getNPC(commanderuuid);
         }
         //try {
         //    NPCManager.slotCharacterInBuilding(baneCommander);
@@ -428,24 +428,32 @@ public final class Bane {
 
     // Cache access
 
-    public void setDefaultTime() {
+    private void setDefaultTime() {
 
         DateTime timeToSetDefault = new DateTime(this.placementDate);
         timeToSetDefault = timeToSetDefault.plusDays(1);
 
-        if (DateTime.now().isAfter(timeToSetDefault)){
-            if(!this.capSet){
-                DbManager.BaneQueries.SET_BANE_CAP_NEW(20,this.getCityUUID());
-                this.capSet = true;
-            }
-            if(!this.daySet){
-                DbManager.BaneQueries.SET_BANE_DAY_NEW(3,this.getCityUUID());
-                this.daySet = true;
-            }
-            if(!this.timeSet){
-                DbManager.BaneQueries.SET_BANE_TIME_NEW(9,this.getCityUUID());
-                this.timeSet = true;
-            }
+        DateTime currentTime = DateTime.now();
+        DateTime defaultTime = new DateTime(this.placementDate);
+        defaultTime = defaultTime.plusDays(2);
+        defaultTime = defaultTime.hourOfDay().setCopy(22);
+        defaultTime = defaultTime.minuteOfHour().setCopy(0);
+        defaultTime = defaultTime.secondOfMinute().setCopy(0);
+
+        if (currentTime.isAfter(timeToSetDefault)){
+            DbManager.BaneQueries.SET_BANE_CAP_NEW(20,this.getCityUUID());
+            DbManager.BaneQueries.SET_BANE_TIME_NEW(9,this.getCityUUID());
+            DbManager.BaneQueries.SET_BANE_DAY_NEW(3,this.getCityUUID());
+        }
+            //this.setLiveDate(defaultTime);
+        else {
+
+            if (this.defaultTimeJob != null)
+                this.defaultTimeJob.cancelJob();
+
+            BaneDefaultTimeJob bdtj = new BaneDefaultTimeJob(this);
+            JobScheduler.getInstance().scheduleJob(bdtj, timeToSetDefault.getMillis());
+            this.defaultTimeJob = bdtj;
         }
     }
 
@@ -726,7 +734,7 @@ public final class Bane {
         HashSet<AbstractWorldObject> inSiegeRange = WorldGrid.getObjectsInRangePartial(city.getTOL().loc,1750f,1);
         for(AbstractWorldObject obj : inSiegeRange){
             int uuid = obj.getObjectUUID();
-            PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
+            PlayerCharacter player = PlayerManager.getPlayerCharacter(uuid);
             if(player == null)
                 continue;
             Guild playerNation = player.guild.getNation();
@@ -741,7 +749,7 @@ public final class Bane {
         int attackerSize = 0;
         int defenderSize = 0;
         for(int uuid : city.baneAttendees.keySet()){
-            PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
+            PlayerCharacter player = PlayerManager.getPlayerCharacter(uuid);
             if(player == null)
                 continue;
             if(player.guild.getNation().equals(defendNation))
@@ -754,7 +762,7 @@ public final class Bane {
         float attackerMultiplier = ZergManager.getCurrentMultiplier(attackerSize,this.capSize);
         float defenderMultiplier = ZergManager.getCurrentMultiplier(defenderSize,this.capSize);
         for(int uuid : attackers){
-            PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
+            PlayerCharacter player = PlayerManager.getPlayerCharacter(uuid);
             if(inSiegeRange.contains(player)) //player is still physically here, needs updated multiplier
                 player.ZergMultiplier = attackerMultiplier;
             else
@@ -762,7 +770,7 @@ public final class Bane {
         }
 
         for(int uuid : defenders){
-            PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
+            PlayerCharacter player = PlayerManager.getPlayerCharacter(uuid);
             if(inSiegeRange.contains(player)) //player is still physically here, needs updated multiplier
                 player.ZergMultiplier = defenderMultiplier;
             else

src/engine/objects/Blueprint.java

@@ -360,10 +360,6 @@ this.maxRank = rs.getInt("MaxRank");
                 return 3;
         }
 
-        if(bg != null && bg.equals(BuildingGroup.TOL) && currentRank == 8){
-            return 5;
-        }
-
         if (this.maxRank == 1 && currentRank == 1)
             return getMaxSlots();
 

src/engine/objects/Building.java

@@ -17,9 +17,7 @@ import engine.InterestManagement.WorldGrid;
 import engine.db.archive.CityRecord;
 import engine.db.archive.DataWarehouse;
 import engine.db.archive.MineRecord;
-import engine.gameManager.BuildingManager;
-import engine.gameManager.DbManager;
-import engine.gameManager.ZoneManager;
+import engine.gameManager.*;
 import engine.job.JobContainer;
 import engine.job.JobScheduler;
 import engine.jobs.DoorCloseJob;
@@ -160,16 +158,23 @@ public class Building extends AbstractWorldObject {
             // in City resulting in a stack ovreflow.
 
             if (blueprint != null) {
+
                 // Only switch mesh for player dropped structures
+
                 if (this.blueprintUUID != 0)
                     this.meshUUID = blueprint.getMeshForRank(rank);
+
                 this.healthMax = blueprint.getMaxHealth(this.rank);
+
                 // If this object has no blueprint but is a blueprint
                 // mesh then set it's current health to max health
+
                 if (this.blueprintUUID == 0)
                     this.setHealth(healthMax);
+
                 if (blueprint.getBuildingGroup().equals(BuildingGroup.BARRACK))
                     this.patrolPoints = DbManager.BuildingQueries.LOAD_PATROL_POINTS(this);
+
             } else {
                 this.healthMax = 100000;  // Structures with no blueprint mesh
                 this.setHealth(healthMax);
@@ -412,22 +417,6 @@ public class Building extends AbstractWorldObject {
         this.healthMax = this.getBlueprint().getMaxHealth(this.rank);
         this.setCurrentHitPoints(this.healthMax);
 
-        if(!this.ownerIsNPC && this.getBlueprint() != null && this.getBlueprint().isWallPiece()){
-            //add extra HP for city walls of R8 trees
-            City city = ZoneManager.getCityAtLocation(this.loc);
-            if(city != null){
-                Building ToL = city.getTOL();
-                if(ToL != null){
-                    if(ToL.rank == 8){
-                        float currentHealth = this.health.get();
-                        float newHealth = (currentHealth/this.healthMax) * (this.healthMax * 1.1f);
-                        this.healthMax *= 1.1f;
-                        this.setHealth(newHealth);
-                    }
-                }
-            }
-        }
-
         if (this.getUpgradeDateTime() != null)
             BuildingManager.setUpgradeDateTime(this, null, 0);
 
@@ -977,9 +966,9 @@ public class Building extends AbstractWorldObject {
         if (this.ownerUUID == 0)
             return null;
         if (this.ownerIsNPC)
-            return NPC.getFromCache(this.ownerUUID);
+            return NPCManager.getFromCache(this.ownerUUID);
 
-        return PlayerCharacter.getFromCache(this.ownerUUID);
+        return PlayerManager.getFromCache(this.ownerUUID);
 
     }
 
@@ -1100,11 +1089,11 @@ public class Building extends AbstractWorldObject {
             //LOad Owners in Cache so we do not have to continuely look in the db for owner.
 
             if (this.ownerIsNPC) {
-                if (NPC.getNPC(this.ownerUUID) == null)
+                if (NPCManager.getNPC(this.ownerUUID) == null)
                     Logger.info("Building UID " + this.getObjectUUID() + " Failed to Load NPC Owner with ID " + this.ownerUUID + " Location " + this.getLoc().toString());
 
             } else if (this.ownerUUID != 0) {
-                if (PlayerCharacter.getPlayerCharacter(this.ownerUUID) == null) {
+                if (PlayerManager.getPlayerCharacter(this.ownerUUID) == null) {
                     Logger.info("Building UID " + this.getObjectUUID() + " Failed to Load Player Owner with ID " + this.ownerUUID + " Location " + this.getLoc().toString());
                 }
             }
@@ -1137,22 +1126,6 @@ public class Building extends AbstractWorldObject {
                 }
             }
 
-            if(!this.ownerIsNPC && this.getBlueprint() != null && this.getBlueprint().isWallPiece()){
-                //add extra HP for city walls of R8 trees
-                City city = ZoneManager.getCityAtLocation(this.loc);
-                if(city != null){
-                    Building ToL = city.getTOL();
-                    if(ToL != null){
-                        if(ToL.rank == 8){
-                            float currentHealth = this.health.get();
-                            float newHealth = (currentHealth/this.healthMax) * (this.healthMax * 1.1f);
-                            this.healthMax *= 1.1f;
-                            this.setHealth(newHealth);
-                        }
-                    }
-                }
-            }
-
             // Set bounds for this building
 
             Bounds buildingBounds = Bounds.borrow();

src/engine/objects/CharacterItemManager.java

@@ -12,10 +12,7 @@ package engine.objects;
 import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.Enum.ItemType;
-import engine.gameManager.BuildingManager;
-import engine.gameManager.ChatManager;
-import engine.gameManager.ConfigManager;
-import engine.gameManager.DbManager;
+import engine.gameManager.*;
 import engine.math.Vector3fImmutable;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
@@ -424,7 +421,7 @@ public class CharacterItemManager {
     public synchronized boolean tradeRequest(TradeRequestMsg msg) {
 
         PlayerCharacter source = (PlayerCharacter) this.getOwner();
-        PlayerCharacter target = PlayerCharacter.getFromCache(msg.getPlayerID());
+        PlayerCharacter target = PlayerManager.getFromCache(msg.getPlayerID());
         Dispatch dispatch;
 
         if (!canTrade(source, target)) {
@@ -450,7 +447,7 @@ public class CharacterItemManager {
     }
 
     public synchronized boolean invalidTradeRequest(InvalidTradeRequestMsg msg) {
-        PlayerCharacter requester = PlayerCharacter.getFromCache(msg.getRequesterID());
+        PlayerCharacter requester = PlayerManager.getFromCache(msg.getRequesterID());
         Dispatch dispatch;
 
         dispatch = Dispatch.borrow(requester, msg);
@@ -495,7 +492,7 @@ public class CharacterItemManager {
     public synchronized boolean acceptTradeRequest(AcceptTradeRequestMsg msg) {
 
         PlayerCharacter source = (PlayerCharacter) this.getOwner();
-        PlayerCharacter target = PlayerCharacter.getFromCache(msg.getTargetID());
+        PlayerCharacter target = PlayerManager.getFromCache(msg.getTargetID());
 
         Dispatch dispatch;
 

src/engine/objects/CharacterPower.java

@@ -10,6 +10,7 @@
 package engine.objects;
 
 import engine.gameManager.DbManager;
+import engine.gameManager.PlayerManager;
 import engine.gameManager.PowersManager;
 import engine.net.ByteBufferWriter;
 import engine.net.client.msg.ErrorPopupMsg;
@@ -90,7 +91,7 @@ public class CharacterPower extends AbstractGameObject {
     }
 
     public static PlayerCharacter getOwner(CharacterPower cp) {
-        return PlayerCharacter.getFromCache(cp.ownerUID);
+        return PlayerManager.getFromCache(cp.ownerUID);
     }
 
     /*

src/engine/objects/CharacterSkill.java

@@ -14,6 +14,7 @@ import engine.Enum.CharacterSkills;
 import engine.Enum.ModType;
 import engine.Enum.SourceType;
 import engine.gameManager.DbManager;
+import engine.gameManager.PlayerManager;
 import engine.net.ByteBufferWriter;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
@@ -287,7 +288,7 @@ public class CharacterSkill extends AbstractGameObject {
         if (cs.isMobOwner)
             return Mob.getFromCache(cs.ownerUID);
         else
-            return PlayerCharacter.getFromCache(cs.ownerUID);
+            return PlayerManager.getFromCache(cs.ownerUID);
     }
 
     /*

src/engine/objects/City.java

@@ -692,9 +692,9 @@ public class City extends AbstractWorldObject {
             return null;
 
         if (this.isNpc == 1)
-            return NPC.getNPC(ownerID);
+            return NPCManager.getNPC(ownerID);
         else
-            return PlayerCharacter.getPlayerCharacter(ownerID);
+            return PlayerManager.getPlayerCharacter(ownerID);
     }
 
     public Guild getGuild() {
@@ -882,7 +882,7 @@ public class City extends AbstractWorldObject {
                 continue;
 
             player = (PlayerCharacter) playerObject;
-            player.addCityEffect(Integer.toString(effectBase.getUUID()), effectBase, rank, MBServerStatics.FOURTYFIVE_SECONDS, true, this);
+            PlayerManager.addCityEffect(player, Integer.toString(effectBase.getUUID()), effectBase, rank, MBServerStatics.FOURTYFIVE_SECONDS, true, this);
         }
 
     }
@@ -903,7 +903,7 @@ public class City extends AbstractWorldObject {
 
         for (Integer playerID : this._playerMemory) {
 
-            player = PlayerCharacter.getFromCache(playerID);
+            player = PlayerManager.getFromCache(playerID);
             if (player == null)
                 continue;
 
@@ -912,7 +912,7 @@ public class City extends AbstractWorldObject {
             // Reapply effect with timeout?
 
             if (refreshEffect == true)
-                player.addCityEffect(Integer.toString(effectBase.getUUID()), effectBase, rank, MBServerStatics.FOURTYFIVE_SECONDS, false, this);
+                PlayerManager.addCityEffect(player, Integer.toString(effectBase.getUUID()), effectBase, rank, MBServerStatics.FOURTYFIVE_SECONDS, false, this);
 
         }
 
@@ -969,7 +969,7 @@ public class City extends AbstractWorldObject {
                 if (effectBase == null)
                     continue;
 
-                player.addCityEffect(Integer.toString(effectBase.getUUID()), effectBase, effect.getTrains(), MBServerStatics.FOURTYFIVE_SECONDS, true, this);
+                PlayerManager.addCityEffect(player, Integer.toString(effectBase.getUUID()), effectBase, effect.getTrains(), MBServerStatics.FOURTYFIVE_SECONDS, true, this);
             }
         } catch (Exception e) {
             Logger.error(e.getMessage());
@@ -992,7 +992,7 @@ public class City extends AbstractWorldObject {
                     return;
 
                 //                player.endEffectNoPower(cityEffect);
-                player.addCityEffect(Integer.toString(effectBase.getUUID()), effectBase, effect.getTrains(), MBServerStatics.FOURTYFIVE_SECONDS, false, this);
+                PlayerManager.addCityEffect(player, Integer.toString(effectBase.getUUID()), effectBase, effect.getTrains(), MBServerStatics.FOURTYFIVE_SECONDS, false, this);
             }
         } catch (Exception e) {
             Logger.error(e.getMessage());
@@ -1089,7 +1089,7 @@ public class City extends AbstractWorldObject {
             playerUUID = iter.next();
 
 
-            player = PlayerCharacter.getFromCache(playerUUID);
+            player = PlayerManager.getFromCache(playerUUID);
 
             if (this.isLocationWithinSiegeBounds(player.getLoc()))
                 continue;

src/engine/objects/Contract.java

@@ -11,7 +11,6 @@ package engine.objects;
 
 import ch.claude_martin.enumbitset.EnumBitSet;
 import engine.Enum;
-import engine.QuestSystem.QuestManager;
 import engine.gameManager.*;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
@@ -243,7 +242,7 @@ public class Contract extends AbstractGameObject {
             }
             break;
             case 15020401:
-                PlayerCharacter.unboxPlayer(pc);
+                PlayerManager.unboxPlayer(pc);
                 vd.getOptions().clear();
                 break;
         }
@@ -478,21 +477,6 @@ public class Contract extends AbstractGameObject {
         return vd;
     }
 
-    public static VendorDialog HandleQuestOptions(int optionId, NPC npc, PlayerCharacter pc){
-        VendorDialog vd = new VendorDialog(npc.contract.getVendorDialog().getDialogType(),npc.contract.getVendorDialog().getIntro(),-1);
-        //vd.getOptions().clear();
-        switch(optionId) {
-            default:
-                    MenuOption optionAcceptQuest = new MenuOption(25020401, "Accept Quest", 25020401);
-                    vd.getOptions().add(optionAcceptQuest);
-                break;
-            case 25020401:
-                QuestManager.acceptQuest(pc,QuestManager.getQuestForContract(npc));
-                break;
-        }
-        return vd;
-    }
-
     public ArrayList<Integer> getNPCMenuOptions() {
         return this.npcMenuOptions;
     }