split system mob AI

This reverts commit cd1e38b184.

src/engine/Enum.java

@@ -150,7 +150,8 @@ public class Enum {
         NEPHFEMALE(2026, MonsterType.Nephilim, RunSpeed.STANDARD, CharacterSex.FEMALE, 1.1f),
         HALFGIANTFEMALE(2027, MonsterType.HalfGiant, RunSpeed.STANDARD, CharacterSex.FEMALE, 1.15f),
         VAMPMALE(2028, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.MALE, 1),
-        VAMPFEMALE(2029, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.FEMALE, 1);
+        VAMPFEMALE(2029, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.FEMALE, 1),
+        SAETOR(1999,MonsterType.Minotaur, RunSpeed.MINOTAUR, CharacterSex.MALE,1);
 
         @SuppressWarnings("unchecked")
         private static HashMap<Integer, RaceType> _raceTypeByID = new HashMap<>();
@@ -170,8 +171,6 @@ public class Enum {
         }
 
         public static RaceType getRaceTypebyRuneID(int runeID) {
-            if(runeID == 1999)
-                return _raceTypeByID.get(2017);
             return _raceTypeByID.get(runeID);
         }
 

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/ZergMehcanics/MineAntiZerg.java

@@ -0,0 +1,116 @@
+package engine.ZergMehcanics;
+
+import engine.InterestManagement.WorldGrid;
+import engine.gameManager.BuildingManager;
+import engine.gameManager.ZergManager;
+import engine.objects.*;
+import engine.server.MBServerStatics;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+
+public class MineAntiZerg {
+
+    public static HashMap<Mine,HashMap<PlayerCharacter,Long>> leaveTimers = new HashMap<>();
+    public static HashMap<Mine,ArrayList<PlayerCharacter>> currentPlayers = new HashMap<>();
+
+    public static void runMines(){
+        for(Mine mine : Mine.getMines()){
+
+            Building tower = BuildingManager.getBuildingFromCache(mine.getBuildingID());
+
+            if(tower == null)
+                continue;
+
+            if(!mine.isActive)
+                continue;
+
+            logPlayersPresent(tower,mine);
+
+            auditPlayersPresent(tower,mine);
+
+            auditPlayers(mine);
+        }
+    }
+
+    public static void logPlayersPresent(Building tower, Mine mine){
+        HashSet<AbstractWorldObject> loadedPlayers = WorldGrid.getObjectsInRangePartial(tower.loc, MBServerStatics.CHARACTER_LOAD_RANGE * 3,MBServerStatics.MASK_PLAYER);
+
+        ArrayList<PlayerCharacter> playersPresent = new ArrayList<>();
+        for(AbstractWorldObject player : loadedPlayers){
+            playersPresent.add((PlayerCharacter)player);
+        }
+
+        currentPlayers.put(mine,playersPresent);
+    }
+
+    public static void auditPlayersPresent(Building tower, Mine mine){
+        HashSet<AbstractWorldObject> loadedPlayers = WorldGrid.getObjectsInRangePartial(tower.loc, MBServerStatics.CHARACTER_LOAD_RANGE * 3,MBServerStatics.MASK_PLAYER);
+
+        ArrayList<PlayerCharacter> toRemove = new ArrayList<>();
+
+        for(PlayerCharacter player : currentPlayers.get(mine)){
+            if(!loadedPlayers.contains(player)){
+                toRemove.add(player);
+            }
+        }
+
+        currentPlayers.get(mine).removeAll(toRemove);
+
+        for(PlayerCharacter player : toRemove){
+            if(leaveTimers.containsKey(mine)){
+                leaveTimers.get(mine).put(player,System.currentTimeMillis());
+            }else{
+                HashMap<PlayerCharacter,Long> leaveTime = new HashMap<>();
+                leaveTime.put(player,System.currentTimeMillis());
+                leaveTimers.put(mine,leaveTime);
+            }
+        }
+
+        toRemove.clear();
+
+        for(PlayerCharacter player : leaveTimers.get(mine).keySet()){
+            long timeGone = System.currentTimeMillis() - leaveTimers.get(mine).get(player);
+            if(timeGone > 180000L) {//3 minutes
+                toRemove.add(player);
+                player.ZergMultiplier = 1.0f;
+            }
+        }
+
+        for(PlayerCharacter player : toRemove) {
+            leaveTimers.get(mine).remove(player);
+        }
+    }
+
+    public static void auditPlayers(Mine mine){
+
+        HashMap<Guild,ArrayList<PlayerCharacter>> playersByNation = new HashMap<>();
+
+        for(PlayerCharacter player : currentPlayers.get(mine)){
+            if(playersByNation.containsKey(player.guild.getNation())){
+                playersByNation.get(player.guild.getNation()).add(player);
+            }else{
+                ArrayList<PlayerCharacter> players = new ArrayList<>();
+                players.add(player);
+                playersByNation.put(player.guild.getNation(),players);
+            }
+        }
+
+        for(PlayerCharacter player : leaveTimers.get(mine).keySet()){
+            if(playersByNation.containsKey(player.guild.getNation())){
+                playersByNation.get(player.guild.getNation()).add(player);
+            }else{
+                ArrayList<PlayerCharacter> players = new ArrayList<>();
+                players.add(player);
+                playersByNation.put(player.guild.getNation(),players);
+            }
+        }
+
+        for(Guild nation : playersByNation.keySet()){
+            for(PlayerCharacter player : playersByNation.get(nation)){
+                player.ZergMultiplier = ZergManager.getCurrentMultiplier(playersByNation.get(nation).size(), mine.capSize);
+            }
+        }
+    }
+}

src/engine/db/handlers/dbAccountHandler.java

@@ -13,7 +13,8 @@ import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.gameManager.ConfigManager;
 import engine.gameManager.DbManager;
-import engine.gameManager.PlayerManager;
+import engine.net.DispatchMessage;
+import engine.net.client.msg.chat.ChatSystemMsg;
 import engine.objects.Account;
 import engine.objects.PlayerCharacter;
 import org.pmw.tinylog.Logger;
@@ -78,18 +79,24 @@ public class dbAccountHandler extends dbHandlerBase {
         }
     }
 
-    public void SET_TRASH(String machineID) {
-
+    public void SET_TRASH(String machineID, String type) {
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO dyn_trash(`machineID`, `count`)"
-                     + " VALUES (?, 1) ON DUPLICATE KEY UPDATE `count` = `count` + 1;")) {
+             PreparedStatement preparedStatement = connection.prepareStatement(
+                     "INSERT INTO dyn_trash(`machineID`, `count`, `type`)"
+                             + " VALUES (?, 1, ?) ON DUPLICATE KEY UPDATE `count` = `count` + 1;")) {
 
             preparedStatement.setString(1, machineID);
+            preparedStatement.setString(2, type);
             preparedStatement.execute();
 
         } catch (SQLException e) {
             Logger.error(e);
         }
+
+        ChatSystemMsg chatMsg = new ChatSystemMsg(null, "Account: " + machineID + " has been kicked from game for cheating");
+        chatMsg.setMessageType(10);
+        chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
+        DispatchMessage.dispatchMsgToAll(chatMsg);
     }
 
     public ArrayList<String> GET_TRASH_LIST() {
@@ -141,7 +148,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/dbItemBaseHandler.java

@@ -22,6 +22,7 @@ import java.util.HashMap;
 
 public class dbItemBaseHandler extends dbHandlerBase {
 
+    public static final HashMap<Integer,Float> dexReductions = new HashMap<>();
     public dbItemBaseHandler() {
 
     }
@@ -45,6 +46,14 @@ public class dbItemBaseHandler extends dbHandlerBase {
         }
     }
 
+    public void LOAD_DEX_REDUCTION(ItemBase itemBase) {
+        if(dexReductions.containsKey(itemBase.getUUID())){
+            itemBase.dexReduction = dexReductions.get(itemBase.getUUID());
+        }else{
+            itemBase.dexReduction = 0.0f;
+        }
+    }
+
     public void LOAD_ANIMATIONS(ItemBase itemBase) {
 
         ArrayList<Integer> tempList = new ArrayList<>();
@@ -94,6 +103,21 @@ public class dbItemBaseHandler extends dbHandlerBase {
         }
 
         Logger.info("read: " + recordsRead + " cached: " + ItemBase.getUUIDCache().size());
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_item_dexpenalty`")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+
+            // Check if a result was found
+            if (rs.next()) {
+                int ID = rs.getInt("ID");
+                float factor = rs.getInt("item_bulk_factor");
+                dexReductions.put(ID,factor);
+            }
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
     }
 
     public HashMap<Integer, ArrayList<Integer>> LOAD_RUNES_FOR_NPC_AND_MOBS() {

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,10 +15,12 @@ import engine.Enum.GameObjectType;
 import engine.Enum.TargetColor;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.BuildingManager;
-import engine.gameManager.PlayerManager;
+import engine.gameManager.PowersManager;
 import engine.gameManager.SessionManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
+import engine.powers.EffectsBase;
+import engine.powers.PowersBase;
 import engine.server.MBServerStatics;
 import engine.util.StringUtils;
 
@@ -333,14 +335,18 @@ public class InfoCmd extends AbstractDevCmd {
                 output += "Movement State: " + targetPC.getMovementState().name();
                 output += newline;
                 output += "Movement Speed: " + targetPC.getSpeed();
-
+                output += newline;
                 output += "Altitude : " + targetPC.getLoc().y;
-
-                output += "Swimming : " + PlayerManager.isSwimming(targetPC);
+                output += newline;
+                output += "Swimming : " + targetPC.isSwimming();
                 output += newline;
                 output += "isMoving : " + targetPC.isMoving();
                 output += newline;
-                output += "Zerg Multiplier : " + targetPC.ZergMultiplier;
+                output += "Zerg Multiplier : " + targetPC.ZergMultiplier + newline;
+                output += "Hidden : " + targetPC.getHidden() + newline;
+                output += "Target Loc: " + targetPC.loc + newline;
+                output += "Player Loc: " + pc.loc + newline;
+                output += "Distance Squared: " + pc.loc.distanceSquared(targetPC.loc);
                 break;
 
             case NPC:
@@ -495,13 +501,16 @@ public class InfoCmd extends AbstractDevCmd {
                     output += newline;
                     output += "No building found." + newline;
                 }
-                int max = (int)(4.882 * targetMob.level + 121.0);
-                if(max > 321){
-                    max = 321;
+
+                output += "Damage: " + targetMob.mobBase.getDamageMin() + " - " + targetMob.mobBase.getDamageMax() + newline;
+                output += "ATR: " + targetMob.mobBase.getAttackRating() + newline;
+                output += "DEF: " + targetMob.defenseRating + newline;
+                output += "RANGE: " + targetMob.getRange() + newline;
+                output += "Effects:" + newline;
+                for(MobBaseEffects mbe : targetMob.mobBase.mobbaseEffects){
+                    EffectsBase eb = PowersManager.getEffectByToken(mbe.getToken());
+                    output += eb.getName() + newline;
                 }
-                int min = (int)(4.469 * targetMob.level - 3.469);
-                output += "Min Loot Roll = " + min;
-                output += "Max Loot Roll = " + max;
                 break;
             case Item:  //intentional passthrough
             case MobLoot:

src/engine/devcmd/cmds/JumpCmd.java

@@ -10,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/PrintSkillsCmd.java

@@ -49,6 +49,8 @@ public class PrintSkillsCmd extends AbstractDevCmd {
                         + skill.getModifiedAmount() + '('
                         + skill.getTotalSkillPercet() + " )");
             }
+            //throwbackInfo(pc, "= = = = = NEW CALCULATIONS = = = = =");
+           // PlayerCombatStats.PrintSkillsToClient(pc);
         } else
             throwbackInfo(pc, "Skills not found for player");
     }

src/engine/devcmd/cmds/PrintStatsCmd.java

@@ -11,6 +11,7 @@ package engine.devcmd.cmds;
 
 import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.PowersManager;
 import engine.objects.*;
 
 import java.util.HashMap;
@@ -57,27 +58,42 @@ public class PrintStatsCmd extends AbstractDevCmd {
 
     public void printStatsPlayer(PlayerCharacter pc, PlayerCharacter tar) {
         String newline = "\r\n ";
-        String out = "Server stats for Player " + tar.getFirstName() + newline;
-        out += "Unused Stats: " + tar.getUnusedStatPoints() + newline;
-        out += "Stats Base (Modified)" + newline;
-        out += "  Str: " + (int) tar.statStrBase + " (" + tar.getStatStrCurrent() + ')' + ", maxStr: " + tar.getStrMax() + newline;
-        out += "  Dex: " + (int) tar.statDexBase + " (" + tar.getStatDexCurrent() + ')' + ", maxDex: " + tar.getDexMax() + newline;
-        out += "  Con: " + (int) tar.statConBase + " (" + tar.getStatConCurrent() + ')' + ", maxCon: " + tar.getConMax() + newline;
-        out += "  Int: " + (int) tar.statIntBase + " (" + tar.getStatIntCurrent() + ')' + ", maxInt: " + tar.getIntMax() + newline;
-        out += "  Spi: " + (int) tar.statSpiBase + " (" + tar.getStatSpiCurrent() + ')' + ", maxSpi: " + tar.getSpiMax() + newline;
-        throwbackInfo(pc, out);
-        out = "Health: " + tar.getHealth() + ", maxHealth: " + tar.getHealthMax() + newline;
-        out += "Mana: " + tar.getMana() + ", maxMana: " + tar.getManaMax() + newline;
-        out += "Stamina: " + tar.getStamina() + ", maxStamina: " + tar.getStaminaMax() + newline;
-        out += "Defense: " + tar.getDefenseRating() + newline;
-        out += "Main Hand: atr: " + tar.getAtrHandOne() + ", damage: " + tar.getMinDamageHandOne() + " to " + tar.getMaxDamageHandOne() + ", speed: " + tar.getSpeedHandOne() + newline;
-        out += "Off Hand:  atr: " + tar.getAtrHandTwo() + ", damage: " + tar.getMinDamageHandTwo() + " to " + tar.getMaxDamageHandTwo() + ", speed: " + tar.getSpeedHandTwo() + newline;
-        out += "isAlive: " + tar.isAlive() + ", Combat: " + tar.isCombat() + newline;
-        out += "Move Speed: " + tar.getSpeed() + newline;
-        out += "Health Regen: " + tar.getRegenModifier(Enum.ModType.HealthRecoverRate) + newline;
-        out += "Mana Regen: " + tar.getRegenModifier(Enum.ModType.ManaRecoverRate) + newline;
-        out += "Stamina Regen: " + tar.getRegenModifier(Enum.ModType.StaminaRecoverRate) + newline;
-        throwbackInfo(pc, out);
+
+        String newOut = "Server stats for Player " + tar.getFirstName() + newline;
+        newOut += "HEALTH: " + tar.getHealth() + " / " + tar.getHealthMax() + newline;
+        newOut += "MANA: " + tar.getMana() + " / " + tar.getManaMax() + newline;
+        newOut += "STAMINA: " + tar.getStamina() + " / " + tar.getStaminaMax() + newline;
+        newOut += "Unused Stats: " + tar.getUnusedStatPoints() + newline;
+        newOut += "Stats Base (Modified)" + newline;
+        newOut += "  Str: " + (int) tar.statStrBase + " (" + tar.getStatStrCurrent() + ')' + ", maxStr: " + tar.getStrMax() + newline;
+        newOut += "  Dex: " + (int) tar.statDexBase + " (" + tar.getStatDexCurrent() + ')' + ", maxDex: " + tar.getDexMax() + newline;
+        newOut += "  Con: " + (int) tar.statConBase + " (" + tar.getStatConCurrent() + ')' + ", maxCon: " + tar.getConMax() + newline;
+        newOut += "  Int: " + (int) tar.statIntBase + " (" + tar.getStatIntCurrent() + ')' + ", maxInt: " + tar.getIntMax() + newline;
+        newOut += "  Spi: " + (int) tar.statSpiBase + " (" + tar.getStatSpiCurrent() + ')' + ", maxSpi: " + tar.getSpiMax() + newline;
+        newOut += "Move Speed: " + tar.getSpeed() + newline;
+        newOut += "Health Regen: " + tar.combatStats.healthRegen + newline;
+        newOut += "Mana Regen: " + tar.combatStats.manaRegen + newline;
+        newOut += "Stamina Regen: " + tar.combatStats.staminaRegen + newline;
+        newOut += "DEFENSE: " + tar.combatStats.defense + newline;
+        newOut += "HAND ONE" + newline;
+        newOut += "ATR: " +  tar.combatStats.atrHandOne + newline;
+        newOut += "MIN: " + tar.combatStats.minDamageHandOne + newline;
+        newOut += "MAX: " + tar.combatStats.maxDamageHandOne + newline;
+        newOut += "RANGE: " + tar.combatStats.rangeHandOne + newline;
+        newOut += "ATTACK SPEED: " + tar.combatStats.attackSpeedHandOne + newline;
+        newOut += "HAND TWO" + newline;
+        newOut += "ATR: " + tar.combatStats.atrHandTwo + newline;
+        newOut += "MIN: " + tar.combatStats.minDamageHandTwo + newline;
+        newOut += "MAX: " + tar.combatStats.maxDamageHandTwo + newline;
+        newOut += "RANGE: " + tar.combatStats.rangeHandTwo + newline;
+        newOut += "ATTACK SPEED: " + tar.combatStats.attackSpeedHandTwo + newline;
+        newOut += "=== POWERS ===" + newline;
+        for(CharacterPower power : pc.getPowers().values()){
+            if(power.getPower().requiresHitRoll) {
+                newOut += power.getPower().name + " ATR: " + Math.round(PlayerCombatStats.getSpellAtr(pc,power.getPower())) + newline;
+            }
+        }
+        throwbackInfo(pc, newOut);
     }
 
     public void printStatsMob(PlayerCharacter pc, Mob tar) {

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/SimulateBootyCmd.java

@@ -1,5 +1,6 @@
 package engine.devcmd.cmds;
 
+import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.LootManager;
 import engine.gameManager.ZoneManager;
@@ -26,7 +27,52 @@ public class SimulateBootyCmd extends AbstractDevCmd {
         String newline = "\r\n ";
 
         String output;
+        if(target.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
+            int ATR = Integer.parseInt(words[0]);
+            int DEF = Integer.parseInt(words[1]);
+            int attacks = Integer.parseInt(words[2]);
 
+            int hits = 0;
+            int misses = 0;
+            int defaultHits = 0;
+            int defualtMisses = 0;
+
+            float chance = (ATR-((ATR+DEF) * 0.315f)) / ((DEF-((ATR+DEF) * 0.315f)) + (ATR-((ATR+DEF) * 0.315f)));
+            float convertedChance = chance * 100;
+            output = "" + newline;
+            output += "DEF VS ATR SIMULATION: " + attacks + " ATTACKS SIMULATED" + newline;
+            output += "DEF = " + DEF + newline;
+            output += "ATR = " + ATR + newline;
+            output += "CHANCE TO LAND HIT: " + convertedChance + "%" + newline;
+            if(convertedChance < 5){
+                output += "CHANCE ADJUSTED TO 5.0%" + newline;
+                convertedChance = 5.0f;
+            }
+            if(convertedChance > 95){
+                output += "CHANCE ADJUSTED TO 95.0%" + newline;
+                convertedChance = 95.0f;
+            }
+            for(int i = 0; i < attacks; i++){
+                int roll = ThreadLocalRandom.current().nextInt(101);
+
+                if(roll <= convertedChance){
+                    hits += 1;
+                }else{
+                    misses += 1;
+                }
+            }
+
+            float totalHits = defaultHits + hits;
+            float totalMisses = defualtMisses + misses;
+            float hitPercent = Math.round(totalHits / attacks * 100);
+            float missPercent = Math.round(totalMisses / attacks * 100);
+
+            output += "HITS LANDED: " + (defaultHits + hits) + "(" + Math.round(hitPercent) + "%)" + newline;
+            output += "HITS MISSED: " + (defualtMisses + misses) + "(" + Math.round(missPercent) + "%)";
+
+            throwbackInfo(playerCharacter,output);
+            return;
+        }
         try
         {
             simCount = Integer.parseInt(words[0]);

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/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/ChatManager.java

@@ -27,6 +27,7 @@ import engine.objects.*;
 import engine.server.MBServerStatics;
 import engine.server.world.WorldServer;
 import engine.session.Session;
+import engine.util.KeyCloneAudit;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
@@ -84,6 +85,10 @@ public enum ChatManager {
         if ((checkTime > 0L) && (curMsgTime - checkTime < FLOOD_TIME_THRESHOLD))
             isFlood = true;
 
+        if(KeyCloneAudit.auditChatMsg(pc,msg.getMessage())){
+            return;
+        }
+
         switch (protocolMsg) {
             case CHATSAY:
                 ChatManager.chatSay(pc, msg.getMessage(), isFlood);

src/engine/gameManager/CombatManager.java

@@ -26,7 +26,6 @@ import engine.powers.effectmodifiers.WeaponProcEffectModifier;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
-import java.util.HashSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
 
@@ -65,7 +64,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 +170,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())
@@ -301,6 +300,17 @@ public enum CombatManager {
             if (target == null)
                 return 0;
 
+            //pet to assist in attacking target
+            if(abstractCharacter.getObjectType().equals(GameObjectType.PlayerCharacter)){
+                PlayerCharacter attacker = (PlayerCharacter)abstractCharacter;
+                if(attacker.getPet() != null){
+                    Mob pet = attacker.getPet();
+                    if(pet.combatTarget == null && pet.assist)
+                        pet.setCombatTarget(attacker.combatTarget);
+                }
+            }
+
+
             //target must be valid type
 
             if (AbstractWorldObject.IsAbstractCharacter(target)) {
@@ -452,6 +462,17 @@ public enum CombatManager {
 
             //Range check.
 
+            if(abstractCharacter.isMoving()){
+                range += (abstractCharacter.getSpeed() * 0.1f);
+            }
+
+            if(AbstractWorldObject.IsAbstractCharacter(target)) {
+                AbstractCharacter tarAc = (AbstractCharacter) target;
+                if(tarAc != null && tarAc.isMoving()){
+                    range += (tarAc.getSpeed() * 0.1f);
+                }
+            }
+
             if (NotInRange(abstractCharacter, target, range)) {
 
                 //target is in stealth and can't be seen by source
@@ -483,16 +504,24 @@ public enum CombatManager {
                     createTimer(abstractCharacter, slot, 20, true); //2 second for no weapon
                 else {
                     int wepSpeed = (int) (wb.getSpeed());
+                    if(abstractCharacter.getObjectType().equals(GameObjectType.PlayerCharacter)){
+                        PlayerCharacter pc = (PlayerCharacter)abstractCharacter;
+                        if(slot == 1){
+                            wepSpeed = (int) pc.combatStats.attackSpeedHandOne;
+                        }else{
+                            wepSpeed = (int) pc.combatStats.attackSpeedHandTwo;
+                        }
+                    }else {
 
-                    if (weapon != null && weapon.getBonusPercent(ModType.WeaponSpeed, SourceType.None) != 0f) //add weapon speed bonus
-                        wepSpeed *= (1 + weapon.getBonus(ModType.WeaponSpeed, SourceType.None));
+                        if (weapon != null && weapon.getBonusPercent(ModType.WeaponSpeed, SourceType.None) != 0f) //add weapon speed bonus
+                            wepSpeed *= (1 + weapon.getBonus(ModType.WeaponSpeed, SourceType.None));
 
-                    if (abstractCharacter.getBonuses() != null && abstractCharacter.getBonuses().getFloatPercentAll(ModType.AttackDelay, SourceType.None) != 0f) //add effects speed bonus
-                        wepSpeed *= (1 + abstractCharacter.getBonuses().getFloatPercentAll(ModType.AttackDelay, SourceType.None));
-
-                    if (wepSpeed < 10)
-                        wepSpeed = 10; //Old was 10, but it can be reached lower with legit buffs,effects.
+                        if (abstractCharacter.getBonuses() != null && abstractCharacter.getBonuses().getFloatPercentAll(ModType.AttackDelay, SourceType.None) != 0f) //add effects speed bonus
+                            wepSpeed *= (1 + abstractCharacter.getBonuses().getFloatPercentAll(ModType.AttackDelay, SourceType.None));
 
+                        if (wepSpeed < 10)
+                            wepSpeed = 10; //Old was 10, but it can be reached lower with legit buffs,effects.
+                    }
                     createTimer(abstractCharacter, slot, wepSpeed, true);
                 }
 
@@ -537,14 +566,32 @@ public enum CombatManager {
             if (target == null)
                 return;
 
-            if (mainHand) {
-                atr = ac.getAtrHandOne();
-                minDamage = ac.getMinDamageHandOne();
-                maxDamage = ac.getMaxDamageHandOne();
-            } else {
-                atr = ac.getAtrHandTwo();
-                minDamage = ac.getMinDamageHandTwo();
-                maxDamage = ac.getMaxDamageHandTwo();
+            if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
+                PlayerCharacter pc = (PlayerCharacter) ac;
+                if( pc.combatStats == null){
+                    pc.combatStats = new PlayerCombatStats(pc);
+                }
+                pc.combatStats.calculateATR(true);
+                pc.combatStats.calculateATR(false);
+                if (mainHand) {
+                    atr = pc.combatStats.atrHandOne;
+                    minDamage = pc.combatStats.minDamageHandOne;
+                    maxDamage = pc.combatStats.maxDamageHandOne;
+                } else {
+                    atr = pc.combatStats.atrHandTwo;
+                    minDamage = pc.combatStats.minDamageHandTwo;
+                    maxDamage = pc.combatStats.maxDamageHandTwo;
+                }
+            }else {
+                if (mainHand) {
+                    atr = ac.getAtrHandOne();
+                    minDamage = ac.getMinDamageHandOne();
+                    maxDamage = ac.getMaxDamageHandOne();
+                } else {
+                    atr = ac.getAtrHandTwo();
+                    minDamage = ac.getMinDamageHandTwo();
+                    maxDamage = ac.getMaxDamageHandTwo();
+                }
             }
 
             boolean tarIsRat = false;
@@ -638,7 +685,12 @@ public enum CombatManager {
                 }
             } else {
                 AbstractCharacter tar = (AbstractCharacter) target;
-                defense = tar.getDefenseRating();
+                if(tar.getObjectType().equals(GameObjectType.PlayerCharacter)){
+                    ((PlayerCharacter)tar).combatStats.calculateDefense();
+                    defense = ((PlayerCharacter)tar).combatStats.defense;
+                }else {
+                    defense = tar.getDefenseRating();
+                }
                 handleRetaliate(tar, ac);   //Handle target attacking back if in combat and has no other target
             }
 
@@ -647,7 +699,7 @@ public enum CombatManager {
             //Get hit chance
 
             //int chance;
-            float dif = atr - defense;
+            //float dif = atr - defense;
 
             //if (dif > 100)
             //    chance = 94;
@@ -662,9 +714,8 @@ public enum CombatManager {
 
             DeferredPowerJob dpj = null;
 
-
-
-            if (LandHit((int)atr,(int)defense)) {
+            boolean hitLanded = LandHit((int)atr,(int)defense);
+            if (hitLanded) {
 
                 if (ac.getObjectType().equals(GameObjectType.PlayerCharacter))
                     updateAttackTimers((PlayerCharacter) ac, target, true);
@@ -693,7 +744,25 @@ public enum CombatManager {
 
                         PlayerBonuses bonus = ac.getBonuses();
                         float attackRange = getWeaponRange(wb, bonus);
-                        dpj.attack(target, attackRange);
+
+                        if(ac.isMoving()){
+                            attackRange += (ac.getSpeed() * 0.1f);
+                        }
+
+                        if(AbstractWorldObject.IsAbstractCharacter(target)) {
+                            //AbstractCharacter tarAc = (AbstractCharacter) target;
+                            if(tarAc != null && tarAc.isMoving()){
+                                attackRange += (tarAc.getSpeed() * 0.1f);
+                            }
+                        }
+
+                        if(specialCaseHitRoll(dpj.getPowerToken())) {
+                            if(hitLanded) {
+                                dpj.attack(target, attackRange);
+                            }
+                        }else{
+                            dpj.attack(target, attackRange);
+                        }
 
                         if (dpj.getPower() != null && (dpj.getPowerToken() == -1851459567 || dpj.getPowerToken() == -1851489518))
                             ((PlayerCharacter) ac).setWeaponPower(dpj);
@@ -708,7 +777,25 @@ public enum CombatManager {
 
                     if (dpj != null && dpj.getPower() != null && (dpj.getPowerToken() == -1851459567 || dpj.getPowerToken() == -1851489518)) {
                         float attackRange = getWeaponRange(wb, bonuses);
-                        dpj.attack(target, attackRange);
+
+                        if(ac.isMoving()){
+                            attackRange += (ac.getSpeed() * 0.1f);
+                        }
+
+                        if(AbstractWorldObject.IsAbstractCharacter(target)) {
+                            //AbstractCharacter tarAc = (AbstractCharacter) target;
+                            if(tarAc != null && tarAc.isMoving()){
+                                attackRange += (tarAc.getSpeed() * 0.1f);
+                            }
+                        }
+
+                        if(specialCaseHitRoll(dpj.getPowerToken())) {
+                            if(hitLanded) {
+                                dpj.attack(target, attackRange);
+                            }
+                        }else{
+                            dpj.attack(target, attackRange);
+                        }
                     }
                 }
 
@@ -815,6 +902,22 @@ public enum CombatManager {
                 else
                     damage = calculateDamage(ac, tarAc, minDamage, maxDamage, damageType, resists);
 
+                if(weapon != null && weapon.effects != null){
+                    float armorPierce = 0;
+                    for(Effect eff : weapon.effects.values()){
+                        for(AbstractEffectModifier mod : eff.getEffectModifiers()){
+                            if(mod.modType.equals(ModType.ArmorPiercing)){
+                                armorPierce += mod.getPercentMod() + (mod.getRamp() * eff.getTrains());
+                            }
+                        }
+                    }
+                    if(armorPierce > 0){
+                        damage *= 1 + (armorPierce * 0.01f);
+                    }
+                }
+
+                //Resists.handleFortitude(tarAc,damageType,damage);
+
                 float d = 0f;
 
                 errorTrack = 12;
@@ -834,6 +937,8 @@ public enum CombatManager {
                     if (tarAc.getHealth() > 0)
                         d = tarAc.modifyHealth(-damage, ac, false);
 
+                    tarAc.cancelOnTakeDamage();
+
                 } else if (target.getObjectType().equals(GameObjectType.Building)) {
 
                     if (BuildingManager.getBuildingFromCache(target.getObjectUUID()) == null) {
@@ -867,27 +972,18 @@ public enum CombatManager {
 
                 if (weapon != null && tarAc != null && tarAc.isAlive()) {
 
-                    ConcurrentHashMap<String, Effect> effects = weapon.getEffects();
-
-                    for (Effect eff : effects.values()) {
-                        if (eff == null)
-                            continue;
-
-                        HashSet<AbstractEffectModifier> aems = eff.getEffectModifiers();
-
-                        if (aems != null) {
-                            for (AbstractEffectModifier aem : aems) {
-
-                                if (!tarAc.isAlive())
-                                    break;
-
-                                if (aem instanceof WeaponProcEffectModifier) {
-
+                    if(weapon.effects != null){
+                        for (Effect eff : weapon.effects.values()){
+                            for(AbstractEffectModifier mod : eff.getEffectModifiers()){
+                                if(mod.modType.equals(ModType.WeaponProc)){
                                     int procChance = ThreadLocalRandom.current().nextInt(100);
-
-                                    if (procChance < MBServerStatics.PROC_CHANCE)
-                                        ((WeaponProcEffectModifier) aem).applyProc(ac, target);
-
+                                    if (procChance < MBServerStatics.PROC_CHANCE) {
+                                        try {
+                                            ((WeaponProcEffectModifier) mod).applyProc(ac, target);
+                                        }catch(Exception e){
+                                            Logger.error(eff.getName() + " Failed To Cast Proc");
+                                        }
+                                    }
                                 }
                             }
                         }
@@ -916,7 +1012,26 @@ public enum CombatManager {
                         if (wp.requiresHitRoll() == false) {
                             PlayerBonuses bonus = ac.getBonuses();
                             float attackRange = getWeaponRange(wb, bonus);
-                            dpj.attack(target, attackRange);
+
+                            if(ac.isMoving()){
+                                attackRange += (ac.getSpeed() * 0.1f);
+                            }
+
+                            if(AbstractWorldObject.IsAbstractCharacter(target)) {
+                                AbstractCharacter tarAc = (AbstractCharacter) target;
+                                if(tarAc != null && tarAc.isMoving()){
+                                    attackRange += (tarAc.getSpeed() * 0.1f);
+                                }
+                            }
+
+
+                            if(specialCaseHitRoll(dpj.getPowerToken())) {
+                                if(hitLanded) {
+                                    dpj.attack(target, attackRange);
+                                }
+                            }else{
+                                dpj.attack(target, attackRange);
+                            }
                         } else
                             ((PlayerCharacter) ac).setWeaponPower(null);
                     }
@@ -954,6 +1069,12 @@ public enum CombatManager {
 
         AbstractCharacter tar = (AbstractCharacter) target;
 
+        if(target.getObjectType().equals(GameObjectType.PlayerCharacter)){
+            PlayerCharacter pc = (PlayerCharacter) target;
+            if(pc.getRaceID() == 1999)
+                return true;
+        }
+
         CharacterItemManager acItem = ac.getCharItemManager();
         CharacterItemManager tarItem = tar.getCharItemManager();
 
@@ -1023,10 +1144,12 @@ public enum CombatManager {
 
         //calculate resists in if any
 
+
+
         if (resists != null)
-            return resists.getResistedDamage(source, target, damageType, damage, 0);
-        else
-            return damage;
+            damage = resists.getResistedDamage(source, target, damageType, damage, 0);
+
+        return damage;
     }
 
     private static void sendPassiveDefenseMessage(AbstractCharacter source, ItemBase wb, AbstractWorldObject target, int passiveType, DeferredPowerJob dpj, boolean mainHand) {
@@ -1180,6 +1303,14 @@ public enum CombatManager {
 
     private static boolean testPassive(AbstractCharacter source, AbstractCharacter target, String type) {
 
+        if(target.getBonuses() != null)
+            if(target.getBonuses().getBool(ModType.Stunned, SourceType.None))
+                return false;
+
+        if(source.getBonuses() != null)
+            if(source.getBonuses().getBool(ModType.IgnorePassiveDefense, SourceType.None))
+                return false;
+
         float chance = target.getPassiveChance(type, source.getLevel(), true);
 
         if (chance == 0f)
@@ -1190,7 +1321,7 @@ public enum CombatManager {
         if (chance > 75f)
             chance = 75f;
 
-        int roll = ThreadLocalRandom.current().nextInt(100);
+        int roll = ThreadLocalRandom.current().nextInt(1,100);
 
         return roll < chance;
 
@@ -1249,7 +1380,7 @@ public enum CombatManager {
         if (pc == null)
             return;
 
-        if(PlayerManager.isFlying(pc))
+        if(pc.isFlying())
             pc.setSit(false);
         else
             pc.setSit(toggle);
@@ -1368,9 +1499,9 @@ public enum CombatManager {
 
                 Resists resists = ac.getResists();
 
-                if (resists != null)
+                if (resists != null) {
                     amount = resists.getResistedDamage(target, ac, ds.getDamageType(), amount, 0);
-
+                }
                 total += amount;
             }
 
@@ -1453,19 +1584,31 @@ public enum CombatManager {
             ((AbstractCharacter) awo).getCharItemManager().damageRandomArmor(1);
     }
 
-    public static boolean LandHit(int atr, int defense){
+    public static boolean LandHit(int ATR, int DEF){
+
+        //float chance = (ATR-((ATR+DEF) * 0.315f)) / ((DEF-((ATR+DEF) * 0.315f)) + (ATR-((ATR+DEF) * 0.315f)));
+        //float convertedChance = chance * 100;
 
         int roll = ThreadLocalRandom.current().nextInt(101);
-        float chance = (float)((atr-((atr+defense)*0.315))/((defense-((atr+defense)*0.315))+(atr-((atr+defense)*0.315))));
 
-        int connvertedChance = (int)(chance * 100);
+        //if(roll <= 5)//always 5% chance to miss
+        //    return false;
 
-        if(connvertedChance < 5)
-            connvertedChance = 5;
+        //if(roll >= 95)//always 5% chance to hit
+        //    return true;
 
-        if(connvertedChance > 95)
-            connvertedChance = 95;
+        float chance = PlayerCombatStats.getHitChance(ATR,DEF);
+        return chance >= roll;
+    }
 
-        return connvertedChance > roll;
+    public static boolean specialCaseHitRoll(int powerID){
+        switch(powerID) {
+            case 563200808: // Naargal's Bite
+            case 563205337: // Naargal's Dart
+            case 563205930: // Sword of Saint Malorn
+                return true;
+            default:
+                return false;
+        }
     }
 }

src/engine/gameManager/ConfigManager.java

@@ -98,7 +98,8 @@ public enum ConfigManager {
     MB_MAGICBOT_FORTOFIX,
     MB_MAGICBOT_RECRUIT,
     MB_MAGICBOT_MAGICBOX,
-    MB_MAGICBOT_ADMINLOG;
+    MB_MAGICBOT_ADMINLOG,
+    MB_WORLD_BOXLIMIT;
 
     // Map to hold our config pulled in from the environment
     // We also use the config to point to the current message pump

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/DevCmdManager.java

@@ -177,6 +177,11 @@ public enum DevCmdManager {
             return false;
         }
 
+        if(!pcSender.getTimestamps().containsKey("DEVCOMMAND"))
+            pcSender.getTimestamps().put("DEVCOMMAND",System.currentTimeMillis() - 1500L);
+        else if(System.currentTimeMillis() - pcSender.getTimestamps().get("DEVCOMMAND") < 1000L)
+            return false;
+
         //kill any commands not available to everyone on production server
         //only admin level can run dev commands on production
         boolean playerAllowed = false;
@@ -189,6 +194,20 @@ public enum DevCmdManager {
                 case "gimme":
                 case "goto":
                 case "teleportmode":
+                case "printbonuses":
+                    playerAllowed = true;
+                    if (!a.status.equals(Enum.AccountStatus.ADMIN))
+                        target = pcSender;
+                    break;
+            }
+        }else{
+            switch (adc.getMainCmdString()) {
+                case "printresists":
+                case "printstats":
+                case "printskills":
+                case "printpowers":
+                case "printbonuses":
+                //case "gimme":
                     playerAllowed = true;
                     if (!a.status.equals(Enum.AccountStatus.ADMIN))
                         target = pcSender;

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/LootManager.java

@@ -14,6 +14,7 @@ import engine.net.DispatchMessage;
 import engine.net.client.msg.ErrorPopupMsg;
 import engine.net.client.msg.chat.ChatSystemMsg;
 import engine.objects.*;
+import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
@@ -42,6 +43,15 @@ public enum LootManager {
     public static final ArrayList<Integer> vorg_cloth_uuids = new ArrayList<>(Arrays.asList(27600,188700,188720,189550,189560));
     public static final ArrayList<Integer> racial_guard_uuids = new ArrayList<>(Arrays.asList(841,951,952,1050,1052,1180,1182,1250,1252,1350,1352,1450,1452,1500,1502,1525,1527,1550,1552,1575,1577,1600,1602,1650,1652,1700,980100,980102));
 
+    public static final ArrayList<Integer> static_rune_ids = new ArrayList<>(Arrays.asList(
+            250001, 250002, 250003, 250004, 250005, 250006, 250007, 250008, 250010, 250011,
+            250012, 250013, 250014, 250015, 250016, 250017, 250019, 250020, 250021, 250022,
+            250023, 250024, 250025, 250026, 250028, 250029, 250030, 250031, 250032, 250033,
+            250034, 250035, 250037, 250038, 250039, 250040, 250041, 250042, 250043, 250044,
+            250115, 250118, 250119, 250120, 250121, 250122, 252123, 252124, 252125, 252126,
+            252127
+    ));
+
     // Drop Rates
 
     public static float NORMAL_DROP_RATE;
@@ -75,6 +85,11 @@ public enum LootManager {
     }
 
     public static void GenerateMobLoot(Mob mob) {
+
+        if(mob == null){
+            return;
+        }
+
         //determine if mob is in hotzone
         boolean inHotzone = false;
 
@@ -180,14 +195,16 @@ public enum LootManager {
 
 
         // Iterate all entries in this bootySet and process accordingly
+        Zone zone = ZoneManager.findSmallestZone(mob.loc);
         for (BootySetEntry bse : entries) {
             switch (bse.bootyType) {
                 case "GOLD":
+                    if (zone != null && zone.getSafeZone() == (byte)1)
+                        return; // no loot to drop in safezones
                     GenerateGoldDrop(mob, bse, inHotzone);
                     break;
                 case "LOOT":
-
-                    if (mob.getSafeZone())
+                    if (zone != null && zone.getSafeZone() == (byte)1)
                         return; // no loot to drop in safezones
 
                     dropRate = LootManager.NORMAL_DROP_RATE;
@@ -251,33 +268,40 @@ public enum LootManager {
     }
 
     public static void SpecialCaseRuneDrop(Mob mob,ArrayList<BootySetEntry> entries){
-        int lootTableID = 0;
-        for(BootySetEntry entry : entries){
-            if(entry.bootyType.equals("LOOT")){
-                lootTableID = entry.genTable;
-                break;
-            }
+        //int lootTableID = 0;
+        //for(BootySetEntry entry : entries){
+        //    if(entry.bootyType.equals("LOOT")){
+        //        lootTableID = entry.genTable;
+        //        break;
+        //    }
+        //}
+
+       // if(lootTableID == 0)
+       //     return;
+
+        //int RuneTableID = 0;
+        //for(GenTableEntry entry : _genTables.get(lootTableID)){
+        //    try {
+        //        if (ItemBase.getItemBase(_itemTables.get(entry.itemTableID).get(0).cacheID).getType().equals(Enum.ItemType.RUNE)) {
+        //            RuneTableID = entry.itemTableID;
+        //            break;
+        //        }
+        //    }catch(Exception e){
+
+        //    }
+        //}
+
+        //if(RuneTableID == 0)
+        //    return;
+
+        int roll = ThreadLocalRandom.current().nextInt(static_rune_ids.size() + 1);
+        int itemId = static_rune_ids.get(0);
+        try {
+            itemId = static_rune_ids.get(roll);
+        }catch(Exception e){
+
         }
-
-        if(lootTableID == 0)
-            return;
-
-        int RuneTableID = 0;
-        for(GenTableEntry entry : _genTables.get(lootTableID)){
-            try {
-                if (ItemBase.getItemBase(_itemTables.get(entry.itemTableID).get(0).cacheID).getType().equals(Enum.ItemType.RUNE)) {
-                    RuneTableID = entry.itemTableID;
-                    break;
-                }
-            }catch(Exception e){
-
-            }
-        }
-
-        if(RuneTableID == 0)
-            return;
-
-        ItemBase ib = ItemBase.getItemBase(rollRandomItem(RuneTableID));
+        ItemBase ib = ItemBase.getItemBase(itemId);
         if(ib != null){
             MobLoot toAdd = new MobLoot(mob,ib,false);
             mob.getCharItemManager().addItemToInventory(toAdd);
@@ -453,7 +477,27 @@ public enum LootManager {
         if (suffixMod == null)
             return inItem;
 
-        if (suffixMod.action.length() > 0) {
+        int moveSpeedRoll = ThreadLocalRandom.current().nextInt(100);
+        if(inItem.getItemBase().getValidSlot() == MBServerStatics.SLOT_FEET && moveSpeedRoll < 10){
+            int rankRoll = ThreadLocalRandom.current().nextInt(10);
+            String suffixSpeed = "SUF-148";
+            switch(rankRoll) {
+                case 1:
+                case 2:
+                case 3:
+                    suffixSpeed = "SUF-149";
+                    break;
+                case 4:
+                case 5:
+                case 6:
+                case 7:
+                    suffixSpeed = "SUF-150";
+                    break;
+
+            }
+            inItem.setSuffix(suffixSpeed);
+            inItem.addPermanentEnchantment(suffixSpeed, 0, suffixMod.level, false);
+        }else if (suffixMod.action.length() > 0) {
             inItem.setSuffix(suffixMod.action);
             inItem.addPermanentEnchantment(suffixMod.action, 0, suffixMod.level, false);
         }
@@ -565,7 +609,7 @@ public enum LootManager {
                 ItemBase itemBase = me.getItemBase();
                 if(isVorg) {
                     mob.spawnTime = ThreadLocalRandom.current().nextInt(300, 2700);
-                    dropChance = 10;
+                    dropChance = 7.5f;
                     itemBase = getRandomVorg(itemBase);
                 }
                 if (equipmentRoll > dropChance)
@@ -598,6 +642,82 @@ public enum LootManager {
         }
     }
 
+    public static void newFatePeddler(PlayerCharacter playerCharacter, Item gift) {
+
+        CharacterItemManager itemMan = playerCharacter.getCharItemManager();
+
+        if (itemMan == null)
+            return;
+
+        //check if player owns the gift he is trying to open
+
+        if (!itemMan.doesCharOwnThisItem(gift.getObjectUUID()))
+            return;
+
+        ItemBase ib = gift.getItemBase();
+
+        MobLoot winnings = null;
+
+        if (ib == null)
+            return;
+        switch (ib.getUUID()) {
+            case 971070: //wrapped rune
+                ItemBase runeBase = null;
+                int roll = ThreadLocalRandom.current().nextInt(static_rune_ids.size() + 1);
+                int itemId = static_rune_ids.get(0);
+                try {
+                    itemId = static_rune_ids.get(roll);
+                }catch(Exception e){
+
+                }
+                runeBase = ItemBase.getItemBase(itemId);
+                if(runeBase != null) {
+                    winnings = new MobLoot(playerCharacter, runeBase, 1, false);
+                }
+                break;
+            case 971012: //wrapped glass
+                int chance = ThreadLocalRandom.current().nextInt(100);
+                if(chance == 50){
+                    int ID = 7000000;
+                    int additional = ThreadLocalRandom.current().nextInt(0,28);
+                    ID += (additional * 10);
+                    ItemBase glassBase = ItemBase.getItemBase(ID);
+                    if(glassBase != null) {
+                        winnings = new MobLoot(playerCharacter, glassBase, 1, false);
+                        ChatManager.chatSystemInfo(playerCharacter, "You've Won A " + glassBase.getName());
+                    }
+                }else{
+                    ChatManager.chatSystemInfo(playerCharacter, "Please Try Again!");
+                }
+                break;
+        }
+
+        if (winnings == null) {
+            itemMan.consume(gift);
+            itemMan.updateInventory();
+            return;
+        }
+
+        //early exit if the inventory of the player will not hold the item
+
+        if (!itemMan.hasRoomInventory(winnings.getItemBase().getWeight())) {
+            ErrorPopupMsg.sendErrorPopup(playerCharacter, 21);
+            return;
+        }
+
+        winnings.setIsID(true);
+
+        //remove gift from inventory
+
+        itemMan.consume(gift);
+
+        //add winnings to player inventory
+
+        Item playerWinnings = winnings.promoteToItem(playerCharacter);
+        itemMan.addItemToInventory(playerWinnings);
+        itemMan.updateInventory();
+
+    }
     public static void peddleFate(PlayerCharacter playerCharacter, Item gift) {
 
         //get table ID for the itembase ID
@@ -701,7 +821,7 @@ public enum LootManager {
     public static ItemBase getRandomVorg(ItemBase itemBase){
         int roll = 0;
         if(vorg_ha_uuids.contains(itemBase.getUUID())) {
-            roll = ThreadLocalRandom.current().nextInt(0, 10);
+            roll = ThreadLocalRandom.current().nextInt(0, 9);
             switch (roll) {
                 case 1:
                     return ItemBase.getItemBase(vorg_ha_uuids.get(0));
@@ -725,7 +845,7 @@ public enum LootManager {
         }
 
         if(vorg_ma_uuids.contains(itemBase.getUUID())) {
-            roll = ThreadLocalRandom.current().nextInt(0, 10);
+            roll = ThreadLocalRandom.current().nextInt(0, 8);
             switch (roll) {
                 case 1:
                     return ItemBase.getItemBase(vorg_ma_uuids.get(0));
@@ -747,7 +867,7 @@ public enum LootManager {
         }
 
         if(vorg_la_uuids.contains(itemBase.getUUID())) {
-            roll = ThreadLocalRandom.current().nextInt(0, 10);
+            roll = ThreadLocalRandom.current().nextInt(0, 8);
             switch (roll) {
                 case 1:
                     return ItemBase.getItemBase(vorg_la_uuids.get(0));
@@ -769,7 +889,7 @@ public enum LootManager {
         }
 
         if(vorg_cloth_uuids.contains(itemBase.getUUID())) {
-            roll = ThreadLocalRandom.current().nextInt(0, 10);
+            roll = ThreadLocalRandom.current().nextInt(0, 5);
             switch (roll) {
                 case 1:
                     return ItemBase.getItemBase(vorg_cloth_uuids.get(0));

src/engine/gameManager/MovementManager.java

@@ -67,8 +67,10 @@ public enum MovementManager {
             return;
 
         if (toMove.getObjectType().equals(GameObjectType.PlayerCharacter)) {
-            if (((PlayerCharacter) toMove).isCasting())
-                ((PlayerCharacter) toMove).update(false);
+            if (((PlayerCharacter) toMove).isCasting()) {
+                ((PlayerCharacter) toMove).updateLocation();
+                ((PlayerCharacter) toMove).updateMovementState();
+            }
         }
 
 
@@ -408,7 +410,9 @@ public enum MovementManager {
             if (bonus.getBool(ModType.Stunned, SourceType.None) || bonus.getBool(ModType.CannotMove, SourceType.None))
                 continue;
 
-            member.update(false);
+            //member.update(false);
+            member.updateLocation();
+            member.updateMovementState();
 
 
             // All checks passed, let's move the player

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

@@ -10,6 +10,7 @@ package engine.gameManager;
 
 import engine.Enum.*;
 import engine.InterestManagement.HeightMap;
+import engine.InterestManagement.InterestManager;
 import engine.InterestManagement.WorldGrid;
 import engine.db.handlers.dbEffectsBaseHandler;
 import engine.db.handlers.dbPowerHandler;
@@ -165,12 +166,26 @@ public enum PowersManager {
 
         PlayerCharacter pc = SessionManager.getPlayerCharacter(origin);
 
-        if(!PlayerManager.isFlying(pc)) //cant be sitting if flying
+        if(pc == null)
+            return;
+
+        if(!pc.isFlying() && powersBaseByToken.get(msg.getPowerUsedID()) != null && powersBaseByToken.get(msg.getPowerUsedID()).isSpell) //cant be sitting if flying
             CombatManager.toggleSit(false,origin);
 
         if(pc.isMoving())
             pc.stopMovement(pc.getMovementLoc());
 
+        if(msg.getPowerUsedID() == 429429978){
+            applyPower(origin.getPlayerCharacter(),origin.getPlayerCharacter(),origin.getPlayerCharacter().getLoc(),429429978,msg.getNumTrains(),false);
+            origin.getPlayerCharacter().getRecycleTimers().remove(429429978);
+            return;
+        }
+
+        if(!origin.getPlayerCharacter().getPowers().containsKey(msg.getPowerUsedID())){
+            Logger.error(origin.getPlayerCharacter().getFirstName() + " attempted to cast a power they do not have");
+            return;
+        }
+
         if (usePowerA(msg, origin, sendCastToSelf)) {
             // Cast failed for some reason, reset timer
 
@@ -197,7 +212,8 @@ public enum PowersManager {
         msg.setUnknown04(1);
 
         if (useMobPowerA(msg, caster)) {
-            //sendMobPowerMsg(caster,2,msg); //Lol wtf was i thinking sending msg's to mobs... ZZZZ
+            if(pb.token == -1994153779)
+                InterestManager.setObjectDirty(caster);
         }
     }
 
@@ -216,16 +232,16 @@ public enum PowersManager {
             City city = ZoneManager.getCityAtLocation(playerCharacter.loc);
             if (city == null) {
                 failed = true;
-            }else{
-                Bane bane = city.getBane();
-                if (bane == null) {
-                    failed = true;
-                }else{
-                    if(!bane.getSiegePhase().equals(SiegePhase.WAR)){
-                        failed = true;
-                    }
-                }
-            }
+            }//else{
+             //   Bane bane = city.getBane();
+             //   if (bane == null) {
+             //       failed = true;
+             //   }else{
+             //       if(!bane.getSiegePhase().equals(SiegePhase.WAR)){
+             //           failed = true;
+             //       }
+             //   }
+            //}
             if(failed){
                 //check to see if we are at an active mine
                 Zone zone = ZoneManager.findSmallestZone(playerCharacter.loc);
@@ -242,8 +258,15 @@ public enum PowersManager {
                 }
             }
 
-            if(failed)
+            if(failed) {
+                playerCharacter.setIsCasting(false);
+
+                RecyclePowerMsg recyclePowerMsg = new RecyclePowerMsg(msg.getPowerUsedID());
+                Dispatch dispatch = Dispatch.borrow(playerCharacter, recyclePowerMsg);
+                DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
+
                 return false;
+            }
         }
 
         if (MBServerStatics.POWERS_DEBUG) {
@@ -294,7 +317,7 @@ public enum PowersManager {
         }
 
         //check for movement buffs while flying
-        if(PlayerManager.isFlying(playerCharacter)) {
+        if(playerCharacter.isFlying()) {
             switch(pb.token){
                 case 429005674:
                 case 429505739:
@@ -329,17 +352,18 @@ public enum PowersManager {
 
 
         // Check powers for normal users
-        if (playerCharacter.getPowers() == null || !playerCharacter.getPowers().containsKey(msg.getPowerUsedID()))
-            if (!playerCharacter.isCSR()) {
-                if (!MBServerStatics.POWERS_DEBUG) {
-                    //  ChatManager.chatSayInfo(pc, "You may not cast that spell!");
-
-                    Logger.info("usePowerA(): Cheat attempted? '" + msg.getPowerUsedID() + "' was not associated with " + playerCharacter.getName());
-                    return true;
-                }
-            } else
-                CSRCast = true;
+        if(msg.getPowerUsedID() != 421084024) {
+            if (playerCharacter.getPowers() == null || !playerCharacter.getPowers().containsKey(msg.getPowerUsedID()))
+                if (!playerCharacter.isCSR()) {
+                    if (!MBServerStatics.POWERS_DEBUG) {
+                        //  ChatManager.chatSayInfo(pc, "You may not cast that spell!");
 
+                        Logger.info("usePowerA(): Cheat attempted? '" + msg.getPowerUsedID() + "' was not associated with " + playerCharacter.getName());
+                        return true;
+                    }
+                } else
+                    CSRCast = true;
+        }
         // get numTrains for power
         int trains = msg.getNumTrains();
 
@@ -349,8 +373,10 @@ public enum PowersManager {
             msg.setNumTrains(trains);
         }
 
+        //double stack point values for some useless disc spells
         switch(pb.token){
             case 429420458: // BH eyes
+            case 429601664: // huntsman skin the beast
                 msg.setNumTrains(msg.getNumTrains() * 2);
                 break;
         }
@@ -490,6 +516,23 @@ public enum PowersManager {
                 }
             }
 
+            if(!passed){
+                if (playerCharacter.getRace().getName().contains("Shade")) {
+                    if(playerCharacter.getHidden() > 0){
+                        switch(msg.getPowerUsedID()){
+                            case -1851459567:
+                            case 2094922127:
+                            case -355707373:
+                            case 246186475:
+                            case 666419835:
+                            case 1480354319:
+                                passed = true;
+                                break;
+                        }
+                    }
+                }
+            }
+
             if (!passed)
                 return true;
         }
@@ -602,12 +645,12 @@ public enum PowersManager {
         }
 
         // update cast (use skill) fail condition
-        if(pb.token != 429396028) {
+        if(pb.token != 429396028 && pb.breaksForm) {
             playerCharacter.cancelOnCast();
         }
 
         // update castSpell (use spell) fail condition if spell
-        if (pb.isSpell())
+        if (pb.isSpell() && pb.breaksForm)
             playerCharacter.cancelOnSpell();
 
         // get cast time in ms.
@@ -748,10 +791,11 @@ public enum PowersManager {
 
         // make person casting stand up if spell (unless they're casting a chant which does not make them stand up)
         // update cast (use skill) fail condition
-        caster.cancelOnCast();
+        if(pb.breaksForm)
+            caster.cancelOnCast();
 
         // update castSpell (use spell) fail condition if spell
-        if (pb.isSpell())
+        if (pb.isSpell() && pb.breaksForm)
             caster.cancelOnSpell();
 
         // get cast time in ms.
@@ -787,17 +831,35 @@ 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() == 429494441) {//wildkins chase
+        //handle sprint for bard sprint
+        if(msg.getPowerUsedID() == 429005674){
+            msg.setPowerUsedID(429611355);
+        }
+
+        //handle root and snare break for wildkin's chase
+        if(msg.getPowerUsedID() == 429494441) {
             playerCharacter.removeEffectBySource(EffectSourceType.Root,40,true);
             playerCharacter.removeEffectBySource(EffectSourceType.Snare,40,true);
         }
+
+        //handle power block portion for shade hide
+        if(playerCharacter.getRace().getName().contains("Shade")) {
+            if (msg.getPowerUsedID() == 429407306 || msg.getPowerUsedID() == 429495514) {
+                int trains = msg.getNumTrains() - 1;
+                if (trains < 1)
+                    trains = 1;
+                applyPower(playerCharacter, playerCharacter, playerCharacter.loc, 429397210, trains, false);
+                playerCharacter.removeEffectBySource(EffectSourceType.Invisibility,40,true);
+                applyPower(playerCharacter, playerCharacter, playerCharacter.loc, msg.getPowerUsedID(), msg.getNumTrains(), false);
+            }
+        }
+        if(msg.getTargetType() == GameObjectType.PlayerCharacter.ordinal()) {
+            PlayerCharacter target = PlayerCharacter.getPlayerCharacter(msg.getTargetID());
+            if (msg.getPowerUsedID() == 429601664)
+                if(target.getPromotionClassID() != 2516)//templar
+                    PlayerCharacter.getPlayerCharacter(msg.getTargetID()).removeEffectBySource(EffectSourceType.Transform, msg.getNumTrains(), true);
+        }
+
         if (playerCharacter.isCasting()) {
             playerCharacter.update(false);
             playerCharacter.updateStamRegen(-100);
@@ -839,6 +901,9 @@ public enum PowersManager {
             return;
         }
 
+        if(pb.targetSelf)
+            msg.setTargetID(playerCharacter.getObjectUUID());
+
         int trains = msg.getNumTrains();
 
         // verify player is not stunned or power type is blocked
@@ -1363,7 +1428,7 @@ public enum PowersManager {
         if (pc == null)
             return;
 
-        PlayerCharacter source = PlayerManager.getFromCache(msg.getSourceID());
+        PlayerCharacter source = PlayerCharacter.getFromCache(msg.getSourceID());
         if (source == null)
             return;
 
@@ -1566,17 +1631,28 @@ public enum PowersManager {
 
         // create list of characters
         HashSet<AbstractCharacter> trackChars;
-        switch(msg.getPowerToken()){
-            case 431511776:
-            case 429578587:
-            case 429503360:
-                trackChars = getTrackList(playerCharacter);
-                break;
-            default:
-                trackChars = RangeBasedAwo.getTrackList(allTargets, playerCharacter, maxTargets);
-                break;
+
+        PowersBase trackPower = PowersManager.getPowerByToken(msg.getPowerToken());
+        if(trackPower != null && trackPower.category.equals("TRACK")){
+            trackChars = getTrackList(playerCharacter);
+        }else{
+            trackChars = RangeBasedAwo.getTrackList(allTargets, playerCharacter, maxTargets);
         }
 
+
+
+        //switch(msg.getPowerToken()){
+        //    case 431511776: // Hunt Foe Huntress
+        //    case 429578587: // Hunt Foe Scout
+        //    case 429503360: // Track Huntsman
+        //    case 44106356: //
+        //        trackChars = getTrackList(playerCharacter);
+        //        break;
+        //    default:
+        //        trackChars = RangeBasedAwo.getTrackList(allTargets, playerCharacter, maxTargets);
+        //        break;
+        //}
+
         TrackWindowMsg trackWindowMsg = new TrackWindowMsg(msg);
 
         // send track window
@@ -2367,7 +2443,8 @@ public enum PowersManager {
     public static boolean testAttack(PlayerCharacter pc, AbstractWorldObject awo,
                                      PowersBase pb, PerformActionMsg msg) {
         // Get defense for target
-        float atr = CharacterSkill.getATR(pc, pb.getSkillName());
+        //float atr = CharacterSkill.getATR(pc, pb.getSkillName());
+        float atr = PlayerCombatStats.getSpellAtr(pc, pb);
         float defense;
 
         if (AbstractWorldObject.IsAbstractCharacter(awo)) {
@@ -2408,6 +2485,13 @@ public enum PowersManager {
                     dodgeMsg.setTargetID(awo.getObjectUUID());
                     sendPowerMsg(pc, 4, dodgeMsg);
                     return true;
+                } else if (testPassive(pc, tarAc, "Block")) {
+                    // Dodge fired, send dodge message
+                    PerformActionMsg dodgeMsg = new PerformActionMsg(msg);
+                    dodgeMsg.setTargetType(awo.getObjectType().ordinal());
+                    dodgeMsg.setTargetID(awo.getObjectUUID());
+                    sendPowerMsg(pc, 4, dodgeMsg);
+                    return true;
                 }
             }
             return false;
@@ -2455,7 +2539,12 @@ public enum PowersManager {
             if (AbstractWorldObject.IsAbstractCharacter(awo)) {
                 AbstractCharacter tarAc = (AbstractCharacter) awo;
                 // Handle Dodge passive
-                return testPassive(caster, tarAc, "Dodge");
+                boolean passiveFired = false;
+                passiveFired =  testPassive(caster, tarAc, "Dodge");
+                if(!passiveFired)
+                    passiveFired =  testPassive(caster, tarAc, "Block");
+
+                return passiveFired;
             }
             return false;
         } else
@@ -2844,6 +2933,127 @@ public enum PowersManager {
         }
     }
 
+    public static boolean breakForm(int token) {
+        switch (token) {
+            case 429505865:
+            case 429407561:
+            case 429492073:
+            case 429644123:
+            case 429393769:
+            case 429545819:
+            case 429426537:
+            case 429590377:
+            case 429508425:
+            case 429541193:
+            case 429573961:
+            case 427924330:
+            case 429402918:
+            case 429545688:
+            case 429005674:
+            case 429637823:
+            case 429590426:
+            case 428066972:
+            case 429441862:
+            case 431611756:
+            case 431578988:
+            case 429502506:
+            case 429398191:
+            case 429447384:
+            case 428892191:
+            case 431579167:
+            case 430977067:
+            case 429409100:
+            case 429441868:
+            case 429594877:
+            case 427908971:
+            case 683741153:
+            case 429770569:
+            case 429452379:
+            case 429605055:
+            case 429086971:
+            case 429443230:
+            case 429505400:
+            case 429492122:
+            case 429643992:
+            case 550062236:
+            case 429498252:
+            case 429611224:
+            case 429441834:
+            case 428918940:
+            case 429633739:
+            case 429633579:
+            case 429568043:
+            case 429048646:
+            case 428392639:
+            case 428425407:
+            case 429054168:
+            case 429021400:
+            case 428955864:
+            case 429119704:
+            case 428890328:
+            case 428923096:
+            case 429218008:
+            case 429086936:
+            case 428988632:
+            case 428688204:
+            case 429514603:
+            case 428924959:
+            case 429393818:
+            case 429720966:
+            case 428982463:
+            case 427933887:
+            case 429572287:
+            case 429501222:
+            case 430694431:
+            case 429436131:
+            case 430006124:
+            case 429611355:
+            case 428005600:
+            case 427935608:
+            case 428949695:
+            case 427988218:
+            case 429414616:
+            case 429496495:
+            case 429428796:
+            case 563795754:
+            case 428988217:
+            case 429432716:
+            case 428955899:
+            case 429393286:
+            case 550062220:
+            case 429495557:
+            case 429401278:
+            case 428377478:
+            case 429409094:
+            case 428191947:
+            case 429434474:
+            case 429403363:
+            case 429512920:
+            case 429419611:
+            case 429645676:
+            case 429602895:
+            case 429605071:
+            case 429592428:
+            case 429500010:
+            case 429406602:
+            case 429426586:
+            case 429633898:
+            case 550062212:
+            case 429994027:
+            case 430813227:
+            case 429928491:
+            case 430026795:
+            case 429517915:
+            case 431854842:
+            case 429767544:
+            case 429502507:
+            case 428398816:
+            case 429446315:
+            case 429441979:
+                return false;
+        }
+        return true;
+    }
 }
 
 

src/engine/gameManager/SimulationManager.java

@@ -93,13 +93,10 @@ public enum SimulationManager {
         }
         try {
 
-            if ((_updatePulseTime != 0)
-                    && (System.currentTimeMillis() > _updatePulseTime))
+            if ((_updatePulseTime != 0) && (System.currentTimeMillis() > _updatePulseTime))
                 pulseUpdate();
         } catch (Exception e) {
-            Logger.error(
-                    "Fatal error in Update Pulse: DISABLED");
-            //  _runegatePulseTime = 0;
+            Logger.error("Fatal error in Update Pulse: DISABLED");
         }
 
         try {
@@ -160,7 +157,11 @@ public enum SimulationManager {
 
             if (player == null)
                 continue;
-            player.update(false);
+            try {
+                player.update(false);
+            }catch(Exception e){
+
+            }
         }
 
         _updatePulseTime = System.currentTimeMillis() + 500;

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/job/AbstractJob.java

@@ -68,7 +68,7 @@ public abstract class AbstractJob implements Runnable {
         this.markStopRunTime();
     }
 
-    protected abstract void doJob();
+    public abstract void doJob();
 
     public void executeJob(String threadName) {
         this.workerID.set(threadName);

src/engine/job/AbstractScheduleJob.java

@@ -17,7 +17,7 @@ public abstract class AbstractScheduleJob extends AbstractJob {
     }
 
     @Override
-    protected abstract void doJob();
+    public abstract void doJob();
 
     public void cancelJob() {
         JobScheduler.getInstance().cancelScheduledJob(this);

src/engine/job/JobContainer.java

@@ -16,7 +16,7 @@ public class JobContainer implements Comparable<JobContainer> {
     final long timeOfExecution;
     final boolean noTimer;
 
-    JobContainer(AbstractJob job, long timeOfExecution) {
+    public JobContainer(AbstractJob job, long timeOfExecution) {
         if (job == null) {
             throw new IllegalArgumentException("No 'null' jobs allowed.");
         }

src/engine/job/JobThread.java

@@ -0,0 +1,75 @@
+package engine.job;
+
+import engine.server.world.WorldServer;
+import org.pmw.tinylog.Logger;
+
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.ReentrantLock;
+
+public class JobThread implements Runnable {
+    private final AbstractJob currentJob;
+    private final ReentrantLock lock = new ReentrantLock();
+
+    private static Long nextThreadPrint;
+
+    public JobThread(AbstractJob job){
+        this.currentJob = job;
+    }
+
+    @Override
+    public void run() {
+        try {
+            if (this.currentJob != null) {
+                if (lock.tryLock(5, TimeUnit.SECONDS)) { // Timeout to prevent deadlock
+                    try {
+                        this.currentJob.doJob();
+                    } finally {
+                        lock.unlock();
+                    }
+                } else {
+                    Logger.warn("JobThread could not acquire lock in time, skipping job.");
+                }
+            }
+        } catch (Exception e) {
+            Logger.error(e);
+        }
+    }
+
+    public static void startJobThread(AbstractJob job){
+        JobThread jobThread = new JobThread(job);
+        Thread thread = new Thread(jobThread);
+        thread.setName("JOB THREAD: " + job.getWorkerID());
+        thread.start();
+
+       if(JobThread.nextThreadPrint == null){
+           JobThread.nextThreadPrint = System.currentTimeMillis();
+       }else{
+           if(JobThread.nextThreadPrint < System.currentTimeMillis()){
+               JobThread.tryPrintThreads();
+               JobThread.nextThreadPrint = System.currentTimeMillis() + 10000L;
+           }
+       }
+    }
+
+    public static void tryPrintThreads(){
+        ThreadGroup rootGroup = Thread.currentThread().getThreadGroup();
+        while (rootGroup.getParent() != null) {
+            rootGroup = rootGroup.getParent();
+        }
+
+        // Estimate the number of threads
+        int activeThreads = rootGroup.activeCount();
+
+        // Create an array to hold the threads
+        Thread[] threads = new Thread[activeThreads];
+
+        // Get the active threads
+        rootGroup.enumerate(threads, true);
+
+        int availableThreads = Runtime.getRuntime().availableProcessors();
+
+        // Print the count
+        if(threads.length > 30)
+            Logger.info("Total threads in application: " + threads.length + " / " + availableThreads);
+    }
+}

src/engine/job/JobWorker.java

@@ -58,10 +58,13 @@ public class JobWorker extends ControlledRunnable {
             } else {
 
                 // execute the new job..
-                this.currentJob.executeJob(this.getThreadName());
-                this.currentJob = null;
+                //this.currentJob.executeJob(this.getThreadName());
+                if(this.currentJob != null) {
+                    JobThread.startJobThread(this.currentJob);
+                    this.currentJob = null;
+                }
             }
-
+            Thread.yield();
         }
         return true;
     }

src/engine/jobs/AbstractEffectJob.java

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

src/engine/jobs/ActivateBaneJob.java

@@ -29,7 +29,7 @@ public class ActivateBaneJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         City city;
 

src/engine/jobs/AttackJob.java

@@ -27,7 +27,7 @@ public class AttackJob extends AbstractJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         CombatManager.doCombat(this.source, slot);
     }
 

src/engine/jobs/BaneDefaultTimeJob.java

@@ -24,7 +24,7 @@ public class BaneDefaultTimeJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         //bane already set.
         if (this.bane.getLiveDate() != null) {

src/engine/jobs/BasicScheduledJob.java

@@ -97,7 +97,7 @@ public class BasicScheduledJob extends AbstractJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         if (execution == null) {
             Logger.error("BasicScheduledJob executed with nothing to execute.");
             return;

src/engine/jobs/BonusCalcJob.java

@@ -22,7 +22,7 @@ public class BonusCalcJob extends AbstractJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         if (this.ac != null) {
             this.ac.applyBonuses();
 

src/engine/jobs/CSessionCleanupJob.java

@@ -22,7 +22,7 @@ public class CSessionCleanupJob extends AbstractJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         SessionManager.cSessionCleanup(secKey);
     }
 }

src/engine/jobs/ChangeAltitudeJob.java

@@ -27,7 +27,7 @@ public class ChangeAltitudeJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         if (this.ac != null)
             MovementManager.finishChangeAltitude(ac, targetAlt);
     }

src/engine/jobs/ChantJob.java

@@ -36,7 +36,7 @@ public class ChantJob extends AbstractEffectJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         if (this.aej == null || this.source == null || this.target == null || this.action == null || this.power == null || this.source == null || this.eb == null)
             return;
         PlayerBonuses bonuses = null;

src/engine/jobs/CloseGateJob.java

@@ -29,7 +29,7 @@ public class CloseGateJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         if (building == null) {
             Logger.error("Rungate building was null");

src/engine/jobs/DamageOverTimeJob.java

@@ -37,7 +37,7 @@ public class DamageOverTimeJob extends AbstractEffectJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         if (this.target.getObjectType().equals(GameObjectType.Building)
                 && ((Building) this.target).isVulnerable() == false) {
             _cancelJob();
@@ -60,6 +60,8 @@ public class DamageOverTimeJob extends AbstractEffectJob {
 
         if (this.iteration < 0) {
             PowersManager.finishEffectTime(this.source, this.target, this.action, this.trains);
+            if (AbstractWorldObject.IsAbstractCharacter(source))
+                eb.startEffect((AbstractCharacter) this.source, this.target, this.trains, this);
             return;
         }
         this.skipSendEffect = true;

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;
@@ -29,7 +28,7 @@ public class DatabaseUpdateJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         if (this.ago == null)
             return;
         ago.removeDatabaseJob(this.type, false);
@@ -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/DebugTimerJob.java

@@ -29,7 +29,7 @@ public class DebugTimerJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         if (this.pc == null) {
             return;
         }

src/engine/jobs/DeferredPowerJob.java

@@ -37,7 +37,7 @@ public class DeferredPowerJob extends AbstractEffectJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         //Power ended with no attack, cancel weapon power boost
         if (this.source != null && this.source instanceof PlayerCharacter) {
             ((PlayerCharacter) this.source).setWeaponPower(null);

src/engine/jobs/DisconnectJob.java

@@ -22,7 +22,7 @@ public class DisconnectJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         if (this.origin != null) {
             this.origin.disconnect();
         }

src/engine/jobs/DoorCloseJob.java

@@ -28,7 +28,7 @@ public class DoorCloseJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         int doorNumber;
 

src/engine/jobs/EndFearJob.java

@@ -22,7 +22,7 @@ public class EndFearJob extends AbstractEffectJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         //cancel fear for mob.
 

src/engine/jobs/FinishCooldownTimeJob.java

@@ -26,7 +26,7 @@ public class FinishCooldownTimeJob extends AbstractJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         PowersManager.finishCooldownTime(this.msg, this.pc);
     }
 }

src/engine/jobs/FinishEffectTimeJob.java

@@ -22,7 +22,7 @@ public class FinishEffectTimeJob extends AbstractEffectJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         PowersManager.finishEffectTime(this.source, this.target, this.action, this.trains);
     }
 

src/engine/jobs/FinishRecycleTimeJob.java

@@ -26,7 +26,7 @@ public class FinishRecycleTimeJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         PowersManager.finishRecycleTime(this.msg, this.pc, false);
     }
 

src/engine/jobs/FinishSpireEffectJob.java

@@ -20,7 +20,7 @@ public class FinishSpireEffectJob extends AbstractEffectJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         PlayerCharacter pc = (PlayerCharacter) target;
 

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;
@@ -31,7 +31,7 @@ public class FinishSummonsJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         if (this.target == null)
             return;
@@ -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/LoadEffectsJob.java

@@ -28,7 +28,7 @@ public class LoadEffectsJob extends AbstractJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         if (this.originToSend == null) {
             return;
         }

src/engine/jobs/LogoutCharacterJob.java

@@ -25,7 +25,7 @@ public class LogoutCharacterJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         server.logoutCharacter(this.pc);
     }
 

src/engine/jobs/NoTimeJob.java

@@ -19,7 +19,7 @@ public class NoTimeJob extends AbstractEffectJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
     }
 
     @Override

src/engine/jobs/PersistentAoeJob.java

@@ -40,7 +40,7 @@ public class PersistentAoeJob extends AbstractEffectJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         if (this.aej == null || this.source == null || this.action == null || this.power == null || this.source == null || this.eb == null)
             return;

src/engine/jobs/RefreshGroupJob.java

@@ -45,7 +45,7 @@ public class RefreshGroupJob extends AbstractJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         if (this.pc == null || this.origin == null || grp == null) {
             return;

src/engine/jobs/RemoveCorpseJob.java

@@ -22,7 +22,7 @@ public class RemoveCorpseJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         if (this.corpse != null)
             Corpse.removeCorpse(corpse, true);

src/engine/jobs/SiegeSpireWithdrawlJob.java

@@ -25,7 +25,7 @@ public class SiegeSpireWithdrawlJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         if (spire == null)
             return;

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;
@@ -31,7 +30,7 @@ public class StuckJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         Vector3fImmutable stuckLoc;
         Building building = null;
@@ -70,7 +69,7 @@ public class StuckJob extends AbstractScheduleJob {
             return;
         }
 
-        PlayerManager.teleport(player, stuckLoc);
+        player.teleport(stuckLoc);
 
     }
 

src/engine/jobs/SummonSendJob.java

@@ -27,7 +27,7 @@ public class SummonSendJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         if (this.source == null)
             return;

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;
@@ -40,7 +39,7 @@ public class TeleportJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         if (this.pc == null || this.npc == null || this.origin == null)
             return;
@@ -53,7 +52,7 @@ public class TeleportJob extends AbstractScheduleJob {
             return;
         }
 
-        PlayerManager.teleport(pc, loc);
+        pc.teleport(loc);
 
         if (this.setSafeMode)
             pc.setSafeMode();

src/engine/jobs/TrackJob.java

@@ -35,7 +35,7 @@ public class TrackJob extends AbstractEffectJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         if (this.tpa == null || this.target == null || this.action == null || this.source == null || this.eb == null || !(this.source instanceof PlayerCharacter))
             return;

src/engine/jobs/TransferStatOTJob.java

@@ -29,7 +29,7 @@ public class TransferStatOTJob extends AbstractEffectJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         if (this.dot == null || this.target == null || this.action == null || this.source == null || this.eb == null || this.action == null || this.power == null)
             return;
         if (!this.target.isAlive()) {

src/engine/jobs/UpdateGroupJob.java

@@ -26,7 +26,7 @@ public class UpdateGroupJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         if (this.group == null)
             return;

src/engine/jobs/UpgradeBuildingJob.java

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

src/engine/jobs/UpgradeNPCJob.java

@@ -27,7 +27,7 @@ public class UpgradeNPCJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         int newRank;
 

src/engine/jobs/UseItemJob.java

@@ -34,7 +34,7 @@ public class UseItemJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         PowersManager.finishApplyPower(ac, target, Vector3fImmutable.ZERO, pb, trains, liveCounter);
     }
 

src/engine/jobs/UseMobPowerJob.java

@@ -35,7 +35,7 @@ public class UseMobPowerJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         PowersManager.finishUseMobPower(this.msg, this.caster, casterLiveCounter, targetLiveCounter);
     }
 

src/engine/jobs/UsePowerJob.java

@@ -35,7 +35,7 @@ public class UsePowerJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         PowersManager.finishUsePower(this.msg, this.pc, casterLiveCounter, targetLiveCounter);
     }
 

src/engine/mobileAI/MobAI.java

@@ -9,6 +9,7 @@
 package engine.mobileAI;
 
 import engine.Enum;
+import engine.InterestManagement.InterestManager;
 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.UpdateStateMsg;
 import engine.objects.*;
 import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
@@ -46,18 +49,19 @@ public class MobAI {
                 return;
             }
 
-            if (target.getObjectType() == Enum.GameObjectType.PlayerCharacter && canCast(mob)) {
+            //mob casting disabled
+            //if (target.getObjectType() == Enum.GameObjectType.PlayerCharacter && canCast(mob)) {
 
-                if (mob.isPlayerGuard() == false && MobCast(mob)) {
-                    mob.updateLocation();
-                    return;
-                }
+                //if (mob.isPlayerGuard() == false && MobCast(mob)) {
+                //    mob.updateLocation();
+                //    return;
+                //}
 
-                if (mob.isPlayerGuard() == true && GuardCast(mob)) {
-                    mob.updateLocation();
-                    return;
-                }
-            }
+                //if (mob.isPlayerGuard() == true && GuardCast(mob)) {
+                //    mob.updateLocation();
+                //    return;
+                //}
+            //}
 
             if (!CombatUtilities.inRangeToAttack(mob, target))
                 return;
@@ -82,7 +86,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);
                     }
@@ -103,10 +107,16 @@ public class MobAI {
                 return;
             }
 
+            if(target.getPet() != null && target.getPet().isAlive() && !target.getPet().isSiege()){
+                mob.setCombatTarget(target.getPet());
+                AttackTarget(mob,mob.combatTarget);
+                return;
+            }
+
             if (mob.BehaviourType.callsForHelp)
                 MobCallForHelp(mob);
 
-            if (!MovementUtilities.inRangeDropAggro(mob, target)) {
+            if (MovementUtilities.outOfAggroRange(mob, target)) {
                 mob.setCombatTarget(null);
                 return;
             }
@@ -153,6 +163,12 @@ public class MobAI {
                 if (target.getPet().getCombatTarget() == null && target.getPet().assist == true)
                     target.getPet().setCombatTarget(mob);
 
+            try{
+                InterestManager.forceLoad(mob);
+            }catch(Exception e){
+
+            }
+
         } catch (Exception e) {
             Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackPlayer" + " " + e.getMessage());
         }
@@ -168,14 +184,14 @@ public class MobAI {
 
             if (target.getRank() == -1 || !target.isVulnerable() || BuildingManager.getBuildingFromCache(target.getObjectUUID()) == null) {
                 mob.setCombatTarget(null);
-            return;
+                return;
             }
 
             City playercity = ZoneManager.getCityAtLocation(mob.getLoc());
 
             if (playercity != null)
                 for (Mob guard : playercity.getParent().zoneMobSet)
-                    if (guard.BehaviourType != null && guard.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardCaptain.ordinal())
+                    if (guard.BehaviourType != null && guard.BehaviourType.equals(Enum.MobBehaviourType.GuardCaptain))
                         if (guard.getCombatTarget() == null && guard.getGuild() != null && mob.getGuild() != null && !guard.getGuild().equals(mob.getGuild()))
                             guard.setCombatTarget(mob);
 
@@ -318,28 +334,32 @@ public class MobAI {
             if (mob == null)
                 return false;
 
-            if(mob.isPlayerGuard == true){
+            if (mob.nextCastTime == 0)
+                mob.nextCastTime = System.currentTimeMillis() - 1000L;
 
-                int contractID;
+            if(mob.nextCastTime > System.currentTimeMillis())
+                return false;
 
-                if(mob.BehaviourType.equals(Enum.MobBehaviourType.GuardMinion))
+            if(mob.isPlayerGuard){
+
+                int contractID = 0;
+
+                if(mob.BehaviourType.equals(Enum.MobBehaviourType.GuardMinion) && mob.npcOwner != null)
                     contractID = mob.npcOwner.contract.getContractID();
-                 else
+                 else if(mob.contract != null)
                     contractID = mob.contract.getContractID();
 
-                if(Enum.MinionType.ContractToMinionMap.get(contractID).isMage() == false)
+                if(Enum.MinionType.ContractToMinionMap.containsKey(contractID) && !Enum.MinionType.ContractToMinionMap.get(contractID).isMage())
                     return false;
             }
 
-            if (mob.mobPowers.isEmpty())
+            if (mob.mobPowers == null || mob.mobPowers.isEmpty())
                 return false;
 
             if (!mob.canSee((PlayerCharacter) mob.getCombatTarget())) {
                 mob.setCombatTarget(null);
                 return false;
             }
-            if (mob.nextCastTime == 0)
-                mob.nextCastTime = System.currentTimeMillis();
 
             return mob.nextCastTime <= System.currentTimeMillis();
 
@@ -398,6 +418,9 @@ public class MobAI {
 
             PowersBase mobPower = PowersManager.getPowerByToken(powerToken);
 
+            if(mobPower.powerCategory.equals(Enum.PowerCategoryType.DEBUFF))
+                return false;
+
             //check for hit-roll
 
             if (mobPower.requiresHitRoll)
@@ -421,9 +444,9 @@ public class MobAI {
                 msg.setUnknown04(2);
 
                 PowersManager.finishUseMobPower(msg, mob, 0, 0);
-                long randomCooldown = (long)((ThreadLocalRandom.current().nextInt(10,15) * 1000) * MobAIThread.AI_CAST_FREQUENCY);
+                long delay = 20000L;
+                mob.nextCastTime = System.currentTimeMillis() + delay;
 
-                mob.nextCastTime = System.currentTimeMillis() + randomCooldown;
                 return true;
             }
         } catch (Exception e) {
@@ -546,7 +569,6 @@ public class MobAI {
                 PowersManager.finishUseMobPower(msg, mob, 0, 0);
 
                 long randomCooldown = (long)((ThreadLocalRandom.current().nextInt(10,15) * 1000) * MobAIThread.AI_CAST_FREQUENCY);
-                mob.nextCastTime = System.currentTimeMillis() + randomCooldown;
                 return true;
             }
         } catch (Exception e) {
@@ -598,9 +620,6 @@ public class MobAI {
 
             if (mob == null)
                 return;
-            if(mob.isAlive())
-                if(!mob.getMovementLoc().equals(Vector3fImmutable.ZERO))
-                    mob.setLoc(mob.getMovementLoc());
 
             if (mob.getTimestamps().containsKey("lastExecution") == false)
                 mob.getTimestamps().put("lastExecution", System.currentTimeMillis());
@@ -656,6 +675,10 @@ public class MobAI {
                 return;
             }
 
+            if(mob.isAlive())
+                if(!mob.getMovementLoc().equals(Vector3fImmutable.ZERO))
+                    mob.setLoc(mob.getMovementLoc());
+
             if(mob.isPet() == false && mob.isPlayerGuard == false)
                 CheckToSendMobHome(mob);
 
@@ -724,7 +747,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.
 
@@ -881,6 +904,7 @@ public class MobAI {
                             return;
                         }
                     }
+                return;
                 }
 
             if(Mob.discDroppers.contains(aiAgent))
@@ -889,7 +913,7 @@ public class MobAI {
             if(aiAgent.StrongholdGuardian || aiAgent.StrongholdEpic || aiAgent.StrongholdCommander)
                 return;
 
-            if (System.currentTimeMillis() > (aiAgent.deathTime + (aiAgent.spawnTime * 1000L))) {
+            if (aiAgent.despawned && System.currentTimeMillis() > (aiAgent.deathTime + (aiAgent.spawnTime * 1000L))) {
                 if (!Zone.respawnQue.contains(aiAgent)) {
                     Zone.respawnQue.add(aiAgent);
                 }
@@ -910,8 +934,10 @@ public class MobAI {
             if (mob.getCombatTarget() == null)
                 return;
 
-            if (mob.getCombatTarget().getObjectType().equals(Enum.GameObjectType.PlayerCharacter) && MovementUtilities.inRangeDropAggro(mob, (PlayerCharacter) mob.getCombatTarget()) == false && mob.BehaviourType.ordinal() != Enum.MobBehaviourType.Pet1.ordinal()) {
+            if(!mob.isCombat())
+                enterCombat(mob);
 
+            if (mob.getCombatTarget().getObjectType().equals(Enum.GameObjectType.PlayerCharacter) && MovementUtilities.outOfAggroRange(mob, (PlayerCharacter) mob.getCombatTarget()) && mob.BehaviourType.ordinal() != Enum.MobBehaviourType.Pet1.ordinal()) {
                 mob.setCombatTarget(null);
                 return;
             }
@@ -959,7 +985,6 @@ public class MobAI {
                     PowersBase recall = PowersManager.getPowerByToken(-1994153779);
                     PowersManager.useMobPower(mob, mob, recall, 40);
                     mob.setCombatTarget(null);
-
                     if (mob.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardCaptain.ordinal() && mob.isAlive()) {
 
                         //guard captain pulls his minions home with him
@@ -977,7 +1002,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) {
@@ -989,6 +1014,11 @@ public class MobAI {
 
         try {
 
+            if(mob.combatTarget != null && mob.combatTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter) && !mob.canSee((PlayerCharacter)mob.combatTarget)){
+                mob.setCombatTarget(null);
+                return;
+            }
+
             float rangeSquared = mob.getRange() * mob.getRange();
             float distanceSquared = mob.getLoc().distanceSquared2D(mob.getCombatTarget().getLoc());
 
@@ -1063,8 +1093,8 @@ public class MobAI {
         if(mob.combatTarget == null)
             return;
 
-        if(city._playerMemory.contains(mob.combatTarget.getObjectUUID()) && mob.combatTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
-            mob.setCombatTarget(null);
+        //if(city._playerMemory.contains(mob.combatTarget.getObjectUUID()) && mob.combatTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
+        //    mob.setCombatTarget(null);
     }
 
     public static void GuardCaptainLogic(Mob mob) {
@@ -1136,6 +1166,10 @@ public class MobAI {
                 if (ZoneManager.getSeaFloor().zoneMobSet.contains(mob))
                     mob.killCharacter("no owner");
 
+            if(!mob.isSiege())
+                mob.BehaviourType.canRoam = true;
+
+
             if (MovementUtilities.canMove(mob) && mob.BehaviourType.canRoam)
                 CheckMobMovement(mob);
 
@@ -1196,6 +1230,7 @@ public class MobAI {
             if (!mob.BehaviourType.isWimpy && mob.getCombatTarget() != null)
                 CheckForAttack(mob);
 
+
         } catch (Exception e) {
             Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: DefaultLogic" + " " + e.getMessage());
         }
@@ -1215,7 +1250,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 +1411,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;
@@ -1414,4 +1449,11 @@ public class MobAI {
             Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: RecoverHealth" + " " + e.getMessage());
         }
     }
+
+    public static void enterCombat(Mob mob){
+        mob.setCombat(true);
+        UpdateStateMsg rwss = new UpdateStateMsg();
+        rwss.setPlayer(mob);
+        DispatchMessage.sendToAllInRange(mob, rwss);
+    }
 }

src/engine/mobileAI/MobBehaviours/Pet.java

@@ -0,0 +1,33 @@
+package engine.mobileAI.MobBehaviours;
+
+import engine.gameManager.ZoneManager;
+import engine.mobileAI.utilities.MovementUtilities;
+import engine.objects.Mob;
+import org.pmw.tinylog.Logger;
+
+public class Pet {
+
+    public static void run(Mob pet){
+
+        try {
+
+            if(StaticBehaviours.EarlyExit(pet))
+                return;
+
+            if (pet.getOwner() == null && pet.isNecroPet() == false && pet.isSiege() == false)
+                if (ZoneManager.getSeaFloor().zoneMobSet.contains(pet))
+                    pet.killCharacter("no owner");
+
+            if(!pet.isSiege())
+                pet.BehaviourType.canRoam = true;
+
+
+            if (MovementUtilities.canMove(pet) && pet.BehaviourType.canRoam)
+                StaticBehaviours.CheckMobMovement(pet);
+
+            StaticBehaviours.CheckForAttack(pet);
+        } catch (Exception e) {
+            Logger.info(pet.getObjectUUID() + " " + pet.getName() + " Failed At: PetLogic" + " " + e.getMessage());
+        }
+    }
+}

src/engine/mobileAI/MobBehaviours/PlayerGuard.java

@@ -0,0 +1,146 @@
+package engine.mobileAI.MobBehaviours;
+
+import engine.Enum;
+import engine.objects.AbstractWorldObject;
+import engine.objects.Mob;
+import engine.objects.PlayerCharacter;
+import org.pmw.tinylog.Logger;
+
+public class PlayerGuard {
+
+    public static void run(Mob guard) {
+
+        if(StaticBehaviours.EarlyExit(guard))
+            return;
+
+        if (guard.mobPowers.isEmpty()) {
+            //mele
+            if (guard.BehaviourType.equals(Enum.MobBehaviourType.GuardWallArcher)) {
+                GuardWallArcherLogic(guard);
+            } else {
+                if (guard.BehaviourType.equals(Enum.MobBehaviourType.GuardCaptain)) {
+                    GuardCaptainLogic(guard);
+                } else if (guard.BehaviourType.equals(Enum.MobBehaviourType.GuardMinion)) {
+                    GuardMinionLogic(guard);
+                }
+            }
+        } else {
+            //caster
+            if (guard.BehaviourType.equals(Enum.MobBehaviourType.GuardCaptain)) {
+                MagisterCaptainLogic(guard);
+            } else if (guard.BehaviourType.equals(Enum.MobBehaviourType.GuardMinion)) {
+                MagisterMinionLogic(guard);
+            }
+        }
+    }
+
+    public static void GuardCaptainLogic(Mob mob) {
+
+        try {
+            StaticBehaviours.checkToDropGuardAggro(mob);
+            if (mob.getCombatTarget() == null)
+                StaticBehaviours.CheckForPlayerGuardAggro(mob);
+
+            AbstractWorldObject newTarget = StaticBehaviours.ChangeTargetFromHateValue(mob);
+
+            if (newTarget != null) {
+
+                if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
+                    if (StaticBehaviours.GuardCanAggro(mob, (PlayerCharacter) newTarget))
+                        mob.setCombatTarget(newTarget);
+                } else
+                    mob.setCombatTarget(newTarget);
+
+            }
+            StaticBehaviours.CheckMobMovement(mob);
+            StaticBehaviours.CheckForAttack(mob);
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardCaptainLogic" + " " + e.getMessage());
+        }
+    }
+
+    public static void GuardMinionLogic(Mob mob) {
+
+        try {
+            StaticBehaviours.checkToDropGuardAggro(mob);
+
+            boolean isComanded = mob.npcOwner.isAlive();
+            if (!isComanded) {
+                GuardCaptainLogic(mob);
+            }else {
+                if (mob.npcOwner.getCombatTarget() != null)
+                    mob.setCombatTarget(mob.npcOwner.getCombatTarget());
+                else
+                if (mob.getCombatTarget() != null)
+                    mob.setCombatTarget(null);
+            }
+            StaticBehaviours.CheckMobMovement(mob);
+            StaticBehaviours.CheckForAttack(mob);
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardMinionLogic" + " " + e.getMessage());
+        }
+    }
+
+    public static void GuardWallArcherLogic(Mob mob) {
+
+        try {
+            StaticBehaviours.checkToDropGuardAggro(mob);
+
+            if (mob.getCombatTarget() == null)
+                StaticBehaviours.CheckForPlayerGuardAggro(mob);
+            else
+                StaticBehaviours.CheckForAttack(mob);
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardWallArcherLogic" + " " + e.getMessage());
+        }
+    }
+
+    public static void MagisterCaptainLogic(Mob mob){
+        try {
+            StaticBehaviours.checkToDropGuardAggro(mob);
+            if (mob.getCombatTarget() == null)
+                StaticBehaviours.CheckForPlayerGuardAggro(mob);
+
+            AbstractWorldObject newTarget = StaticBehaviours.ChangeTargetFromHateValue(mob);
+
+            if (newTarget != null) {
+
+                if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
+                    if (StaticBehaviours.GuardCanAggro(mob, (PlayerCharacter) newTarget))
+                        mob.setCombatTarget(newTarget);
+                } else
+                    mob.setCombatTarget(newTarget);
+
+            }
+            StaticBehaviours.CheckMobMovement(mob);
+            CheckForCast(mob);
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardCaptainLogic" + " " + e.getMessage());
+        }
+    }
+
+    public static void MagisterMinionLogic(Mob mob){
+        try {
+            StaticBehaviours.checkToDropGuardAggro(mob);
+
+            boolean isComanded = mob.npcOwner.isAlive();
+            if (!isComanded) {
+                MagisterCaptainLogic(mob);
+            }else {
+                if (mob.npcOwner.getCombatTarget() != null)
+                    mob.setCombatTarget(mob.npcOwner.getCombatTarget());
+                else
+                if (mob.getCombatTarget() != null)
+                    mob.setCombatTarget(null);
+            }
+            StaticBehaviours.CheckMobMovement(mob);
+            CheckForCast(mob);
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardMinionLogic" + " " + e.getMessage());
+        }
+    }
+
+    public static void CheckForCast(Mob mob){
+
+    }
+}

src/engine/mobileAI/MobBehaviours/SiegeEngine.java

@@ -0,0 +1,27 @@
+package engine.mobileAI.MobBehaviours;
+
+import engine.Enum;
+import engine.objects.Mob;
+
+public class SiegeEngine {
+
+    public static void run(Mob engine){
+
+        if(StaticBehaviours.EarlyExit(engine))
+            return;
+
+        if(engine.getOwner() == null)
+            return;
+
+        if(engine.combatTarget == null)
+            return;
+
+        if(engine.combatTarget.loc.distanceSquared(engine.loc) > engine.getRange() * engine.getRange())
+            return;
+
+        if(!engine.combatTarget.getObjectType().equals(Enum.GameObjectType.Building))
+            return;
+
+        StaticBehaviours.CheckForAttack(engine);
+    }
+}

src/engine/mobileAI/MobBehaviours/Standard.java

@@ -0,0 +1,53 @@
+package engine.mobileAI.MobBehaviours;
+
+import engine.Enum;
+import engine.objects.AbstractWorldObject;
+import engine.objects.Mob;
+import org.pmw.tinylog.Logger;
+
+public class Standard {
+
+    public static void run(Mob mob){
+
+        try {
+
+            if(StaticBehaviours.EarlyExit(mob))
+                return;
+
+            //check for players that can be aggroed if mob is agressive and has no target
+
+            if (mob.getCombatTarget() != null && !mob.playerAgroMap.containsKey(mob.getCombatTarget().getObjectUUID()))
+                mob.setCombatTarget(null);
+
+            if (mob.BehaviourType.isAgressive) {
+
+                AbstractWorldObject newTarget = StaticBehaviours.ChangeTargetFromHateValue(mob);
+
+                if (newTarget != null)
+                    mob.setCombatTarget(newTarget);
+                else {
+                    if (mob.getCombatTarget() == null) {
+                        if (mob.BehaviourType == Enum.MobBehaviourType.HamletGuard)
+                            StaticBehaviours.SafeGuardAggro(mob);  //safehold guard
+                        else
+                            StaticBehaviours.CheckForAggro(mob);   //normal aggro
+                    }
+                }
+            }
+
+            //check if mob can move for patrol or moving to target
+
+            if (mob.BehaviourType.canRoam)
+                StaticBehaviours.CheckMobMovement(mob);
+
+            //check if mob can attack if it isn't wimpy
+
+            if (!mob.BehaviourType.isWimpy && mob.getCombatTarget() != null)
+                StaticBehaviours.CheckForAttack(mob);
+
+
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: DefaultLogic" + " " + e.getMessage());
+        }
+    }
+}

src/engine/mobileAI/Threads/MobAIThread.java

@@ -3,6 +3,7 @@ package engine.mobileAI.Threads;
 import engine.gameManager.ConfigManager;
 import engine.mobileAI.MobAI;
 import engine.gameManager.ZoneManager;
+import engine.mobileAI.MobBehaviours.StaticBehaviours;
 import engine.objects.Mob;
 import engine.objects.Zone;
 import engine.server.MBServerStatics;
@@ -28,18 +29,27 @@ public class MobAIThread implements Runnable{
         AI_BASE_AGGRO_RANGE = (int)(60 * Float.parseFloat(ConfigManager.MB_AI_AGGRO_RANGE.getValue()));
         while (true) {
             for (Zone zone : ZoneManager.getAllZones()) {
-
-                for (Mob mob : zone.zoneMobSet) {
-
-                    try {
-                        if (mob != null)
-                            MobAI.DetermineAction(mob);
-                    } catch (Exception e) {
-                        Logger.error("Mob: " + mob.getName() + " UUID: " + mob.getObjectUUID() + " ERROR: " + e);
-                        e.printStackTrace();
+                if (zone != null && zone.zoneMobSet != null) {
+                    synchronized (zone.zoneMobSet) {
+                        for (Mob mob : zone.zoneMobSet) {
+                            try {
+                                if (mob != null) {
+                                    //MobAI.DetermineAction(mob);
+                                    StaticBehaviours.runBehaviour(mob);
+                                }
+                            } catch (Exception e) {
+                                Logger.error("Error processing Mob [Name: {}, UUID: {}]", mob.getName(), mob.getObjectUUID(), e);
+                            }
+                        }
                     }
                 }
             }
+            try {
+                Thread.sleep(100);
+            } catch (InterruptedException e) {
+                Logger.error("AI Thread interrupted", e);
+                Thread.currentThread().interrupt();
+            }
         }
     }
     public static void startAIThread() {

src/engine/mobileAI/Threads/MobRespawnThread.java

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

src/engine/mobileAI/utilities/CombatUtilities.java

@@ -22,7 +22,6 @@ import org.pmw.tinylog.Logger;
 import java.util.concurrent.ThreadLocalRandom;
 
 import static engine.math.FastMath.sqr;
-import static java.lang.Math.pow;
 
 public class CombatUtilities {
 
@@ -101,9 +100,18 @@ public class CombatUtilities {
         if (!target.isAlive())
             return;
 
-        if (AbstractWorldObject.IsAbstractCharacter(target))
+        if(agent.isPet()){
+            try{
+                damage *= agent.getOwner().ZergMultiplier;
+            }catch(Exception ignored){
+
+            }
+        }
+
+        if (AbstractWorldObject.IsAbstractCharacter(target)) {
+            //damage = Resists.handleFortitude((AbstractCharacter) target,DamageType.Crush,damage);
             trueDamage = ((AbstractCharacter) target).modifyHealth(-damage, agent, false);
-        else if (target.getObjectType() == GameObjectType.Building)
+        }else if (target.getObjectType() == GameObjectType.Building)
             trueDamage = ((Building) target).modifyHealth(-damage, agent);
 
         //Don't send 0 damage kay thanx.
@@ -140,21 +148,29 @@ public class CombatUtilities {
 
     public static boolean triggerDefense(Mob agent, AbstractWorldObject target) {
         int defense = 0;
-        int atr = agent.getAtrHandOne();
+        int atr = agent.mobBase.getAtr();
+        if(agent.getBonuses() != null){
+            atr += agent.getBonuses().getFloat(ModType.OCV,SourceType.None);
+            atr *= 1 + agent.getBonuses().getFloatPercentAll(ModType.OCV,SourceType.None);
+        }
         switch (target.getObjectType()) {
             case PlayerCharacter:
-                defense = ((AbstractCharacter) target).getDefenseRating();
+                PlayerCharacter pc = (PlayerCharacter)target;
+                pc.combatStats.calculateDefense();
+                defense = pc.combatStats.defense;
                 break;
             case Mob:
 
                 Mob mob = (Mob) target;
                 if (mob.isSiege())
                     defense = atr;
+                else
+                    defense = ((Mob) target).mobBase.getDefense();
                 break;
             case Building:
                 return false;
         }
-        return CombatManager.LandHit(atr,defense);
+        return !CombatManager.LandHit(atr,defense);
     }
 
     public static boolean triggerBlock(Mob agent, AbstractWorldObject ac) {
@@ -192,12 +208,10 @@ public class CombatUtilities {
                 return;
 
         int anim = 75;
-        float speed;
 
-        if (mainHand)
-            speed = agent.getSpeedHandOne();
-        else
-            speed = agent.getSpeedHandTwo();
+        //handle the retaliate here because even if the mob misses you can still retaliate
+        if (AbstractWorldObject.IsAbstractCharacter(target))
+            CombatManager.handleRetaliate((AbstractCharacter) target, agent);
 
         DamageType dt = DamageType.Crush;
 
@@ -252,12 +266,12 @@ public class CombatUtilities {
             if (agent.getEquip().get(1) != null && agent.getEquip().get(2) != null && agent.getEquip().get(2).getItemBase().isShield() == false) {
                 //mob is duel wielding and should conduct an attack for each hand
                 ItemBase weapon1 = agent.getEquip().get(1).getItemBase();
-                double range1 = getMaxDmg(weapon1.getMinDamage(), agent, weapon1) - getMinDmg(weapon1.getMinDamage(), agent, weapon1);
-                double damage1 = getMinDmg(weapon1.getMinDamage(), agent, weapon1) + ((ThreadLocalRandom.current().nextFloat() * range1) + (ThreadLocalRandom.current().nextFloat() * range1)) / 2;
+                double range1 = getMaxDmg(agent) - getMinDmg(agent);
+                double damage1 = getMinDmg(agent) + ((ThreadLocalRandom.current().nextFloat() * range1) + (ThreadLocalRandom.current().nextFloat() * range1)) / 2;
                 swingIsDamage(agent, target, (float) damage1, CombatManager.getSwingAnimation(weapon1, null, true));
                 ItemBase weapon2 = agent.getEquip().get(2).getItemBase();
-                double range2 = getMaxDmg(weapon2.getMinDamage(), agent, weapon2) - getMinDmg(weapon2.getMinDamage(), agent, weapon2);
-                double damage2 = getMinDmg(weapon2.getMinDamage(), agent, weapon2) + ((ThreadLocalRandom.current().nextFloat() * range2) + (ThreadLocalRandom.current().nextFloat() * range2)) / 2;
+                double range2 = getMaxDmg(agent) - getMinDmg(agent);
+                double damage2 = getMinDmg(agent) + ((ThreadLocalRandom.current().nextFloat() * range2) + (ThreadLocalRandom.current().nextFloat() * range2)) / 2;
                 swingIsDamage(agent, target, (float) damage2, CombatManager.getSwingAnimation(weapon1, null, false));
             } else {
                 swingIsDamage(agent, target, determineDamage(agent), anim);
@@ -279,11 +293,6 @@ public class CombatUtilities {
             if (((Mob) target).isSiege())
                 return;
 
-        //handle the retaliate
-
-        if (AbstractWorldObject.IsAbstractCharacter(target))
-            CombatManager.handleRetaliate((AbstractCharacter) target, agent);
-
         if (target.getObjectType() == GameObjectType.Mob) {
             Mob targetMob = (Mob) target;
             if (targetMob.isSiege())
@@ -307,9 +316,9 @@ public class CombatUtilities {
         float damage = 0;
 
         DamageType dt = getDamageType(agent);
-        if ((agent.agentType.equals(AIAgentType.PET)) == true || agent.isPet() == true || agent.isNecroPet() == true) {
-            damage = calculatePetDamage(agent);
-        } else if (agent.isPlayerGuard() == true) {
+        if (agent.BehaviourType.equals(MobBehaviourType.Pet1)) {
+            damage = calculateMobDamage(agent);
+        } else if (agent.isPlayerGuard()) {
             //damage = calculateGuardDamage(agent);
             damage = calculateMobDamage(agent);
         } else if (agent.getLevel() > 80) {
@@ -318,9 +327,9 @@ public class CombatUtilities {
             damage = calculateMobDamage(agent);
         }
         if (AbstractWorldObject.IsAbstractCharacter(target)) {
-            if (((AbstractCharacter) target).isSit()) {
-                damage *= 2.5f; //increase damage if sitting
-            }
+            //if (((AbstractCharacter) target).isSit()) {
+            //    damage *= 2.5f; //increase damage if sitting
+            //}
             return (int) (((AbstractCharacter) target).getResists().getResistedDamage(agent, (AbstractCharacter) target, dt, damage, 0));
         }
         if (target.getObjectType() == GameObjectType.Building) {
@@ -349,8 +358,8 @@ public class CombatUtilities {
         float min = 40;
         float max = 60;
         float dmgMultiplier = 1 + agent.getBonuses().getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None);
-        double minDmg = getMinDmg(min, agent, null);
-        double maxDmg = getMaxDmg(max, agent, null);
+        double minDmg = getMinDmg(agent);
+        double maxDmg = getMaxDmg(agent);
         dmgMultiplier += agent.getLevel() * 0.1f;
         range = (float) (maxDmg - minDmg);
         damage = min + ((ThreadLocalRandom.current().nextFloat() * range) + (ThreadLocalRandom.current().nextFloat() * range)) / 2;
@@ -366,8 +375,8 @@ public class CombatUtilities {
 
         double minDmg = weapon.getMinDamage();
         double maxDmg = weapon.getMaxDamage();
-        double min = getMinDmg(minDmg, agent, weapon);
-        double max = getMaxDmg(maxDmg, agent, weapon);
+        double min = getMinDmg(agent);
+        double max = getMaxDmg(agent);
 
         DamageType dt = weapon.getDamageType();
 
@@ -408,92 +417,48 @@ public class CombatUtilities {
     }
 
     public static int calculateMobDamage(Mob agent) {
-        ItemBase weapon = null;
-        double minDmg;
-        double maxDmg;
-        DamageType dt;
-
-        //main hand or offhand damage
-
-        if (agent.getEquip().get(1) != null)
-            weapon = agent.getEquip().get(1).getItemBase();
-        else if (agent.getEquip().get(2) != null)
-            weapon = agent.getEquip().get(2).getItemBase();
-
-        if (weapon != null) {
-            minDmg = getMinDmg(weapon.getMinDamage(), agent, weapon);
-            maxDmg = getMaxDmg(weapon.getMaxDamage(), agent, weapon);
-            dt = weapon.getDamageType();
-        } else {
-            minDmg = agent.getMobBase().getDamageMin();
-            maxDmg = agent.getMobBase().getDamageMax();
-            dt = DamageType.Crush;
-        }
+        double minDmg = getMinDmg(agent);
+        double maxDmg = getMaxDmg(agent);
+        DamageType dt = getDamageType(agent);
 
         AbstractWorldObject target = agent.getCombatTarget();
 
-        float dmgMultiplier = 1 + agent.getBonuses().getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None);
-        double range = maxDmg - minDmg;
-        double damage = minDmg + ((ThreadLocalRandom.current().nextFloat() * range) + (ThreadLocalRandom.current().nextFloat() * range)) / 2;
+        double damage = ThreadLocalRandom.current().nextInt((int)minDmg,(int)maxDmg + 1);
 
         if (AbstractWorldObject.IsAbstractCharacter(target))
             if (((AbstractCharacter) target).isSit())
                 damage *= 2.5f; //increase damage if sitting
         if (AbstractWorldObject.IsAbstractCharacter(target))
-            return (int) (((AbstractCharacter) target).getResists().getResistedDamage(agent, (AbstractCharacter) target, dt, (float) damage, 0) * dmgMultiplier);
+            return (int) (((AbstractCharacter) target).getResists().getResistedDamage(agent, (AbstractCharacter) target, dt, (float) damage, 0));
         return 0;
     }
 
-    public static double getMinDmg(double min, Mob agent, ItemBase weapon) {
-
-        int primary = agent.getStatStrCurrent();
-        int secondary = agent.getStatDexCurrent();
-        int focusLevel = 0;
-        int masteryLevel = 0;
-
-        if (weapon != null) {
-            if (weapon.isStrBased() == true) {
-                primary = agent.getStatStrCurrent();
-                secondary = agent.getStatDexCurrent();
-            } else {
-                primary = agent.getStatDexCurrent();
-                secondary = agent.getStatStrCurrent();
-                if (agent.getSkills().containsKey(weapon.getSkillRequired())) {
-                    focusLevel = (int) agent.getSkills().get(weapon.getSkillRequired()).getModifiedAmount();
-                }
-                if (agent.getSkills().containsKey(weapon.getMastery())) {
-                    masteryLevel = (int) agent.getSkills().get(weapon.getMastery()).getModifiedAmount();
+    public static double getMinDmg(Mob agent) {
+            if(agent.getEquip() != null){
+                if(agent.getEquip().get(ItemSlotType.RHELD) != null){
+                    return agent.minDamageHandOne;
+                }else if(agent.getEquip().get(ItemSlotType.LHELD) != null){
+                    return agent.getMinDamageHandTwo();
+                }else{
+                    return agent.minDamageHandOne;
                 }
+            }else{
+                return agent.minDamageHandOne;
             }
-        }
-        return min * (pow(0.0048 * primary + .049 * (primary - 0.75), 0.5) + pow(0.0066 * secondary + 0.064 * (secondary - 0.75), 0.5) + +0.01 * (focusLevel + masteryLevel));
     }
 
-    public static double getMaxDmg(double max, Mob agent, ItemBase weapon) {
-
-        int primary = agent.getStatStrCurrent();
-        int secondary = agent.getStatDexCurrent();
-        int focusLevel = 0;
-        int masteryLevel = 0;
-
-        if (weapon != null) {
-
-            if (weapon.isStrBased() == true) {
-                primary = agent.getStatStrCurrent();
-                secondary = agent.getStatDexCurrent();
-            } else {
-                primary = agent.getStatDexCurrent();
-                secondary = agent.getStatStrCurrent();
+    public static double getMaxDmg(Mob agent) {
+            if(agent.getEquip() != null){
+                if(agent.getEquip().get(ItemSlotType.RHELD) != null){
+                    return agent.maxDamageHandOne;
+                }else if(agent.getEquip().get(ItemSlotType.LHELD) != null){
+                    return agent.getMaxDamageHandTwo();
+                }else{
+                    return agent.maxDamageHandOne;
+                }
+            }else{
+                return agent.maxDamageHandOne;
             }
-
-            if (agent.getSkills().containsKey(weapon.getSkillRequired()))
-                focusLevel = (int) agent.getSkills().get(weapon.getSkillRequired()).getModifiedAmount();
-
-            if (agent.getSkills().containsKey(weapon.getSkillRequired()))
-                masteryLevel = (int) agent.getSkills().get(weapon.getMastery()).getModifiedAmount();
-
-        }
-        return max * (pow(0.0124 * primary + 0.118 * (primary - 0.75), 0.5) + pow(0.0022 * secondary + 0.028 * (secondary - 0.75), 0.5) + 0.0075 * (focusLevel + masteryLevel));
     }
 
 }

src/engine/mobileAI/utilities/MovementUtilities.java

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

src/engine/net/AbstractConnection.java

@@ -38,7 +38,7 @@ public abstract class AbstractConnection implements
     protected final AtomicBoolean execTask = new AtomicBoolean(false);
     protected final ReentrantLock writeLock = new ReentrantLock();
     protected final ReentrantLock readLock = new ReentrantLock();
-    protected long lastMsgTime = System.currentTimeMillis();
+    public long lastMsgTime = System.currentTimeMillis();
     protected long lastKeepAliveTime = System.currentTimeMillis();
     protected long lastOpcode = -1;
     protected ConcurrentLinkedQueue<ByteBuffer> outbox = new ConcurrentLinkedQueue<>();