stronghold generation

src/engine/Enum.java

@@ -9,13 +9,15 @@
 package engine;
 
 import ch.claude_martin.enumbitset.EnumBitSetHelper;
-import engine.gameManager.BuildingManager;
 import engine.gameManager.ConfigManager;
 import engine.gameManager.PowersManager;
 import engine.gameManager.ZoneManager;
 import engine.math.Vector2f;
 import engine.math.Vector3fImmutable;
-import engine.objects.*;
+import engine.objects.AbstractCharacter;
+import engine.objects.ItemBase;
+import engine.objects.Shrine;
+import engine.objects.Zone;
 import engine.powers.EffectsBase;
 import org.pmw.tinylog.Logger;
 
@@ -469,14 +471,11 @@ public class Enum {
 
                 // 14001 does not have a banestone to bind at
 
-                if (ruinZone.getLoadNum() == 14001) {
+                if (ruinZone.getLoadNum() == 14001)
                     spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc(), 30);
-                }else {
-                    //spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc()
-                    //.add(new Vector3fImmutable(-196.016f, 2.812f, 203.621f)), 30);
-                        spawnLocation = Vector3fImmutable.getRandomPointOnCircle(BuildingManager.getBuilding(27977).loc,30f);
-
-                }
+                else
+                    spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc()
+                            .add(new Vector3fImmutable(-196.016f, 2.812f, 203.621f)), 30);
             }
 
 
@@ -1091,6 +1090,15 @@ public class Enum {
         DamageShield,
         DeathShroud,
         DefenseBuff,
+        DefenseBuffAss,
+        DefenseBuffChn,
+        DefenseBuffDsr,
+        DefenseBuffFur,
+        DefenseBuffNec,
+        DefenseBuffNsr,
+        DefenseBuffPrl,
+        DefenseBuffRng,
+        DefenseBuffWiz,
         DefenseBuffGroup,
         DefenseDebuff,
         DetectInvis,

src/engine/InterestManagement/InterestManager.java

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

src/engine/db/handlers/dbAccountHandler.java

@@ -13,7 +13,6 @@ 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;
@@ -141,7 +140,7 @@ public class dbAccountHandler extends dbHandlerBase {
                 int playerID;
 
                 playerID = rs.getInt(1);
-                trashPlayer = PlayerManager.getPlayerCharacter(playerID);
+                trashPlayer = PlayerCharacter.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")), PlayerManager.getPlayerCharacter(rs.getInt("characterID")), rs.getString("machineID"));
+                css = new CSSession(secKey, DbManager.AccountQueries.GET_ACCOUNT(rs.getInt("accountID")), PlayerCharacter.getPlayerCharacter(rs.getInt("characterID")), rs.getString("machineID"));
 
         } catch (SQLException e) {
             Logger.error(e);

src/engine/db/handlers/dbGuildHandler.java

@@ -12,7 +12,6 @@ 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;
@@ -223,7 +222,7 @@ public class dbGuildHandler extends dbHandlerBase {
 
             while (rs.next()) {
                 int playerUUID = rs.getInt(1);
-                PlayerCharacter kosPlayer = PlayerManager.getPlayerCharacter(playerUUID);
+                PlayerCharacter kosPlayer = PlayerCharacter.getPlayerCharacter(playerUUID);
 
                 if (kosPlayer != null)
                     kosList.add(kosPlayer);

src/engine/db/handlers/dbItemHandler.java

@@ -134,13 +134,9 @@ public class dbItemHandler extends dbHandlerBase {
 
             ResultSet rs = preparedStatement.executeQuery();
 
-            if (rs.next()) {
-                try {
-                    worked = rs.getBoolean("result");
-                }catch(Exception e){
-                    worked = false;
-                }
-            }
+            if (rs.next())
+                worked = rs.getBoolean("result");
+
         } catch (SQLException e) {
             Logger.error(e);
         }

src/engine/db/handlers/dbNPCHandler.java

@@ -11,7 +11,6 @@ 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;
@@ -331,12 +330,12 @@ public class dbNPCHandler extends dbHandlerBase {
 
                 // Handle new mobbbase entries
 
-                if (NPCManager._pirateNames.get(mobBase) == null)
-                    NPCManager._pirateNames.putIfAbsent(mobBase, new ArrayList<>());
+                if (NPC._pirateNames.get(mobBase) == null)
+                    NPC._pirateNames.putIfAbsent(mobBase, new ArrayList<>());
 
                 // Insert name into proper arraylist
 
-                NPCManager._pirateNames.get(mobBase).add(pirateName);
+                NPC._pirateNames.get(mobBase).add(pirateName);
             }
 
         } catch (SQLException e) {
@@ -344,7 +343,7 @@ public class dbNPCHandler extends dbHandlerBase {
         }
 
         Logger.info("names read: " + recordsRead + " for "
-                + NPCManager._pirateNames.size() + " mobBases");
+                + NPC._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,7 +12,6 @@ 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;
@@ -72,7 +71,7 @@ public abstract class AbstractDevCmd {
         int targetType = pc.getLastTargetType().ordinal();
         int targetID = pc.getLastTargetID();
         if (targetType == GameObjectType.NPC.ordinal()) {
-            NPC b = NPCManager.getFromCache(targetID);
+            NPC b = NPC.getFromCache(targetID);
             if (b == null) {
                 ChatManager.chatSystemError(pc,
                         "Command Failed. Could not find NPC of ID " + targetID);

src/engine/devcmd/cmds/AddNPCCmd.java

@@ -10,10 +10,12 @@
 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
@@ -75,7 +77,7 @@ public class AddNPCCmd extends AbstractDevCmd {
         } else{
             loc = pc.loc;
         }
-        created = NPCManager.createNPC(name, contractID, loc, guild, zone, (short)level, building);
+        created = NPC.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,8 +11,6 @@ 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.*;
@@ -48,7 +46,7 @@ public class AuditFailedItemsCmd extends AbstractDevCmd {
             String prefix = "";
             String suffix = "";
             String itemName = "";
-            NPC npc = NPCManager.getFromCache(failedItem.getNpcUID());
+            NPC npc = NPC.getFromCache(failedItem.getNpcUID());
 
             if (npc == null) {
                 npcName = "null";
@@ -59,7 +57,7 @@ public class AuditFailedItemsCmd extends AbstractDevCmd {
                     contractName = npc.getContract().getName();
             }
 
-            PlayerCharacter roller = PlayerManager.getFromCache(failedItem.getPlayerID());
+            PlayerCharacter roller = PlayerCharacter.getFromCache(failedItem.getPlayerID());
 
             if (roller == null)
                 playerName = "null";

src/engine/devcmd/cmds/DecachePlayerCmd.java

@@ -12,7 +12,6 @@ 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;
 
@@ -35,8 +34,8 @@ public class DecachePlayerCmd extends AbstractDevCmd {
         int objectUUID = Integer.parseInt(words[0]);
 
         if (DbManager.inCache(Enum.GameObjectType.PlayerCharacter, objectUUID)) {
-            this.setTarget(PlayerManager.getFromCache(objectUUID)); //for logging
-            PlayerManager.getFromCache(objectUUID).removeFromCache();
+            this.setTarget(PlayerCharacter.getFromCache(objectUUID)); //for logging
+            PlayerCharacter.getFromCache(objectUUID).removeFromCache();
         } else {
             this.sendHelp(pc);
         }

src/engine/devcmd/cmds/GotoBoundsCmd.java

@@ -11,7 +11,6 @@ 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;
@@ -90,7 +89,7 @@ public class GotoBoundsCmd extends AbstractDevCmd {
             return;
         }
 
-        PlayerManager.teleport(player, targetLoc);
+        player.teleport(targetLoc);
 
     }
 

src/engine/devcmd/cmds/GotoCmd.java

@@ -12,7 +12,6 @@ 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.*;
@@ -36,7 +35,7 @@ public class GotoCmd extends AbstractDevCmd {
 
         if (target != null && words[0].isEmpty()) {
             AbstractWorldObject targetAgo = (AbstractWorldObject) target;
-            PlayerManager.teleport(pc, targetAgo.getLoc());
+            pc.teleport(targetAgo.getLoc());
             return;
         }
 
@@ -51,7 +50,7 @@ public class GotoCmd extends AbstractDevCmd {
             }
 
             if (loc != null)
-                PlayerManager.teleport(pc, loc);
+                pc.teleport(loc);
 
             return;
         }
@@ -62,7 +61,7 @@ public class GotoCmd extends AbstractDevCmd {
             }
 
             if (loc != null)
-                PlayerManager.teleport(pc, loc);
+                pc.teleport(loc);
 
             return;
         }
@@ -165,7 +164,7 @@ public class GotoCmd extends AbstractDevCmd {
             }
         }
         if (loc != null) {
-            PlayerManager.teleport(pc, loc);
+            pc.teleport(loc);
         }
     }
 

src/engine/devcmd/cmds/GotoObj.java

@@ -12,7 +12,6 @@ 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.*;
 
@@ -85,7 +84,7 @@ public class GotoObj extends AbstractDevCmd {
             return;
         }
 
-        PlayerManager.teleport(player, targetLoc);
+        player.teleport(targetLoc);
 
     }
 

src/engine/devcmd/cmds/InfoCmd.java

@@ -15,11 +15,9 @@ import engine.Enum.GameObjectType;
 import engine.Enum.TargetColor;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.BuildingManager;
-import engine.gameManager.PlayerManager;
 import engine.gameManager.SessionManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
-import engine.server.MBServerStatics;
 import engine.util.StringUtils;
 
 import java.text.DecimalFormat;
@@ -336,7 +334,7 @@ public class InfoCmd extends AbstractDevCmd {
 
                 output += "Altitude : " + targetPC.getLoc().y;
 
-                output += "Swimming : " + PlayerManager.isSwimming(targetPC);
+                output += "Swimming : " + targetPC.isSwimming();
                 output += newline;
                 output += "isMoving : " + targetPC.isMoving();
                 output += newline;
@@ -532,13 +530,6 @@ public class InfoCmd extends AbstractDevCmd {
                 }
 
                 break;
-
-            case Corpse:
-                Corpse corpse = (Corpse)target;
-                Long timeLeft = MBServerStatics.CORPSE_CLEANUP_TIMER_MS - (System.currentTimeMillis() - corpse.spawnedTime);
-                output += "Despawn in: " + timeLeft;
-                output += newline;
-                break;
         }
 
         throwbackInfo(pc, output);

src/engine/devcmd/cmds/JumpCmd.java

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

src/engine/devcmd/cmds/MakeBaneCmd.java

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

src/engine/devcmd/cmds/RemoveObjectCmd.java

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

src/engine/devcmd/cmds/ResetLevelCmd.java

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

src/engine/devcmd/cmds/RotateCmd.java

@@ -14,7 +14,6 @@ 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.*;
@@ -97,7 +96,7 @@ public class RotateCmd extends AbstractDevCmd {
                         // building failed, try npc
                         NPC npc;
                         if (id != 0)
-                            npc = NPCManager.getNPC(id);
+                            npc = NPC.getNPC(id);
                         else
                             npc = getTargetAsNPC(pc);
                         if (npc != null) {
@@ -157,7 +156,7 @@ public class RotateCmd extends AbstractDevCmd {
             // building failed, try npc
             NPC npc;
             if (id != 0)
-                npc = NPCManager.getNPC(id);
+                npc = NPC.getNPC(id);
             else
                 npc = getTargetAsNPC(pc);
             if (npc != null) {

src/engine/devcmd/cmds/SetNpcEquipSetCmd.java

@@ -12,7 +12,6 @@ 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;
@@ -53,7 +52,7 @@ public class SetNpcEquipSetCmd extends AbstractDevCmd {
             boolean complete = false;
 
             while (complete == false) {
-                complete = NPCManager.UpdateEquipSetID(npc, SetNpcEquipSetCmd.lastEquipSetID);
+                complete = NPC.UpdateEquipSetID(npc, SetNpcEquipSetCmd.lastEquipSetID);
 
                 if (!complete) {
                     SetNpcEquipSetCmd.lastEquipSetID++;
@@ -82,7 +81,7 @@ public class SetNpcEquipSetCmd extends AbstractDevCmd {
             boolean complete = false;
 
             while (complete == false) {
-                complete = NPCManager.UpdateEquipSetID(npc, SetNpcEquipSetCmd.lastEquipSetID);
+                complete = NPC.UpdateEquipSetID(npc, SetNpcEquipSetCmd.lastEquipSetID);
 
                 if (!complete) {
                     SetNpcEquipSetCmd.lastEquipSetID--;
@@ -110,7 +109,7 @@ public class SetNpcEquipSetCmd extends AbstractDevCmd {
             this.throwbackError(pc, e.getMessage());
         }
 
-        if (!NPCManager.UpdateEquipSetID(npc, equipSetID)) {
+        if (!NPC.UpdateEquipSetID(npc, equipSetID)) {
             this.throwbackError(pc, "Unable to find Equipset for ID " + equipSetID);
             return;
         }

src/engine/devcmd/cmds/SetNpcMobbaseCmd.java

@@ -12,7 +12,6 @@ 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;
@@ -48,7 +47,7 @@ public class SetNpcMobbaseCmd extends AbstractDevCmd {
             this.throwbackError(player, "Cannot find Mobbase for ID " + mobBaseID);
             return;
         }
-        NPCManager.UpdateRaceID(npc, mobBaseID);
+        NPC.UpdateRaceID(npc, mobBaseID);
 
         WorldGrid.updateObject(npc);
 

src/engine/devcmd/cmds/SetNpcNameCmd.java

@@ -12,7 +12,6 @@ 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;
@@ -44,7 +43,7 @@ public class SetNpcNameCmd extends AbstractDevCmd {
 
         String name = words[0];
 
-        NPCManager.UpdateName(npc, name);
+        NPC.UpdateName(npc, name);
 
         WorldGrid.updateObject(npc);
 

src/engine/devcmd/cmds/SlotTestCmd.java

@@ -13,7 +13,6 @@ 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.*;
 
@@ -57,7 +56,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);
-            PlayerManager.teleport(playerCharacter, slotLocation);
+            playerCharacter.teleport(slotLocation);
             return;
         }
 

src/engine/devcmd/cmds/SummonCmd.java

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

src/engine/devcmd/cmds/aiInfoCmd.java

@@ -11,7 +11,6 @@ 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;
@@ -78,7 +77,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: " + (PlayerManager.getPlayerCharacter(entry.getKey())).getHateValue() + newline;
+            output += "Player ID: " + entry.getKey() + " Hate Value: " + (PlayerCharacter.getPlayerCharacter(entry.getKey())).getHateValue() + newline;
         }
         if (mob.getCombatTarget() != null)
             output += "Current Target: " + mob.getCombatTarget().getName() + newline;

src/engine/gameManager/ArenaManager.java

@@ -49,20 +49,10 @@ public class ArenaManager {
         if (!playerQueue.contains(player)) {
             playerQueue.add(player);
         }
-        for(PlayerCharacter pc : playerQueue){
-            if(pc.equals(player))
-                continue;
-            ChatManager.chatSystemInfo(pc, player.getName() + " has joined the arena que. There are now " + playerQueue.size() + " players queued.");
-        }
     }
 
     public static void leaveQueue(PlayerCharacter player) {
         playerQueue.remove(player);
-        for(PlayerCharacter pc : playerQueue){
-            if(pc.equals(player))
-                continue;
-            ChatManager.chatSystemInfo(pc, player.getName() + " has left the arena que. There are now " + playerQueue.size() + " players queued.");
-        }
     }
 
     private static void createArena() {

src/engine/gameManager/BuildingManager.java

@@ -513,7 +513,7 @@ public enum BuildingManager {
 
         NPC npc = null;
 
-        npc = NPCManager.createNPC(pirateName, NpcID.getObjectUUID(), NpcLoc, null, zone, (short) rank, building);
+        npc = NPC.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 (NPCManager.ISWallArcher(contract)) {
+        if (NPC.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 (NPCManager.ISGuardCaptain(contract.getContractID())) {
+        if (NPC.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 = NPCManager.createNPC(pirateName, contract.getObjectUUID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, (short) rank, building);
+        npc = NPC.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 = NPCManager.SVR_CLOSE_WINDOW;
+            mca.actionType = NPC.SVR_CLOSE_WINDOW;
             mca.setTargetType(building.getObjectType().ordinal());
             mca.setTargetID(building.getObjectUUID());
             origin.sendMsg(mca);

src/engine/gameManager/CombatManager.java

@@ -65,7 +65,7 @@ public enum CombatManager {
         targetType = msg.getTargetType();
 
         if (targetType == GameObjectType.PlayerCharacter.ordinal()) {
-            target = PlayerManager.getFromCache(msg.getTargetID());
+            target = PlayerCharacter.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 = PlayerManager.getFromCache(msg.getTargetID());
+            target = PlayerCharacter.getFromCache(msg.getTargetID());
         else if (targetType == GameObjectType.Building.ordinal())
             target = BuildingManager.getBuildingFromCache(msg.getTargetID());
         else if (targetType == GameObjectType.Mob.ordinal())
@@ -1249,7 +1249,7 @@ public enum CombatManager {
         if (pc == null)
             return;
 
-        if(PlayerManager.isFlying(pc))
+        if(pc.isFlying())
             pc.setSit(false);
         else
             pc.setSit(toggle);

src/engine/gameManager/DbManager.java

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

src/engine/gameManager/GuildManager.java

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

src/engine/gameManager/NPCManager.java

@@ -2,17 +2,14 @@ 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;
@@ -25,8 +22,6 @@ 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();
@@ -291,10 +286,10 @@ public enum NPCManager {
         // If we cannot find name for this mobbase then
         // fallback to human male
 
-        if (_pirateNames.containsKey(mobBaseID))
-            nameList = _pirateNames.get(mobBaseID);
+        if (NPC._pirateNames.containsKey(mobBaseID))
+            nameList = NPC._pirateNames.get(mobBaseID);
         else
-            nameList = _pirateNames.get(2111);
+            nameList = NPC._pirateNames.get(2111);
 
         if (nameList == null) {
             Logger.error("Null name list for 2111!");
@@ -375,384 +370,4 @@ 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(!PlayerManager.isFlying(pc)) //cant be sitting if flying
+        if(!pc.isFlying()) //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(PlayerManager.isFlying(playerCharacter)) {
+        if(playerCharacter.isFlying()) {
             switch(pb.token){
                 case 429005674:
                 case 429505739:
@@ -787,13 +787,10 @@ public enum PowersManager {
         if (playerCharacter == null || msg == null)
             return;
 
-        //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() == 429495514 || msg.getPowerUsedID() == 429407306) && playerCharacter.getRace().getName().toLowerCase().contains("shade")){
+            //msg.setPowerUsedID(407015607);
+            applyPower(playerCharacter,playerCharacter,playerCharacter.loc,429397210,msg.getNumTrains(),false);
+        }
         if(msg.getPowerUsedID() == 429494441) {//wildkins chase
             playerCharacter.removeEffectBySource(EffectSourceType.Root,40,true);
             playerCharacter.removeEffectBySource(EffectSourceType.Snare,40,true);
@@ -1363,7 +1360,7 @@ public enum PowersManager {
         if (pc == null)
             return;
 
-        PlayerCharacter source = PlayerManager.getFromCache(msg.getSourceID());
+        PlayerCharacter source = PlayerCharacter.getFromCache(msg.getSourceID());
         if (source == null)
             return;
 

src/engine/gameManager/StrongholdManager.java

@@ -3,9 +3,11 @@ package engine.gameManager;
 import engine.Enum;
 import engine.InterestManagement.InterestManager;
 import engine.InterestManagement.WorldGrid;
+import engine.math.Vector2f;
 import engine.math.Vector3f;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
+import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
@@ -344,4 +346,38 @@ public class StrongholdManager {
             }
         }
     }
+
+    //=====================================NEW STUFF
+
+    public static void generateMaze(){
+        Zone stronghold = ZoneManager.getZoneByUUID(995);
+        ArrayList<Vector3fImmutable> gridLocs = new ArrayList<>();
+        for(int x = -7; x < 8; x++){
+            for(int z = -7; z < 8; z++) {
+            if((x >= -1 || x <= 1) && (z >= -1 || z <= 1))
+                continue;
+            float offsetX = x * 128;
+            float offsetZ = z * 128;
+            Vector3fImmutable sLoc = stronghold.getLoc();
+            Vector3fImmutable loc = new Vector3fImmutable(offsetX,sLoc.y,offsetZ);
+            gridLocs.add(loc);
+            }
+        }
+        for(Vector3fImmutable loc : gridLocs){
+            createBuilding(stronghold,405600,loc);
+        }
+    }
+
+    public static void createBuilding(Zone zone, int blueprint, Vector3fImmutable offset){
+
+        Vector3fImmutable localLoc = ZoneManager.worldToLocal(offset, zone);
+
+        Building building = DbManager.BuildingQueries.
+                CREATE_BUILDING(
+                        zone.getObjectUUID(), 0, "", 1,
+                        localLoc, 1.0f, 0, Enum.ProtectionState.PROTECTED, 0, 1,
+                        null, blueprint, 0, 0);
+        building.setObjectTypeMask(MBServerStatics.MASK_BUILDING);
+        WorldGrid.addObject(building,zone.getLoc().x + offset.x,zone.getLoc().z + offset.z);
+    }
 }

src/engine/gameManager/TradeManager.java

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

src/engine/jobs/DatabaseUpdateJob.java

@@ -11,7 +11,6 @@ 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;
@@ -40,7 +39,7 @@ public class DatabaseUpdateJob extends AbstractScheduleJob {
 
             switch (this.type) {
                 case "Skills":
-                    PlayerManager.updateSkillsAndPowersToDatabase(pc);
+                    pc.updateSkillsAndPowersToDatabase();
                     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.PlayerManager;
+import engine.gameManager.PowersManager;
 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
-        PlayerManager.teleport(target, source.getLoc());
+        target.teleport(source.getLoc());
     }
 
     @Override

src/engine/jobs/StuckJob.java

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

src/engine/jobs/TeleportJob.java

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

src/engine/mobileAI/MobAI.java

@@ -9,6 +9,7 @@
 package engine.mobileAI;
 
 import engine.Enum;
+import engine.Enum.DispatchChannel;
 import engine.InterestManagement.WorldGrid;
 import engine.gameManager.*;
 import engine.math.Vector3f;
@@ -16,7 +17,9 @@ 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.PowerProjectileMsg;
 import engine.objects.*;
 import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
@@ -82,7 +85,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 = PlayerManager.getFromCache(i);
+                    PlayerCharacter tar = PlayerCharacter.getFromCache(i);
                     if(tar != null && tar.loc.distanceSquared(mob.loc) < 80){
                         PowersManager.applyPower(mob,tar,tar.loc, 111111,40,false);
                     }
@@ -724,7 +727,7 @@ public class MobAI {
             for (Entry playerEntry : loadedPlayers.entrySet()) {
 
                 int playerID = (int) playerEntry.getKey();
-                PlayerCharacter loadedPlayer = PlayerManager.getFromCache(playerID);
+                PlayerCharacter loadedPlayer = PlayerCharacter.getFromCache(playerID);
 
                 //Player is null, let's remove them from the list.
 
@@ -977,7 +980,7 @@ public class MobAI {
                 mob.setCombatTarget(null);
 
                 for (Entry playerEntry : mob.playerAgroMap.entrySet())
-                    PlayerManager.getFromCache((int) playerEntry.getKey()).setHateValue(0);
+                    PlayerCharacter.getFromCache((int) playerEntry.getKey()).setHateValue(0);
                 mob.setCombatTarget(null);
             }
         } catch (Exception e) {
@@ -1215,7 +1218,7 @@ public class MobAI {
             for (Entry playerEntry : loadedPlayers.entrySet()) {
 
                 int playerID = (int) playerEntry.getKey();
-                PlayerCharacter loadedPlayer = PlayerManager.getFromCache(playerID);
+                PlayerCharacter loadedPlayer = PlayerCharacter.getFromCache(playerID);
 
                 //Player is null, let's remove them from the list.
 
@@ -1376,7 +1379,7 @@ public class MobAI {
 
             for (Entry playerEntry : mob.playerAgroMap.entrySet()) {
 
-                PlayerCharacter potentialTarget = PlayerManager.getFromCache((int) playerEntry.getKey());
+                PlayerCharacter potentialTarget = PlayerCharacter.getFromCache((int) playerEntry.getKey());
 
                 if (potentialTarget.equals(mob.getCombatTarget()))
                     continue;

src/engine/net/client/ClientMessagePump.java

@@ -603,19 +603,19 @@ public class ClientMessagePump implements NetMsgHandler {
 
         switch (type) {
             case MBServerStatics.STAT_STR_ID:
-                PlayerManager.addStr(pc, msg.getAmount());
+                pc.addStr(msg.getAmount());
                 break;
             case MBServerStatics.STAT_DEX_ID:
-                PlayerManager.addDex(pc, msg.getAmount());
+                pc.addDex(msg.getAmount());
                 break;
             case MBServerStatics.STAT_CON_ID:
-                PlayerManager.addCon(pc, msg.getAmount());
+                pc.addCon(msg.getAmount());
                 break;
             case MBServerStatics.STAT_INT_ID:
-                PlayerManager.addInt(pc, msg.getAmount());
+                pc.addInt(msg.getAmount());
                 break;
             case MBServerStatics.STAT_SPI_ID:
-                PlayerManager.addSpi(pc, msg.getAmount());
+                pc.addSpi(msg.getAmount());
                 break;
         }
     }
@@ -641,7 +641,7 @@ public class ClientMessagePump implements NetMsgHandler {
         // ResetAfterDeath player
         sourcePlayer.respawnLock.writeLock().lock();
         try {
-            PlayerManager.respawn(sourcePlayer, true, false, true);
+            sourcePlayer.respawn(true, false, true);
 
         } catch (Exception e) {
             Logger.error(e);
@@ -705,7 +705,7 @@ public class ClientMessagePump implements NetMsgHandler {
         switch (targetType) {
             case PlayerCharacter:
 
-                characterTarget = PlayerManager.getFromCache(msg.getTargetID());
+                characterTarget = PlayerCharacter.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 = NPCManager.getFromCache(msg.getTargetID());
+                characterTarget = NPC.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 = PlayerManager.getFromCache(targetID);
+                        tar = PlayerCharacter.getFromCache(targetID);
 
                         if (tar == null)
                             return;
@@ -818,7 +818,7 @@ public class ClientMessagePump implements NetMsgHandler {
                             return;
 
                     } else if (targetType == GameObjectType.NPC.ordinal())
-                        tar = NPCManager.getFromCache(targetID);
+                        tar = NPC.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 = PlayerManager.getFromCache(msg.getTargetID());
+            tar = PlayerCharacter.getFromCache(msg.getTargetID());
         else if (targetType == GameObjectType.NPC.ordinal())
-            tar = NPCManager.getFromCache(msg.getTargetID());
+            tar = NPC.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 = NPCManager.getFromCache(msg.getNPCID());
+        NPC npc = NPC.getFromCache(msg.getNPCID());
 
         if (npc == null)
             return;
@@ -1166,7 +1166,7 @@ public class ClientMessagePump implements NetMsgHandler {
 
         if (con == null)
             return;
-        float bargain = PlayerManager.getBargain(sourcePlayer);
+        float bargain = sourcePlayer.getBargain();
 
         float profit = npc.getBuyPercent(sourcePlayer) + bargain;
 
@@ -1199,7 +1199,7 @@ public class ClientMessagePump implements NetMsgHandler {
         if (itemMan == null)
             return;
 
-        NPC npc = NPCManager.getFromCache(msg.getNPCID());
+        NPC npc = NPC.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 = PlayerManager.getBargain(player);
+                float bargain = player.getBargain();
 
                 float profit = npc.getBuyPercent(player) + bargain;
 
@@ -1363,7 +1363,7 @@ public class ClientMessagePump implements NetMsgHandler {
         if (sourcePlayer == null)
             return;
 
-        NPC npc = NPCManager.getFromCache(msg.getNpcID());
+        NPC npc = NPC.getFromCache(msg.getNpcID());
 
         if (npc == null)
             return;
@@ -1391,7 +1391,7 @@ public class ClientMessagePump implements NetMsgHandler {
                 if (itemMan == null) {
                     return;
                 }
-                NPC npc = NPCManager.getFromCache(msg.getNPCID());
+                NPC npc = NPC.getFromCache(msg.getNPCID());
                 if (npc == null) {
                     return;
                 }
@@ -1422,7 +1422,7 @@ public class ClientMessagePump implements NetMsgHandler {
                                 return;
                             }
                             int cost = me.getMagicValue();
-                            float bargain = PlayerManager.getBargain(sourcePlayer);
+                            float bargain = sourcePlayer.getBargain();
                             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 = PlayerManager.getBargain(sourcePlayer);
+                    float bargain = sourcePlayer.getBargain();
                     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 = NPCManager.getFromCache(msg.getNPCID());
+        NPC npc = NPC.getFromCache(msg.getNPCID());
 
         if (npc == null)
             return;
@@ -1681,12 +1681,15 @@ public class ClientMessagePump implements NetMsgHandler {
                 return;
             }
 
-            int pointsToRepair = max - dur;
-            double damageRatio = (double)1.0d - (toRepair.getDurabilityMax() - toRepair.getDurabilityCurrent()) / toRepair.getDurabilityMax();
-            int modifiedValue = (int)(damageRatio * toRepair.getMagicValue());
-            int costPerPoint = modifiedValue / toRepair.getDurabilityMax();
-            int modifiedRepairCost = (int)(pointsToRepair * costPerPoint)+ npc.getSpecialPrice();
-            int cost = (int)(modifiedRepairCost * 1 + npc.buyPercent) + npc.getSpecialPrice();
+            int cost = ((int)((toRepair.getMagicValue()/max*(max - dur)) + (npc.getSpecialPrice() * npc.buyPercent))) + (int)(npc.getSpecialPrice() * (max - dur));
+
+            //int pointsToRepair = max - dur;
+            //int magicValue = toRepair.getMagicValue();
+            //if(magicValue == 0)
+            //    magicValue = 1;
+            //int calculatedValue = toRepair.getDurabilityMax() * magicValue;
+            //float costPerPoint = (magicValue / max) * ( 1 + npc.buyPercent);
+            //cost = (int)(pointsToRepair * costPerPoint) + npc.getSpecialPrice();
             Building b = (!npc.isStatic()) ? npc.getBuilding() : null;
 
             if (b != null)
@@ -1821,7 +1824,7 @@ public class ClientMessagePump implements NetMsgHandler {
             long type = player.getTimeStamp("LastRecallType");
 
             if (type == 1) { //recall to bind
-                PlayerManager.teleport(player, player.getBindLoc());
+                player.teleport(player.getBindLoc());
                 player.setSafeMode();
             } else { //recall to rg
                 float dist = 9999999999f;
@@ -1842,7 +1845,7 @@ public class ClientMessagePump implements NetMsgHandler {
                 //nearest runegate found. teleport characterTarget
 
                 if (rg != null) {
-                    PlayerManager.teleport(player, rg.getLoc());
+                    player.teleport(rg.getLoc());
                     player.setSafeMode();
                 }
             }

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

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

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

@@ -53,7 +53,7 @@ public class ArcLoginNotifyMsgHandler extends AbstractClientMsgHandler {
             GroupManager.RefreshOthersGroupList(player);
         }
 
-        PlayerManager.setEnteredWorld(player, true);
+        player.setEnteredWorld(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 = NPCManager.getFromCache(msg.getNpcID());
+        vendor = NPC.getFromCache(msg.getNpcID());
 
         if (msg.getMessageType() != 6 && msg.getMessageType() != 7) {
             if (vendor == null)

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

@@ -14,7 +14,6 @@ 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;
@@ -56,7 +55,7 @@ public class BanishUnbanishHandler extends AbstractClientMsgHandler {
 
         boolean success = false;
         Guild guild = source.getGuild();
-        PlayerCharacter realizedTarget = PlayerManager.getFromCache(target);
+        PlayerCharacter realizedTarget = PlayerCharacter.getFromCache(target);
 
         if (realizedTarget != null) {
             // Guild leader can't leave guild. must pass GL or disband
@@ -84,7 +83,7 @@ public class BanishUnbanishHandler extends AbstractClientMsgHandler {
             }
         } else {
             if (guild.getGuildLeaderUUID() != target) {
-                PlayerCharacter toBanish = PlayerManager.getPlayerCharacter(target);
+                PlayerCharacter toBanish = PlayerCharacter.getPlayerCharacter(target);
                 if (toBanish == null)
                     return true;
                 //already added previously.
@@ -111,7 +110,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 = PlayerManager.getFirstName(target);
+            String targetName = PlayerCharacter.getFirstName(target);
             ChatManager.chatGuildInfo(guild,
                     targetName + " has been banished from " + guild.getName() + '.');
             GuildListMsg guildListMsg = new GuildListMsg(guild);

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

@@ -11,7 +11,6 @@ package engine.net.client.handlers;
 
 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,7 +42,7 @@ public class ChangeAltitudeHandler extends AbstractClientMsgHandler {
         if (!AbstractCharacter.CanFly(pc))
             return false;
 
-        if (PlayerManager.isSwimming(pc))
+        if (pc.isSwimming())
             return false;
         if (pc.region != null && !pc.region.isOutside())
             return false;

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

@@ -14,7 +14,6 @@ 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;
@@ -98,9 +97,9 @@ public class ChangeGuildLeaderHandler extends AbstractClientMsgHandler {
         }
 
 
-        PlayerManager.setGuildLeader(targetPlayer, true);
-        PlayerManager.setInnerCouncil(targetPlayer, true);
-        PlayerManager.setFullMember(targetPlayer, true);
+        targetPlayer.setGuildLeader(true);
+        targetPlayer.setInnerCouncil(true);
+        targetPlayer.setFullMember(true);
         targetPlayer.incVer();
         targetName = targetPlayer.getFirstName();
         updateTarget = true;
@@ -114,9 +113,9 @@ public class ChangeGuildLeaderHandler extends AbstractClientMsgHandler {
 
 
         //updateOldGuildLeader
-        PlayerManager.setInnerCouncil(sourcePlayer, true);
-        PlayerManager.setFullMember(sourcePlayer, true);
-        PlayerManager.setGuildLeader(sourcePlayer, false);
+        sourcePlayer.setInnerCouncil(true);
+        sourcePlayer.setFullMember(true);
+        sourcePlayer.setGuildLeader(false);
         sourcePlayer.incVer();
 
         GuildInfoMsg guildInfoMsg = new GuildInfoMsg(sourcePlayer, sourcePlayer.getGuild(), 2);

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

@@ -14,7 +14,6 @@ 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;
@@ -64,14 +63,14 @@ public class ChangeRankHandler extends AbstractClientMsgHandler {
             Enum.GuildType t = Enum.GuildType.getGuildTypeFromInt(sourcePlayer.getGuild().getCharter());
 
             if (targetPlayer != null) {
-                PlayerManager.setGuildTitle(targetPlayer, msg.getNewRank());
+                targetPlayer.setGuildTitle(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 = PlayerManager.getFirstName(msg.getPlayerUUID());
+                targetName = PlayerCharacter.getFirstName(msg.getPlayerUUID());
                 isMale = true;
             }
 
@@ -99,7 +98,7 @@ public class ChangeRankHandler extends AbstractClientMsgHandler {
             taxUpdate = (updateMask & 1) > 0;
 
             if (targetName == null && updateMask > 0)
-                targetName = PlayerManager.getFirstName(msg.getPlayerUUID());
+                targetName = PlayerCharacter.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());
@@ -107,16 +106,16 @@ public class ChangeRankHandler extends AbstractClientMsgHandler {
 
             //This logic branch only executes if targetPlayer has passed a null check...
             if (icUpdate) {
-                PlayerManager.setInnerCouncil(targetPlayer, msg.getIc() > 0);
-                PlayerManager.setFullMember(targetPlayer, true);
+                targetPlayer.setInnerCouncil(msg.getIc() > 0);
+                targetPlayer.setFullMember(true);
                 targetPlayer.incVer();
             }
 
             if (recruitUpdate)
-                PlayerManager.setRecruiter(targetPlayer, msg.getRec() > 0);
+                targetPlayer.setRecruiter(msg.getRec() > 0);
 
             if (taxUpdate)
-                PlayerManager.setTaxCollector(targetPlayer, msg.getTax() > 0);
+                targetPlayer.setTaxCollector(msg.getTax() > 0);
 
             if (targetName == null)
                 targetName = targetPlayer.getFirstName();

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

@@ -17,7 +17,6 @@ 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;
@@ -99,8 +98,8 @@ public class DisbandGuildHandler extends AbstractClientMsgHandler {
 
         //Save Guild data
 
-        PlayerManager.setGuildLeader(player, false);
-        PlayerManager.setInnerCouncil(player, false);
+        player.setGuildLeader(false);
+        player.setInnerCouncil(false);
         guild.setGuildLeaderUUID(0);
         guild.setNation(null);
 

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

@@ -11,7 +11,6 @@ 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;
@@ -61,7 +60,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 = PlayerManager.getFromCache(msg.getUnknown03());
+            PlayerCharacter pc = PlayerCharacter.getFromCache(msg.getUnknown03());
 
             if (pc != null) {
                 dispatch = Dispatch.borrow(player, new GuildListMsg(pc));

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

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

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

@@ -11,7 +11,6 @@ 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;
@@ -44,7 +43,7 @@ public class GuildInfoHandler extends AbstractClientMsgHandler {
         } else if (msg.getMsgType() == 5) {
 
             if (msg.getObjectType() == GameObjectType.PlayerCharacter.ordinal()) {
-                PlayerCharacter pc = PlayerManager.getPlayerCharacter(msg.getObjectID());
+                PlayerCharacter pc = PlayerCharacter.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,7 +13,6 @@ 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;
@@ -53,7 +52,7 @@ public class HirelingServiceMsgHandler extends AbstractClientMsgHandler {
                 if (building == null)
                     return true;
 
-                NPC npc = NPCManager.getFromCache(msg.npcID);
+                NPC npc = NPC.getFromCache(msg.npcID);
 
                 if (npc == null)
                     return true;

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

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

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

@@ -417,7 +417,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                             if (!toCommand.isSiege())
                                 return true;
 
-                            if (PlayerManager.commandSiegeMinion(player, toCommand)) {
+                            if (player.commandSiegeMinion(toCommand)) {
                                 itemMan.consume(item);
                             }
                             break;

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

@@ -4,7 +4,9 @@ import engine.Enum;
 import engine.Enum.DispatchChannel;
 import engine.Enum.GameObjectType;
 import engine.exception.MsgSendException;
-import engine.gameManager.*;
+import engine.gameManager.BuildingManager;
+import engine.gameManager.DbManager;
+import engine.gameManager.SessionManager;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -69,9 +71,9 @@ public class OpenFriendsCondemnListMsgHandler extends AbstractClientMsgHandler {
                 }
                 AbstractCharacter toAdd = null;
                 if (msg.getPlayerType() == GameObjectType.PlayerCharacter.ordinal())
-                    toAdd = PlayerManager.getFromCache(msg.getPlayerID());
+                    toAdd = PlayerCharacter.getFromCache(msg.getPlayerID());
                 else if (msg.getPlayerType() == GameObjectType.NPC.ordinal())
-                    toAdd = NPCManager.getFromCache(msg.getPlayerID());
+                    toAdd = NPC.getFromCache(msg.getPlayerID());
                 else if (msg.getPlayerType() == GameObjectType.Mob.ordinal())
                     toAdd = Mob.getFromCache(msg.getPlayerID());
                 else {
@@ -212,7 +214,7 @@ public class OpenFriendsCondemnListMsgHandler extends AbstractClientMsgHandler {
                         if (msg.getPlayerType() != GameObjectType.PlayerCharacter.ordinal())
                             return true;
 
-                        PlayerCharacter playerCharacter = PlayerManager.getFromCache(msg.getPlayerID());
+                        PlayerCharacter playerCharacter = PlayerCharacter.getFromCache(msg.getPlayerID());
 
                         if (playerCharacter == null)
                             return true;
@@ -301,7 +303,7 @@ public class OpenFriendsCondemnListMsgHandler extends AbstractClientMsgHandler {
                 //Check to see if the invited is already on the friends list.
                 switch (msg.getInviteType()) {
                     case 7:
-                        playerCharacter = PlayerManager.getFromCache(msg.getPlayerID());
+                        playerCharacter = PlayerCharacter.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 = NPCManager.SVR_CLOSE_WINDOW;
+        mca.actionType = NPC.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 = NPCManager.getFromCache(msg.getNpcUUID());
+        npc = NPC.getFromCache(msg.getNpcUUID());
 
         if (npc == null)
             return;
@@ -120,7 +120,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         if (building == null)
             return;
 
-        NPCProfits profit = NPCManager.GetNPCProfits(npc);
+        NPCProfits profit = NPC.GetNPCProfits(npc);
 
         if (profit == null)
             return;
@@ -155,7 +155,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         if (player == null)
             return;
 
-        npc = NPCManager.getFromCache(orderNPCMsg.getNpcUUID());
+        npc = NPC.getFromCache(orderNPCMsg.getNpcUUID());
 
         if (npc == null)
             return;
@@ -165,7 +165,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         if (building == null)
             return;
 
-        NPCProfits profit = NPCManager.GetNPCProfits(npc);
+        NPCProfits profit = NPC.GetNPCProfits(npc);
 
         if (profit == null)
             return;
@@ -428,7 +428,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
 
         if (orderNPCMsg.getObjectType() == GameObjectType.NPC.ordinal()) {
 
-            npc = NPCManager.getFromCache(orderNPCMsg.getNpcUUID());
+            npc = NPC.getFromCache(orderNPCMsg.getNpcUUID());
 
             if (npc == null)
                 return true;

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

@@ -8,7 +8,6 @@ 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;
@@ -58,7 +57,7 @@ public class RequestEnterWorldHandler extends AbstractClientMsgHandler {
             return true;
         }
 
-        PlayerManager.setEnteredWorld(player, false);
+        player.setEnteredWorld(false);
 
         Account acc = SessionManager.getAccount(origin);
 
@@ -119,7 +118,7 @@ public class RequestEnterWorldHandler extends AbstractClientMsgHandler {
         try {
             if (!player.isAlive()) {
                 Logger.info("respawning player on enter world.");
-                PlayerManager.respawn(player, true, true, true);
+                player.respawn(true, true, true);
             }
 
         } catch (Exception e) {

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

@@ -12,7 +12,6 @@ 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;
@@ -64,7 +63,7 @@ public class SwearInHandler extends AbstractClientMsgHandler {
         }
 
         // Swear target in and send message to guild
-        PlayerManager.setFullMember(target, true);
+        target.setFullMember(true);
         target.incVer();
 
         ChatManager.chatGuildInfo(source, target.getFirstName() + " has been sworn in as a full member!");

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

@@ -4,7 +4,6 @@ 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;
@@ -36,7 +35,7 @@ public class TransferAssetMsgHandler extends AbstractClientMsgHandler {
         int TargetType = transferAssetMsg.getTargetType();  //ToDue later
 
         Building building = BuildingManager.getBuildingFromCache(Buildingid);
-        PlayerCharacter newOwner = PlayerManager.getFromCache(TargetID);
+        PlayerCharacter newOwner = PlayerCharacter.getFromCache(TargetID);
         PlayerCharacter player = origin.getPlayerCharacter();
 
         if (player == null || building == null || newOwner == null)

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

@@ -12,7 +12,6 @@ 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;
@@ -147,8 +146,6 @@ public class ApplyRuneMsg extends ClientNetMsg {
                     valid = true;
                 if(runeID == 3035 && baseClassID == 2501)
                     valid = true;
-                if(runeID == 3028 && baseClassID == 2501 && playerCharacter.getRace().getName().contains("Irekei"))
-                    valid = true;
                 if (!valid) {
                     return false;
                 }
@@ -382,23 +379,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) {
-                    PlayerManager.addStr(playerCharacter, dif);
+                    playerCharacter.addStr(dif);
                 }
                 dif = dexTotal - (int) playerCharacter.statDexBase;
                 if (dif > 0 && dexTotal < (int) playerCharacter.statDexMax) {
-                    PlayerManager.addDex(playerCharacter, dif);
+                    playerCharacter.addDex(dif);
                 }
                 dif = conTotal - (int) playerCharacter.statConBase;
                 if (dif > 0 && conTotal < (int) playerCharacter.statConMax) {
-                    PlayerManager.addCon(playerCharacter, dif);
+                    playerCharacter.addCon(dif);
                 }
                 dif = intTotal - (int) playerCharacter.statIntBase;
                 if (dif > 0 && intTotal < (int) playerCharacter.statIntMax) {
-                    PlayerManager.addInt(playerCharacter, dif);
+                    playerCharacter.addInt(dif);
                 }
                 dif = spiTotal - (int) playerCharacter.statSpiBase;
                 if (dif > 0 && spiTotal < (int) playerCharacter.statSpiMax) {
-                    PlayerManager.addSpi(playerCharacter, dif);
+                    playerCharacter.addSpi(dif);
                 }
                 // recalculate all bonuses/formulas/skills/powers
                 playerCharacter.recalculate();

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

@@ -13,8 +13,6 @@ 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;
@@ -104,12 +102,12 @@ public class ArcViewAssetTransactionsMsg extends ClientNetMsg {
 
                     break;
                 case PlayerCharacter:
-                    PlayerCharacter pc = PlayerManager.getPlayerCharacter(transaction.getTargetUUID());
+                    PlayerCharacter pc = PlayerCharacter.getPlayerCharacter(transaction.getTargetUUID());
                     if (pc != null)
                         name = pc.getCombinedName();
                     break;
                 case NPC:
-                    NPC npc = NPCManager.getFromCache(transaction.getTargetUUID());
+                    NPC npc = NPC.getFromCache(transaction.getTargetUUID());
                     if (npc != null) {
 
                         if (npc.getBuilding() != null)

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

@@ -11,8 +11,6 @@ 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;
@@ -93,7 +91,7 @@ public class BuyFromNPCWindowMsg extends ClientNetMsg {
 
         float sellPercent = 1;
 
-        NPC npc = NPCManager.getFromCache(npcID);
+        NPC npc = NPC.getFromCache(npcID);
         CharacterItemManager man = null;
         ArrayList<Item> inventory = null;
         ArrayList<MobEquipment> sellInventory = null;
@@ -102,7 +100,7 @@ public class BuyFromNPCWindowMsg extends ClientNetMsg {
             man = npc.getCharItemManager();
             Contract contract = npc.getContract();
             if (player != null) {
-                float barget = PlayerManager.getBargain(player);
+                float barget = player.getBargain();
                 float profit = npc.getSellPercent(player) - barget;
 
                 if (profit < 1)

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

@@ -12,7 +12,6 @@ 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;
@@ -82,7 +81,7 @@ public class IgnoreMsg extends ClientNetMsg {
         }
 
         //FIX THIS, USE OUR CACHE!
-        PlayerCharacter pcToIgnore = PlayerManager.getByFirstName(nameToIgnore);
+        PlayerCharacter pcToIgnore = PlayerCharacter.getByFirstName(nameToIgnore);
 
         if (pcSource == null) {
             return;
@@ -115,11 +114,11 @@ public class IgnoreMsg extends ClientNetMsg {
             pcSource.removeIgnoredPlayer(pcToIgnore.getAccount());
             ChatManager.chatSystemInfo(pcSource, "Character " + fn + " is no longer ignored.");
         } else {
-            if (!PlayerManager.isIgnorable()) {
+            if (!PlayerCharacter.isIgnorable()) {
                 ChatManager.chatSystemError(pcSource, "This character cannot be ignored.");
                 return;
             }
-            if (PlayerManager.isIgnoreListFull()) {
+            if (PlayerCharacter.isIgnoreListFull()) {
                 ChatManager.chatSystemError(pcSource, "Your ignore list is already full.");
                 return;
             }

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

@@ -11,7 +11,6 @@ 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;
@@ -292,7 +291,7 @@ public class ItemProductionMsg extends ClientNetMsg {
                     writer.putInt(0);
                 }
 
-                NPC vendor = NPCManager.getFromCache(this.npcUUID);
+                NPC vendor = NPC.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 = NPCManager.getFromCache(this.targetID);
+                    npc = NPC.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 = NPCManager.GetNPCProfits(npc);
+                    NPCProfits profit = NPC.GetNPCProfits(npc);
 
                     if (profit == null)
                         profit = NPCProfits.defaultProfits;
@@ -598,7 +598,7 @@ public class ManageNPCMsg extends ClientNetMsg {
 
                         }
 
-                        if (NPCManager.ISGuardCaptain(mobA.getContract().getContractID()) == false)
+                        if (NPC.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,8 +11,6 @@ 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;
@@ -621,7 +619,7 @@ public class OpenFriendsCondemnListMsg extends ClientNetMsg {
         writer.putInt(listSize);
 
         for (BuildingFriends friend : this.friends.values()) {
-            pc = PlayerManager.getFromCache(friend.getPlayerUID());
+            pc = PlayerCharacter.getFromCache(friend.getPlayerUID());
             guild = Guild.getGuild(friend.getGuildUID());
             if (friend.getFriendType() == 7) {
                 if (pc != null)
@@ -720,9 +718,9 @@ public class OpenFriendsCondemnListMsg extends ClientNetMsg {
             AbstractCharacter heraldryCharacter = null;
             int characterType = heraldryMap.get(characterID);
             if (characterType == GameObjectType.PlayerCharacter.ordinal())
-                heraldryCharacter = PlayerManager.getFromCache(characterID);
+                heraldryCharacter = PlayerCharacter.getFromCache(characterID);
             else if (characterType == GameObjectType.NPC.ordinal())
-                heraldryCharacter = NPCManager.getFromCache(characterID);
+                heraldryCharacter = NPC.getFromCache(characterID);
             else if (characterType == GameObjectType.Mob.ordinal())
                 heraldryCharacter = Mob.getFromCache(characterID);
 

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

@@ -10,8 +10,6 @@
 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;
@@ -64,7 +62,7 @@ public class RefineMsg extends ClientNetMsg {
         PlayerCharacter pc = SessionManager.getPlayerCharacter(origin);
         if (pc == null)
             return;
-        NPC npc = NPCManager.getFromCache(msg.npcID);
+        NPC npc = NPC.getFromCache(msg.npcID);
         if (npc == null)
             return;
         int type = msg.type;
@@ -162,15 +160,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 PlayerManager.refineStr(pc);
+            return pc.refineStr();
         if (token == MBServerStatics.STAT_DEX_ID)
-            return PlayerManager.refineDex(pc);
+            return pc.refineDex();
         if (token == MBServerStatics.STAT_CON_ID)
-            return PlayerManager.refineCon(pc);
+            return pc.refineCon();
         if (token == MBServerStatics.STAT_INT_ID)
-            return PlayerManager.refineInt(pc, msg);
+            return pc.refineInt(msg);
         if (token == MBServerStatics.STAT_SPI_ID)
-            return PlayerManager.refineSpi(pc);
+            return pc.refineSpi();
         return false;
     }
 

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

@@ -11,7 +11,6 @@ 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;
@@ -91,7 +90,7 @@ public class SendOwnPlayerMsg extends ClientNetMsg {
         }
         writer.putVector3f(ch.getLoc());
         try {
-            PlayerManager.serializeForClientMsgFull(this.ch, writer);
+            PlayerCharacter.serializeForClientMsgFull(this.ch, writer);
         } catch (SerializationException e) {
             Logger.error(e);
         }

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

@@ -11,7 +11,6 @@ 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;
@@ -65,7 +64,7 @@ public class TerritoryChangeMessage extends ClientNetMsg {
         writer.putString(realm.getRealmName());
         if (this.realmOwner != null) {
             writer.putString(this.realmOwner.getCombinedName());
-            writer.putInt(PlayerManager.GetPlayerRealmTitle(this.realmOwner));
+            writer.putInt(PlayerCharacter.GetPlayerRealmTitle(this.realmOwner));
             writer.putInt(1);
             writer.put((byte) 1);
             writer.put((byte) 1);

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

@@ -10,8 +10,6 @@
 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;
@@ -91,7 +89,7 @@ public class TrackWindowMsg extends ClientNetMsg {
         for (int i = 0; i < size; i++) {
             int objectType = reader.getInt();
             int objectID = reader.getInt();
-            this.source = PlayerManager.getFromCache(objectID);
+            this.source = PlayerCharacter.getFromCache(objectID);
             reader.getString(); //name
             reader.get(); //always 00?
             reader.getInt(); //guildObjectType
@@ -108,9 +106,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 = PlayerManager.getFromCache(objectID);
+                ac = PlayerCharacter.getFromCache(objectID);
             else if (objectType == GameObjectType.NPC.ordinal())
-                ac = NPCManager.getFromCache(objectID);
+                ac = NPC.getFromCache(objectID);
             else if (objectType == GameObjectType.Mob.ordinal())
                 ac = Mob.getFromCache(objectID);
 

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

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

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

@@ -12,7 +12,10 @@ package engine.net.client.msg;
 import engine.Enum.DispatchChannel;
 import engine.Enum.GuildHistoryType;
 import engine.exception.MsgSendException;
-import engine.gameManager.*;
+import engine.gameManager.BuildingManager;
+import engine.gameManager.DbManager;
+import engine.gameManager.GuildManager;
+import engine.gameManager.SessionManager;
 import engine.math.Vector3fImmutable;
 import engine.net.*;
 import engine.net.client.ClientConnection;
@@ -80,7 +83,7 @@ public class VendorDialogMsg extends ClientNetMsg {
         }
 
         // Get NPC that player is talking to
-        NPC npc = NPCManager.getFromCache(msg.vendorObjectID);
+        NPC npc = NPC.getFromCache(msg.vendorObjectID);
         int npcClassID;
 
         if (npc == null)
@@ -434,7 +437,7 @@ public class VendorDialogMsg extends ClientNetMsg {
         if (level >= minLevel && level <= maxLevel) {
             if (useSquare)
                 loc = getSquare(loc);
-            PlayerManager.teleport(pc, loc);
+            pc.teleport(loc);
             pc.setSafeMode();
             // PowersManager.applyPower(pc, pc, new Vector3f(0f,
             // 0f, 0f), -1661758934, 40, false);
@@ -460,7 +463,7 @@ public class VendorDialogMsg extends ClientNetMsg {
                 // teleport player
                 if (useSquare)
                     loc = getSquare(loc);
-                PlayerManager.teleport(pc, loc);
+                pc.teleport(loc);
                 pc.setSafeMode();
                 // PowersManager.applyPower(pc, pc, new
                 // Vector3f(0f, 0f, 0f), -1661758934, 40, false);
@@ -468,10 +471,10 @@ public class VendorDialogMsg extends ClientNetMsg {
                 // join guild
                 GuildManager.joinGuild(pc, guild, GuildHistoryType.JOIN);
 
-                PlayerManager.resetGuildStatuses(pc);
+                pc.resetGuildStatuses();
 
                 if (guild.isNPCGuild())
-                    PlayerManager.setFullMember(pc, true);
+                    pc.setFullMember(true);
 
                 if (useSquare)
                     loc = loc.add(30, 0, 0);
@@ -480,7 +483,7 @@ public class VendorDialogMsg extends ClientNetMsg {
                 // guild not found, just teleport
                 if (useSquare)
                     loc = getSquare(loc);
-                PlayerManager.teleport(pc, loc);
+                pc.teleport(loc);
                 pc.setSafeMode();
                 // PowersManager.applyPower(pc, pc, new
                 // Vector3f(0f, 0f, 0f), -1661758934, 50, false);

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

@@ -10,7 +10,6 @@
 package engine.net.client.msg;
 
 import engine.Enum;
-import engine.gameManager.PlayerManager;
 import engine.gameManager.SessionManager;
 import engine.net.*;
 import engine.net.client.ClientConnection;
@@ -234,8 +233,8 @@ public class WhoResponseMsg extends ClientNetMsg {
             writer.putInt(pc.getObjectUUID());
             writer.putString(pc.getFirstName());
             writer.putString(pc.getLastName());
-            writer.putInt(PlayerManager.getRaceToken(pc));
-            writer.putInt(PlayerManager.getClassToken(pc));
+            writer.putInt(pc.getRaceToken());
+            writer.putInt(pc.getClassToken());
             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,8 +11,6 @@ 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;
@@ -195,7 +193,7 @@ class GuildInfoMessageType2 extends GuildInfoMessageType {
             writer.putString(g.getName());
 
             if (this.objectType == GameObjectType.PlayerCharacter.ordinal()) {
-                PlayerCharacter pc = PlayerManager.getFromCache(this.objectID);
+                PlayerCharacter pc = PlayerCharacter.getFromCache(this.objectID);
 
                 if (pc != null) {
                     writer.putInt(GuildStatusController.getRank(pc.getGuildStatus()));
@@ -256,7 +254,7 @@ class GuildInfoMessageType4 extends GuildInfoMessageType {
         writer.putInt(0);
         writer.putInt(0);
         writer.putInt(0);
-        PlayerCharacter pc = PlayerManager.getFromCache(this.objectID);
+        PlayerCharacter pc = PlayerCharacter.getFromCache(this.objectID);
         if (this.g == null || pc == null) {
             writer.putInt(0);
             writer.putInt(0);
@@ -296,11 +294,11 @@ class GuildInfoMessageType4 extends GuildInfoMessageType {
         AbstractCharacter guildLeader;
         String guildLeaderName = "";
         if (g.isNPCGuild()) {
-            guildLeader = NPCManager.getFromCache(g.getGuildLeaderUUID());
+            guildLeader = NPC.getFromCache(g.getGuildLeaderUUID());
             if (guildLeader != null)
                 guildLeaderName = guildLeader.getName();
         } else {
-            guildLeader = PlayerManager.getFromCache(g.getGuildLeaderUUID());
+            guildLeader = PlayerCharacter.getFromCache(g.getGuildLeaderUUID());
             if (guildLeader != null)
                 guildLeaderName = ((PlayerCharacter) guildLeader).getCombinedName();
         }

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

@@ -11,7 +11,6 @@ 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;
@@ -205,7 +204,7 @@ class GuildListMessageType2 extends GuildListMessageType {
         writer.putInt(GuildStatusController.getTitle(pc.getGuildStatus()));    //Title Maybe?
         writer.putInt(GuildStatusController.getRank(pc.getGuildStatus()));    //Rank?
 
-        writer.putInt(PlayerManager.getRaceToken(pc));    //race token
+        writer.putInt(pc.getRaceToken());    //race token
         writer.putInt(pc.getBaseClassToken());    //class token
 
         writer.putInt(2);    //PAD

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

@@ -11,7 +11,6 @@ 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;
@@ -163,9 +162,9 @@ public class CharSelectScreenMsg extends ClientNetMsg {
         for (int i = 0; i < this.numChars; ++i) {
             try {
                 if (!fromCommit)
-                    PlayerManager.serializeForClientMsgLogin(this.chars.get(i), writer);
+                    PlayerCharacter.serializeForClientMsgLogin(this.chars.get(i), writer);
                 else
-                    PlayerManager.serializeForClientMsgCommit(this.chars.get(i), writer);
+                    PlayerCharacter.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

@@ -14,7 +14,10 @@ import engine.Enum.*;
 import engine.InterestManagement.InterestManager;
 import engine.InterestManagement.WorldGrid;
 import engine.exception.SerializationException;
-import engine.gameManager.*;
+import engine.gameManager.CombatManager;
+import engine.gameManager.ConfigManager;
+import engine.gameManager.MovementManager;
+import engine.gameManager.PowersManager;
 import engine.job.AbstractJob;
 import engine.job.JobContainer;
 import engine.job.JobScheduler;
@@ -57,7 +60,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     protected short statIntCurrent;
     protected short statSpiCurrent;
     protected short unusedStatPoints;
-    public int exp;
+    protected int exp;
     public int buildingUUID;
     public Building building;
 
@@ -67,8 +70,8 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     public int guildUUID;
     public Guild guild;
     protected byte runningTrains;
-    public ConcurrentHashMap<Integer, CharacterPower> powers;
-    public ConcurrentHashMap<String, CharacterSkill> skills;
+    protected ConcurrentHashMap<Integer, CharacterPower> powers;
+    protected ConcurrentHashMap<String, CharacterSkill> skills;
     // Variables NOT to be stored in db
     protected boolean sit = false;
     protected boolean walkMode;
@@ -80,11 +83,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;
-    public AtomicFloat stamina = new AtomicFloat();
+    protected AtomicFloat stamina = new AtomicFloat();
     protected float staminaMax;
-    public AtomicFloat mana = new AtomicFloat();
+    protected AtomicFloat mana = new AtomicFloat();
     protected float manaMax;                                            // Health/Mana/Stamina
-    public AtomicBoolean isAlive = new AtomicBoolean(true);
+    protected AtomicBoolean isAlive = new AtomicBoolean(true);
     protected Resists resists = new Resists("Genric");
     protected ConcurrentHashMap<String, JobContainer> timers;
     protected ConcurrentHashMap<String, Long> timestamps;
@@ -102,7 +105,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;
-    public PlayerBonuses bonuses;
+    protected PlayerBonuses bonuses;
     protected JobContainer lastChant;
     protected boolean isCasting = false;
     protected long lastSetLocUpdate = 0L;
@@ -363,13 +366,13 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
 
         switch (abstractCharacter.getObjectType()) {
             case PlayerCharacter:
-                PlayerManager.serializePlayerForClientMsgOtherPlayer((PlayerCharacter) abstractCharacter, writer, asciiLastName);
+                PlayerCharacter.serializePlayerForClientMsgOtherPlayer((PlayerCharacter) abstractCharacter, writer, asciiLastName);
                 break;
             case Mob:
                 Mob.serializeMobForClientMsgOtherPlayer((Mob) abstractCharacter, writer);
                 break;
             case NPC:
-                NPCManager.serializeNpcForClientMsgOtherPlayer((NPC) abstractCharacter, writer, asciiLastName);
+                NPC.serializeNpcForClientMsgOtherPlayer((NPC) abstractCharacter, writer, asciiLastName);
                 break;
         }
 
@@ -445,7 +448,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
                 playerCharacter.calculateItemBonuses();
 
                 //recalculate formulas
-                PlayerManager.recalculatePlayerStatsOnLoad(playerCharacter);
+                PlayerCharacter.recalculatePlayerStatsOnLoad(playerCharacter);
 
             } catch (Exception e) {
                 Logger.error(e);
@@ -746,7 +749,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         }
 
         if (this.getObjectType().equals(GameObjectType.PlayerCharacter))
-            if (PlayerManager.isLastSwimming(((PlayerCharacter) this)))
+            if (((PlayerCharacter) this).isLastSwimming())
                 return 1; //swimming
 
         return 2; //ground
@@ -761,11 +764,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     public abstract Vector3fImmutable getBindLoc();
 
     public final void setBindLoc(final Vector3fImmutable value) {
-        if(this.getObjectType().equals(GameObjectType.PlayerCharacter) && this.guild.getNation().equals(Guild.getErrantGuild())){
-            this.bindLoc = Vector3fImmutable.getRandomPointOnCircle(BuildingManager.getBuilding(27977).loc,20f);
-        }else {
-            this.bindLoc = value;
-        }
+        this.bindLoc = value;
     }
 
     public final Vector3fImmutable getFaceDir() {
@@ -1559,15 +1558,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
             Effect eff = this.effects.get(s);
             if (eff == null)
                 continue;
-
-            Boolean override = false;
-            if(this.getObjectType().equals(GameObjectType.PlayerCharacter)) {
-                PlayerCharacter pc = (PlayerCharacter) this;
-                if (eff.getEffectsBase().getIDString().equals("INVIS-B") && s.equals("Invisible") && pc.getRace().getName().contains("Shade"))
-                    override = true;
-            }
-
-            if (!override && eff.cancelOnMove() && eff.cancel()) {
+            if (eff.cancelOnMove() && eff.cancel()) {
                 //System.out.println("canceling on Move");
                 eff.cancelJob();
                 this.effects.remove(s);
@@ -1707,7 +1698,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
 
                 if (CanFly(player) == false &&
                         player.getMovementState().equals(MovementState.FLYING))
-                    PlayerManager.GroundPlayer(player);
+                    PlayerCharacter.GroundPlayer(player);
             }
 
         } catch (Exception e) {

src/engine/objects/AbstractGameObject.java

@@ -12,8 +12,6 @@ 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;
@@ -109,10 +107,10 @@ public abstract class AbstractGameObject {
 
         switch (objectType) {
             case PlayerCharacter:
-                return PlayerManager.getPlayerCharacter(tableID);
+                return PlayerCharacter.getPlayerCharacter(tableID);
 
             case NPC:
-                return NPCManager.getNPC(tableID);
+                return NPC.getNPC(tableID);
 
             case Mob:
                 return Mob.getMob(tableID);

src/engine/objects/AbstractWorldObject.java

@@ -15,7 +15,6 @@ 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;
@@ -40,7 +39,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 public abstract class AbstractWorldObject extends AbstractGameObject {
 
-    public final ReadWriteLock locationLock = new ReentrantReadWriteLock(true);
+    protected 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);
@@ -50,7 +49,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);
-    public AtomicFloat health = new AtomicFloat();
+    protected AtomicFloat health = new AtomicFloat();
     protected boolean load = true;
     protected GridObjectType gridObjectType;
     protected float altitude = 0;
@@ -151,7 +150,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
         Regions region = null;
 
         if (worldObject.getObjectType().equals(GameObjectType.PlayerCharacter))
-            if (PlayerManager.isFlying(((PlayerCharacter) worldObject)))
+            if (((PlayerCharacter) worldObject).isFlying())
                 return null;
         //Find building
         for (AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(worldObject.getLoc(), MBServerStatics.STRUCTURE_LOAD_RANGE, MBServerStatics.MASK_BUILDING)) {
@@ -272,7 +271,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
             if (this.getObjectType().equals(GameObjectType.PlayerCharacter))
                 if (name.equals("Flight")) {
                     ((PlayerCharacter) this).update(false);
-                    PlayerManager.GroundPlayer((PlayerCharacter) this);
+                    PlayerCharacter.GroundPlayer((PlayerCharacter) this);
                 }
         }
         applyAllBonuses();
@@ -387,7 +386,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
                         //ground player
                         if (this.getObjectType().equals(GameObjectType.PlayerCharacter)) {
                             ((PlayerCharacter) this).update(false);
-                            PlayerManager.GroundPlayer((PlayerCharacter) this);
+                            PlayerCharacter.GroundPlayer((PlayerCharacter) this);
                         }
                     }
                 } else {
@@ -416,7 +415,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
                     //ground player
                     if (this.getObjectType().equals(GameObjectType.PlayerCharacter)) {
                         ((PlayerCharacter) this).update(false);
-                        PlayerManager.GroundPlayer((PlayerCharacter) this);
+                        PlayerCharacter.GroundPlayer((PlayerCharacter) this);
                     }
                 }
 

src/engine/objects/Account.java

@@ -14,7 +14,6 @@ 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;
@@ -164,7 +163,7 @@ public class Account extends AbstractGameObject {
                 ArrayList<PlayerCharacter> playerList = DbManager.PlayerCharacterQueries.GET_CHARACTERS_FOR_ACCOUNT(this.getObjectUUID());
 
                 for (PlayerCharacter player : playerList) {
-                    PlayerManager.initializePlayer(player);
+                    PlayerCharacter.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);
-        PlayerManager.teleport(player, movePlayerOutsideStone);
+        player.teleport(movePlayerOutsideStone);
 
         // Notify players
 
@@ -303,7 +303,7 @@ public final class Bane {
         if(commanderuuid == 0) {
             //add bane commander NPC
             int contractID = 1502042;
-            baneCommander = NPCManager.createNPC("Bane Commander", contractID, spawnLoc, bane.getCity().getGuild(), ZoneManager.findSmallestZone(bane.getStone().loc), (short) 70, bane.getStone());
+            baneCommander = NPC.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 = NPCManager.getNPC(commanderuuid);
+            baneCommander = NPC.getNPC(commanderuuid);
         }
         //try {
         //    NPCManager.slotCharacterInBuilding(baneCommander);
@@ -734,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 = PlayerManager.getPlayerCharacter(uuid);
+            PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
             if(player == null)
                 continue;
             Guild playerNation = player.guild.getNation();
@@ -749,7 +749,7 @@ public final class Bane {
         int attackerSize = 0;
         int defenderSize = 0;
         for(int uuid : city.baneAttendees.keySet()){
-            PlayerCharacter player = PlayerManager.getPlayerCharacter(uuid);
+            PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
             if(player == null)
                 continue;
             if(player.guild.getNation().equals(defendNation))
@@ -762,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 = PlayerManager.getPlayerCharacter(uuid);
+            PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
             if(inSiegeRange.contains(player)) //player is still physically here, needs updated multiplier
                 player.ZergMultiplier = attackerMultiplier;
             else
@@ -770,7 +770,7 @@ public final class Bane {
         }
 
         for(int uuid : defenders){
-            PlayerCharacter player = PlayerManager.getPlayerCharacter(uuid);
+            PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
             if(inSiegeRange.contains(player)) //player is still physically here, needs updated multiplier
                 player.ZergMultiplier = defenderMultiplier;
             else

src/engine/objects/Building.java

@@ -17,7 +17,9 @@ import engine.InterestManagement.WorldGrid;
 import engine.db.archive.CityRecord;
 import engine.db.archive.DataWarehouse;
 import engine.db.archive.MineRecord;
-import engine.gameManager.*;
+import engine.gameManager.BuildingManager;
+import engine.gameManager.DbManager;
+import engine.gameManager.ZoneManager;
 import engine.job.JobContainer;
 import engine.job.JobScheduler;
 import engine.jobs.DoorCloseJob;
@@ -966,9 +968,9 @@ public class Building extends AbstractWorldObject {
         if (this.ownerUUID == 0)
             return null;
         if (this.ownerIsNPC)
-            return NPCManager.getFromCache(this.ownerUUID);
+            return NPC.getFromCache(this.ownerUUID);
 
-        return PlayerManager.getFromCache(this.ownerUUID);
+        return PlayerCharacter.getFromCache(this.ownerUUID);
 
     }
 
@@ -1089,11 +1091,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 (NPCManager.getNPC(this.ownerUUID) == null)
+                if (NPC.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 (PlayerManager.getPlayerCharacter(this.ownerUUID) == null) {
+                if (PlayerCharacter.getPlayerCharacter(this.ownerUUID) == null) {
                     Logger.info("Building UID " + this.getObjectUUID() + " Failed to Load Player Owner with ID " + this.ownerUUID + " Location " + this.getLoc().toString());
                 }
             }

src/engine/objects/CharacterItemManager.java

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

src/engine/objects/CharacterPower.java

@@ -10,7 +10,6 @@
 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;
@@ -91,7 +90,7 @@ public class CharacterPower extends AbstractGameObject {
     }
 
     public static PlayerCharacter getOwner(CharacterPower cp) {
-        return PlayerManager.getFromCache(cp.ownerUID);
+        return PlayerCharacter.getFromCache(cp.ownerUID);
     }
 
     /*

src/engine/objects/CharacterSkill.java

@@ -14,7 +14,6 @@ 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;
@@ -288,7 +287,7 @@ public class CharacterSkill extends AbstractGameObject {
         if (cs.isMobOwner)
             return Mob.getFromCache(cs.ownerUID);
         else
-            return PlayerManager.getFromCache(cs.ownerUID);
+            return PlayerCharacter.getFromCache(cs.ownerUID);
     }
 
     /*

src/engine/objects/City.java

@@ -692,9 +692,9 @@ public class City extends AbstractWorldObject {
             return null;
 
         if (this.isNpc == 1)
-            return NPCManager.getNPC(ownerID);
+            return NPC.getNPC(ownerID);
         else
-            return PlayerManager.getPlayerCharacter(ownerID);
+            return PlayerCharacter.getPlayerCharacter(ownerID);
     }
 
     public Guild getGuild() {
@@ -882,7 +882,7 @@ public class City extends AbstractWorldObject {
                 continue;
 
             player = (PlayerCharacter) playerObject;
-            PlayerManager.addCityEffect(player, Integer.toString(effectBase.getUUID()), effectBase, rank, MBServerStatics.FOURTYFIVE_SECONDS, true, this);
+            player.addCityEffect(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 = PlayerManager.getFromCache(playerID);
+            player = PlayerCharacter.getFromCache(playerID);
             if (player == null)
                 continue;
 
@@ -912,7 +912,7 @@ public class City extends AbstractWorldObject {
             // Reapply effect with timeout?
 
             if (refreshEffect == true)
-                PlayerManager.addCityEffect(player, Integer.toString(effectBase.getUUID()), effectBase, rank, MBServerStatics.FOURTYFIVE_SECONDS, false, this);
+                player.addCityEffect(Integer.toString(effectBase.getUUID()), effectBase, rank, MBServerStatics.FOURTYFIVE_SECONDS, false, this);
 
         }
 
@@ -969,7 +969,7 @@ public class City extends AbstractWorldObject {
                 if (effectBase == null)
                     continue;
 
-                PlayerManager.addCityEffect(player, Integer.toString(effectBase.getUUID()), effectBase, effect.getTrains(), MBServerStatics.FOURTYFIVE_SECONDS, true, this);
+                player.addCityEffect(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);
-                PlayerManager.addCityEffect(player, Integer.toString(effectBase.getUUID()), effectBase, effect.getTrains(), MBServerStatics.FOURTYFIVE_SECONDS, false, this);
+                player.addCityEffect(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 = PlayerManager.getFromCache(playerUUID);
+            player = PlayerCharacter.getFromCache(playerUUID);
 
             if (this.isLocationWithinSiegeBounds(player.getLoc()))
                 continue;

src/engine/objects/Contract.java

@@ -242,7 +242,7 @@ public class Contract extends AbstractGameObject {
             }
             break;
             case 15020401:
-                PlayerManager.unboxPlayer(pc);
+                PlayerCharacter.unboxPlayer(pc);
                 vd.getOptions().clear();
                 break;
         }

src/engine/objects/Corpse.java

@@ -43,7 +43,6 @@ public class Corpse extends AbstractWorldObject {
     private int inBuildingID = 0;
     private int inFloorID = -1;
     private int inBuilding = -1;
-    public Long spawnedTime = 0L;
 
     /**
      * No Id Constructor
@@ -75,7 +74,6 @@ public class Corpse extends AbstractWorldObject {
         }
         this.setObjectTypeMask(MBServerStatics.MASK_CORPSE);
 
-        this.spawnedTime = System.currentTimeMillis();
         if (!safeZone)
             transferInventory(belongsTo, enterWorld);
 

src/engine/objects/Experience.java

@@ -11,7 +11,6 @@ package engine.objects;
 
 import engine.Enum;
 import engine.Enum.TargetColor;
-import engine.gameManager.PlayerManager;
 import engine.gameManager.ZoneManager;
 import engine.math.Vector3fImmutable;
 import engine.server.MBServerStatics;
@@ -445,7 +444,7 @@ public class Experience {
                     grantedExperience = 1;
 
                 // Grant the player the EXP
-                PlayerManager.grantXP(playerCharacter, (int) Math.floor(grantedExperience));
+                playerCharacter.grantXP((int) Math.floor(grantedExperience));
             }
 
         } else { // Give EXP to a single character
@@ -472,7 +471,7 @@ public class Experience {
                     grantedExperience *= .6;
 
             // Grant XP
-            PlayerManager.grantXP(killer, (int) Math.floor(grantedExperience));
+            killer.grantXP((int) Math.floor(grantedExperience));
         }
     }
 }

src/engine/objects/Guild.java

@@ -178,9 +178,9 @@ public class Guild extends AbstractWorldObject {
             return null;
 
         if (guild.ownerIsNPC)
-            return NPCManager.getFromCache(guild.guildLeaderUUID);
+            return NPC.getFromCache(guild.guildLeaderUUID);
 
-        return PlayerManager.getFromCache(guild.guildLeaderUUID);
+        return PlayerCharacter.getFromCache(guild.guildLeaderUUID);
     }
 
     public static boolean sameGuild(Guild a, Guild b) {
@@ -268,7 +268,7 @@ public class Guild extends AbstractWorldObject {
             writer.putInt(GuildStatusController.getTitle(pc.getGuildStatus())); // TODO Double check this is
             // title and rank
             if (GuildStatusController.isGuildLeader(pc.getGuildStatus()))
-                writer.putInt(PlayerManager.GetPlayerRealmTitle(pc));
+                writer.putInt(PlayerCharacter.GetPlayerRealmTitle(pc));
             else
                 writer.putInt(GuildStatusController.getRank(pc.getGuildStatus()));
             //writer.putInt(GuildStatusController.getRank(pc.getGuildStatus()));
@@ -576,14 +576,14 @@ public class Guild extends AbstractWorldObject {
             return false;
         }
 
-        PlayerCharacter oldGuildLeader = PlayerManager.getFromCache(this.guildLeaderUUID);
+        PlayerCharacter oldGuildLeader = PlayerCharacter.getFromCache(this.guildLeaderUUID);
 
         //old guildLeader no longer has guildLeadership stauts.
         if (oldGuildLeader != null)
-            PlayerManager.setGuildLeader(oldGuildLeader, false);
+            oldGuildLeader.setGuildLeader(false);
 
         if (ac.getObjectType().equals(GameObjectType.PlayerCharacter))
-            PlayerManager.setGuildLeader(((PlayerCharacter) ac), true);
+            ((PlayerCharacter) ac).setGuildLeader(true);
         this.guildLeaderUUID = ac.getObjectUUID();
 
         return true;
@@ -597,7 +597,7 @@ public class Guild extends AbstractWorldObject {
             return false;
 
         if (ac.getObjectType().equals(GameObjectType.PlayerCharacter))
-            PlayerManager.setGuildLeader(((PlayerCharacter) ac), true);
+            ((PlayerCharacter) ac).setGuildLeader(true);
         this.guildLeaderUUID = ac.getObjectUUID();
 
         return true;
@@ -665,7 +665,7 @@ public class Guild extends AbstractWorldObject {
         }
 
         // Clear Guild Ranks
-        PlayerManager.resetGuildStatuses(pc);
+        pc.resetGuildStatuses();
         pc.setGuild(Guild.getErrantGuild());
 
         pc.incVer();
@@ -831,11 +831,11 @@ public class Guild extends AbstractWorldObject {
 
         //LOad Owners in Cache so we do not have to continuely look in the db for owner.
         if (this.ownerIsNPC) {
-            if (NPCManager.getNPC(this.guildLeaderUUID) == null)
+            if (NPC.getNPC(this.guildLeaderUUID) == null)
                 Logger.info("Guild UID " + this.getObjectUUID() + " Failed to Load NPC Owner with ID " + this.guildLeaderUUID);
 
         } else if (this.guildLeaderUUID != 0) {
-            if (PlayerManager.getPlayerCharacter(this.guildLeaderUUID) == null)
+            if (PlayerCharacter.getPlayerCharacter(this.guildLeaderUUID) == null)
                 Logger.info("Guild UID " + this.getObjectUUID() + " Failed to Load Player Owner with ID " + this.guildLeaderUUID);
         }
 

src/engine/objects/Heraldry.java

@@ -11,7 +11,6 @@ package engine.objects;
 
 import engine.Enum.GameObjectType;
 import engine.gameManager.DbManager;
-import engine.gameManager.PlayerManager;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -126,7 +125,7 @@ public class Heraldry {
 
                 // Player is deleted, add to purge list
 
-                if (PlayerManager.getFromCache(characterID) == null)
+                if (PlayerCharacter.getFromCache(characterID) == null)
                     purgeList.add(characterID);
 
             }

src/engine/objects/Item.java

@@ -12,7 +12,9 @@ package engine.objects;
 import engine.Enum;
 import engine.Enum.*;
 import engine.exception.SerializationException;
-import engine.gameManager.*;
+import engine.gameManager.ConfigManager;
+import engine.gameManager.DbManager;
+import engine.gameManager.PowersManager;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;
 import engine.net.Dispatch;
@@ -21,6 +23,7 @@ import engine.net.client.ClientConnection;
 import engine.net.client.msg.DeleteItemMsg;
 import engine.powers.EffectsBase;
 import engine.powers.effectmodifiers.AbstractEffectModifier;
+import engine.powers.effectmodifiers.WeaponProcEffectModifier;
 import engine.powers.poweractions.AbstractPowerAction;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
@@ -284,7 +287,7 @@ public class Item extends AbstractWorldObject {
         boolean isBeard = (item.equipSlot == (byte) MBServerStatics.SLOT_BEARDSTYLE);
         int itemColor = 0;
         if (isHair || isBeard) {
-            PlayerCharacter pc = PlayerManager.getFromCache(item.ownerID);
+            PlayerCharacter pc = PlayerCharacter.getFromCache(item.ownerID);
             if (pc != null)
                 if (isHair)
                     itemColor = pc.getHairColor();
@@ -846,9 +849,9 @@ public class Item extends AbstractWorldObject {
 
     public AbstractGameObject getOwner() {
         if (this.ownerType == OwnerType.Npc)
-            return NPCManager.getFromCache(this.ownerID);
+            return NPC.getFromCache(this.ownerID);
         else if (this.ownerType == OwnerType.PlayerCharacter)
-            return PlayerManager.getFromCache(this.ownerID);
+            return PlayerCharacter.getFromCache(this.ownerID);
         else if (this.ownerType == OwnerType.Mob)
             return Mob.getFromCache(this.ownerID);
         else if (this.ownerType == OwnerType.Account)
@@ -1224,10 +1227,7 @@ public class Item extends AbstractWorldObject {
     }
 
     public final int getMagicValue() {
-        int val = this.calcMagicValue();
-        if(val == 0)
-            val = 1;
-        return val + this.getItemBase().getMagicValue();
+        return this.magicValue;
     }
 
     public int getBaseValue() {

src/engine/objects/Mine.java

@@ -10,8 +10,11 @@
 package engine.objects;
 
 import engine.Enum;
+import engine.InterestManagement.InterestManager;
 import engine.InterestManagement.WorldGrid;
 import engine.gameManager.*;
+import engine.math.Vector3f;
+import engine.math.Vector3fImmutable;
 import engine.net.ByteBufferWriter;
 import engine.net.client.msg.ErrorPopupMsg;
 import engine.server.MBServerStatics;
@@ -24,6 +27,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 
 import static engine.gameManager.DbManager.MineQueries;
@@ -673,7 +677,7 @@ public class Mine extends AbstractGameObject {
         ArrayList<Integer>toRemove = new ArrayList<>();
         HashSet<AbstractWorldObject> currentPlayers = WorldGrid.getObjectsInRangePartial(tower.loc, Enum.CityBoundsType.GRID.extents, MBServerStatics.MASK_PLAYER);
         for(Integer id : currentMemory){
-            PlayerCharacter pc = PlayerManager.getPlayerCharacter(id);
+            PlayerCharacter pc = PlayerCharacter.getPlayerCharacter(id);
             if(currentPlayers.contains(pc) == false){
                 toRemove.add(id);
                 pc.ZergMultiplier = 1.0f;

src/engine/objects/Mob.java

@@ -12,7 +12,6 @@ package engine.objects;
 import ch.claude_martin.enumbitset.EnumBitSet;
 import engine.Enum;
 import engine.Enum.*;
-import engine.InterestManagement.InterestManager;
 import engine.InterestManagement.WorldGrid;
 import engine.exception.SerializationException;
 import engine.gameManager.*;
@@ -231,7 +230,7 @@ public class Mob extends AbstractIntelligenceAgent {
             else
                 this.contract = DbManager.ContractQueries.GET_CONTRACT(contractID);
 
-            if (this.contract != null && NPCManager.ISGuardCaptain(contract.getContractID())) {
+            if (this.contract != null && NPC.ISGuardCaptain(contract.getContractID())) {
                 this.spawnTime = 60 * 15;
                 this.isPlayerGuard = true;
             }
@@ -1012,7 +1011,7 @@ public class Mob extends AbstractIntelligenceAgent {
         this.charItemManager.load();
 
         //load AI for general mobs.
-        if (this.contract != null && NPCManager.ISWallArcher(this.contract)) {
+        if (this.contract != null && NPC.ISWallArcher(this.contract)) {
             this.BehaviourType = MobBehaviourType.GuardWallArcher;
             this.isPlayerGuard = true;
             this.spawnTime = 450;
@@ -1130,7 +1129,7 @@ public class Mob extends AbstractIntelligenceAgent {
         if (this.ownerUID == 0)
             return null;
 
-        return PlayerManager.getFromCache(this.ownerUID);
+        return PlayerCharacter.getFromCache(this.ownerUID);
     }
 
     public void setOwner(PlayerCharacter value) {
@@ -1327,6 +1326,8 @@ public class Mob extends AbstractIntelligenceAgent {
         Dispatch dispatch;
 
         try {
+            //resync corpses
+            //this.setLoc(this.getMovementLoc());
             if (this.isSiege) {
                 this.deathTime = System.currentTimeMillis();
                 //this.state = STATE.Dead;
@@ -1406,8 +1407,6 @@ public class Mob extends AbstractIntelligenceAgent {
             Logger.error(e);
         }
         this.updateLocation();
-        //resync corpses
-        InterestManager.setObjectDirty(this);
     }
 
     public void respawn() {
@@ -2156,7 +2155,7 @@ public class Mob extends AbstractIntelligenceAgent {
                 this.BehaviourType = this.getMobBase().fsm;
 
             if (this.isPlayerGuard() && this.contract != null)
-                if (NPCManager.ISWallArcher(this.getContract())) {
+                if (NPC.ISWallArcher(this.getContract())) {
                     this.BehaviourType = MobBehaviourType.GuardWallArcher;
                     this.spawnTime = 450;
                 } else {
@@ -2166,7 +2165,6 @@ public class Mob extends AbstractIntelligenceAgent {
                 }
 
             this.deathTime = 0;
-            InterestManager.setObjectDirty(this);
         } catch (Exception e) {
             Logger.error(e.getMessage());
         }

src/engine/objects/NPC.java

@@ -12,6 +12,7 @@ package engine.objects;
 import engine.Enum;
 import engine.Enum.*;
 import engine.InterestManagement.WorldGrid;
+import engine.exception.SerializationException;
 import engine.gameManager.*;
 import engine.job.JobContainer;
 import engine.job.JobScheduler;
@@ -19,6 +20,7 @@ import engine.jobs.UpgradeNPCJob;
 import engine.math.Bounds;
 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.ErrorPopupMsg;
@@ -43,6 +45,8 @@ import static engine.util.StringUtils.wordCount;
 
 public class NPC extends AbstractCharacter {
 
+    public static int SVR_CLOSE_WINDOW = 4;
+    public static HashMap<Integer, ArrayList<String>> _pirateNames = new HashMap<>();
     // Used for thread safety
     public final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
     private final ArrayList<MobLoot> rolling = new ArrayList<>();
@@ -52,11 +56,11 @@ public class NPC extends AbstractCharacter {
     public HashMap<Integer, MobEquipment> equip = null;
     public int runeSetID = 0;
     public int extraRune2 = 0;
-    public int loadID;
-    public MobBase mobBase;
+    protected int loadID;
+    protected MobBase mobBase;
     protected String name;
     protected int dbID;
-    public int currentID;
+    protected int currentID;
     //used by static npcs
     protected Zone parentZone;
     protected float statLat;
@@ -162,9 +166,39 @@ public class NPC extends AbstractCharacter {
 
     }
 
+    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(BuildingGroup.WALLCORNER) ||
+                contract.getAllowedBuildings().contains(BuildingGroup.WALLSTRAIGHTTOWER);
+    }
+
     //This method restarts an upgrade timer when a building is loaded from the database.
     // Submit upgrade job for this building based upon it's current upgradeDateTime
 
+    public static NPC getFromCache(int id) {
+        return (NPC) DbManager.getFromCache(GameObjectType.NPC, id);
+    }
+
+    public static boolean UpdateName(NPC npc, String value) {
+
+        if (!DbManager.NPCQueries.UPDATE_NAME(npc, value))
+            return false;
+
+        npc.name = value;
+        return true;
+
+    }
+
+    public static void serializeNpcForClientMsgOtherPlayer(NPC npc, ByteBufferWriter writer, boolean hideAsciiLastName)
+            throws SerializationException {
+        serializeForClientMsgOtherPlayer(npc, writer);
+    }
+
     public boolean isInSafeZone() {
 
         Zone zone = ZoneManager.findSmallestZone(this.getLoc());
@@ -177,10 +211,360 @@ public class NPC extends AbstractCharacter {
         //return this.safeZone;
     }
 
+    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.mobBase != null)
+            writer.putInt(npc.mobBase.getLoadID());
+        else
+            writer.putInt(2011);
+
+        writer.putInt(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(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(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(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.name);
+        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(GameObjectType.StrongBox.ordinal());
+            writer.putInt(npc.currentID);
+            writer.putInt(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(GameObjectType.NPCClassRuneTwo.ordinal());
+        else
+            writer.putInt(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.name = 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(GameObjectType.NPC, id);
+
+        if (npc != null)
+            return npc;
+
+        return DbManager.NPCQueries.GET_NPC(id);
+    }
+
     /*
      * Getters
      */
 
+    public static boolean ISGuardCaptain(int contractID) {
+        return 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);
+    }
+
     public final void submitUpgradeJob() {
 
         JobContainer jc;
@@ -386,9 +770,9 @@ public class NPC extends AbstractCharacter {
     }
 
     public float getBuyPercent(PlayerCharacter player) {
-        if (NPCManager.GetNPCProfits(this) == null || this.guild == null)
+        if (NPC.GetNPCProfits(this) == null || this.guild == null)
             return this.buyPercent;
-        NPCProfits profits = NPCManager.GetNPCProfits(this);
+        NPCProfits profits = NPC.GetNPCProfits(this);
         if (player.getGuild().equals(this.guild))
             return profits.buyGuild;
         if (player.getGuild().getNation().equals(this.guild.getNation()))
@@ -398,9 +782,9 @@ public class NPC extends AbstractCharacter {
     }
 
     public float getSellPercent(PlayerCharacter player) {
-        if (NPCManager.GetNPCProfits(this) == null || this.guild == null)
+        if (NPC.GetNPCProfits(this) == null || this.guild == null)
             return 1 + this.sellPercent;
-        NPCProfits profits = NPCManager.GetNPCProfits(this);
+        NPCProfits profits = NPC.GetNPCProfits(this);
         if (player.getGuild().equals(this.guild))
             return 1 + profits.sellGuild;
         if (player.getGuild().getNation().equals(this.guild.getNation()))
@@ -529,7 +913,7 @@ public class NPC extends AbstractCharacter {
         }
 
         if (this.parentZone.isPlayerCity())
-            if (NPCManager.GetNPCProfits(this) == null)
+            if (NPC.GetNPCProfits(this) == null)
                 NPCProfits.CreateProfits(this);
 
         //TODO set these correctly later

src/engine/objects/Portal.java

@@ -4,7 +4,6 @@ import engine.Enum;
 import engine.Enum.PortalType;
 import engine.InterestManagement.WorldGrid;
 import engine.gameManager.ConfigManager;
-import engine.gameManager.PlayerManager;
 import engine.job.JobScheduler;
 import engine.jobs.CloseGateJob;
 import engine.math.Vector3fImmutable;
@@ -105,7 +104,7 @@ public class Portal {
         if (player.getTimeStamp("lastMoveGate") < this.lastActive)
             return;
 
-        PlayerManager.teleport(player, targetGate.getLoc());
+        player.teleport(targetGate.getLoc());
         player.setSafeMode();
 
     }