city null pointer check

This reverts commit cd1e38b184.

src/engine/Dungeons/Dungeon.java

@@ -0,0 +1,150 @@
+package engine.Dungeons;
+
+import engine.Enum;
+import engine.InterestManagement.WorldGrid;
+import engine.gameManager.BuildingManager;
+import engine.gameManager.PowersManager;
+import engine.gameManager.ZoneManager;
+import engine.math.Vector3fImmutable;
+import engine.net.ByteBufferWriter;
+import engine.objects.*;
+import engine.powers.EffectsBase;
+import engine.server.MBServerStatics;
+import org.pmw.tinylog.Logger;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashSet;
+
+public class Dungeon {
+
+    public static int NoFlyEffectID = -1733819072;
+    public static int NoTeleportEffectID = -1971545187;
+    public static int NoSummonEffectID = 2122002462;
+    public ArrayList<PlayerCharacter> participants;
+    public int maxPerGuild;
+    public Vector3fImmutable entrance;
+    public ArrayList<Mob> dungeon_mobs;
+    public Long respawnTime = 0L;
+
+    public Dungeon(Vector3fImmutable entrance, int maxCount){
+        this.participants = new ArrayList<>();
+        this.entrance = entrance;
+        this.dungeon_mobs = new ArrayList<>();
+        this.maxPerGuild = maxCount;
+    }
+    public void applyDungeonEffects(PlayerCharacter player){
+        EffectsBase noFly = PowersManager.getEffectByToken(NoFlyEffectID);
+        EffectsBase noTele = PowersManager.getEffectByToken(NoTeleportEffectID);
+        EffectsBase noSum = PowersManager.getEffectByToken(NoSummonEffectID);
+
+        if(noFly != null)
+            player.addEffectNoTimer(noFly.getName(),noFly,40,true);
+
+        if(noTele != null)
+            player.addEffectNoTimer(noTele.getName(),noTele,40,true);
+
+        if(noSum != null)
+            player.addEffectNoTimer(noSum.getName(),noSum,40,true);
+    }
+
+    public void removeDungeonEffects(PlayerCharacter player) {
+        EffectsBase noFly = PowersManager.getEffectByToken(NoFlyEffectID);
+        EffectsBase noTele = PowersManager.getEffectByToken(NoTeleportEffectID);
+        EffectsBase noSum = PowersManager.getEffectByToken(NoSummonEffectID);
+        for (Effect eff : player.effects.values()) {
+            if (noFly != null && eff.getEffectsBase().equals(noFly))
+                eff.endEffect();
+
+            if (noTele != null && eff.getEffectsBase().equals(noTele))
+                eff.endEffect();
+
+            if (noSum != null && eff.getEffectsBase().equals(noSum))
+                eff.endEffect();
+        }
+    }
+
+    public static void serializeForClientMsgTeleport(ByteBufferWriter writer) {
+        Guild rulingGuild = Guild.getErrantGuild();
+        Guild rulingNation = Guild.getErrantGuild();
+
+        Zone zone = ZoneManager.getZoneByUUID(994);
+        // Begin Serialzing soverign guild data
+        writer.putInt(Enum.GameObjectType.Zone.ordinal());
+        writer.putInt(994);
+        writer.putString("Whitehorn Citadel");
+        writer.putInt(rulingGuild.getObjectType().ordinal());
+        writer.putInt(rulingGuild.getObjectUUID());
+
+        writer.putString("Whitehorn Militants"); // guild name
+        writer.putString("In the Citadel, We Fight!"); // motto
+        writer.putString(rulingGuild.getLeadershipType());
+
+        // Serialize guild ruler's name
+        // If tree is abandoned blank out the name
+        // to allow them a rename.
+
+        writer.putString("Kol'roth The Destroyer");//sovreign
+
+        writer.putInt(rulingGuild.getCharter());
+        writer.putInt(0); // always 00000000
+
+        writer.put((byte)0);
+
+        writer.put((byte) 1);
+        writer.put((byte) 1);  // *** Refactor: What are these flags?
+        writer.put((byte) 1);
+        writer.put((byte) 1);
+        writer.put((byte) 1);
+
+        GuildTag._serializeForDisplay(rulingGuild.getGuildTag(), writer);
+        GuildTag._serializeForDisplay(rulingNation.getGuildTag(), writer);
+
+        writer.putInt(0);// TODO Implement description text
+
+        writer.put((byte) 1);
+        writer.put((byte) 0);
+        writer.put((byte) 1);
+
+        // Begin serializing nation guild info
+
+        if (rulingNation.isEmptyGuild()) {
+            writer.putInt(rulingGuild.getObjectType().ordinal());
+            writer.putInt(rulingGuild.getObjectUUID());
+        } else {
+            writer.putInt(rulingNation.getObjectType().ordinal());
+            writer.putInt(rulingNation.getObjectUUID());
+        }
+
+
+        // Serialize nation name
+
+        writer.putString("Whitehorn Militants"); //nation name
+
+        writer.putInt(-1);//city rank, -1 puts it at top of list always
+
+        writer.putInt(0xFFFFFFFF);
+
+        writer.putInt(0);
+
+        writer.putString("Kol'roth The Destroyer");//nation ruler
+
+        writer.putLocalDateTime(LocalDateTime.now());
+
+        //location
+        Vector3fImmutable loc = Vector3fImmutable.getRandomPointOnCircle(BuildingManager.getBuilding(2827951).loc,30f);
+
+        writer.putFloat(loc.x);
+        writer.putFloat(loc.y);
+        writer.putFloat(loc.z);
+
+        writer.putInt(0);
+
+        writer.put((byte) 1);
+        writer.put((byte) 0);
+        writer.putInt(0x64);
+        writer.put((byte) 0);
+        writer.put((byte) 0);
+        writer.put((byte) 0);
+    }
+}

src/engine/Dungeons/DungeonManager.java

@@ -0,0 +1,105 @@
+package engine.Dungeons;
+
+import engine.Enum;
+import engine.InterestManagement.WorldGrid;
+import engine.gameManager.DbManager;
+import engine.gameManager.ZoneManager;
+import engine.math.Vector3fImmutable;
+import engine.objects.*;
+import engine.powers.EffectsBase;
+import engine.server.MBServerStatics;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+
+public class DungeonManager {
+    public static ArrayList<Dungeon> dungeons;
+
+    private static final float dungeonAiRange = 64f;
+    private static final float maxTravel = 64f;
+
+    public static void joinDungeon(PlayerCharacter pc, Dungeon dungeon){
+        if(requestEnter(pc,dungeon)) {
+            dungeon.participants.add(pc);
+            dungeon.applyDungeonEffects(pc);
+            translocateToDungeon(pc, dungeon);
+        }
+    }
+
+    public static void leaveDungeon(PlayerCharacter pc, Dungeon dungeon){
+        dungeon.participants.remove(pc);
+        dungeon.removeDungeonEffects(pc);
+        translocateOutOfDungeon(pc);
+    }
+
+    public static boolean requestEnter(PlayerCharacter pc, Dungeon dungeon){
+        int current = 0;
+        Guild nation = pc.guild.getNation();
+
+        if(nation == null)
+            return false;
+
+        for(PlayerCharacter participant : dungeon.participants){
+            if(participant.guild.getNation().equals(nation)){
+                current ++;
+            }
+        }
+
+        if(current >= dungeon.maxPerGuild)
+            return false;
+
+        return true;
+    }
+
+    public static void translocateToDungeon(PlayerCharacter pc, Dungeon dungeon){
+        pc.teleport(dungeon.entrance);
+        pc.setSafeMode();
+    }
+
+    public static void translocateOutOfDungeon(PlayerCharacter pc){
+        pc.teleport(pc.bindLoc);
+        pc.setSafeMode();
+    }
+
+    public static void pulse_dungeons(){
+        for(Dungeon dungeon : dungeons){
+
+            //early exit, if no players present don't waste resources
+            if(dungeon.participants.isEmpty())
+                continue;
+
+            if(dungeon.respawnTime > 0 && System.currentTimeMillis() > dungeon.respawnTime){
+                respawnMobs(dungeon);
+            }
+
+            //remove any players that have left
+            HashSet<AbstractWorldObject> obj = WorldGrid.getObjectsInRangePartial(dungeon.entrance,4096f,MBServerStatics.MASK_PLAYER);
+            for(PlayerCharacter player : dungeon.participants)
+                if(!obj.contains(player))
+                    leaveDungeon(player,dungeon);
+
+            //cycle dungeon mob AI
+            for(Mob mob : dungeon.dungeon_mobs)
+                dungeonMobAI(mob);
+        }
+    }
+
+    public static void dungeonMobAI(Mob mob){
+
+    }
+
+    public static void respawnMobs(Dungeon dungeon){
+        for(Mob mob : dungeon.dungeon_mobs){
+
+            if(!mob.isAlive() && mob.despawned)
+                mob.respawn();
+
+            if(!mob.isAlive() && !mob.despawned){
+                mob.despawn();
+                mob.respawn();
+            }
+
+        }
+    }
+
+}

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);
         }
 
@@ -980,8 +979,8 @@ public class Enum {
             try {
                 returnMod = SourceType.valueOf(modName.replace(",", ""));
             } catch (Exception e) {
-                Logger.error(modName);
+                //Logger.error(modName);
-                Logger.error(e);
+                //Logger.error(e);
                 return SourceType.None;
             }
             return returnMod;
@@ -2326,7 +2325,8 @@ public class Enum {
 
         GRID(544),
         ZONE(672),
-        PLACEMENT(673);
+        PLACEMENT(673),
+        SIEGEBOUNDS(1750);
 
         public final float extents;
 

src/engine/InterestManagement/InterestManager.java

@@ -511,6 +511,18 @@ public enum InterestManager implements Runnable {
         if (player == null)
             return;
 
+        //for(PlayerCharacter pc : SessionManager.getAllActivePlayerCharacters()){
+        //    if(pc.equals(player)){
+        //        try{
+        //            WorldGrid.RemoveWorldObject(player);
+        //        }catch(Exception e){
+
+        //        }
+        //    }
+        //}
+
+
+
         ClientConnection origin = player.getClientConnection();
 
         if (origin == null)

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,14 +13,13 @@ import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.gameManager.ConfigManager;
 import engine.gameManager.DbManager;
+import engine.net.DispatchMessage;
+import engine.net.client.msg.chat.ChatSystemMsg;
 import engine.objects.Account;
 import engine.objects.PlayerCharacter;
 import org.pmw.tinylog.Logger;
 
-import java.sql.Connection;
+import java.sql.*;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.ArrayList;
 
 public class dbAccountHandler extends dbHandlerBase {
@@ -77,18 +76,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`)"
+             PreparedStatement preparedStatement = connection.prepareStatement(
-                     + " VALUES (?, 1) ON DUPLICATE KEY UPDATE `count` = `count` + 1;")) {
+                     "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() {
@@ -270,4 +275,21 @@ public class dbAccountHandler extends dbHandlerBase {
         }
     }
 
+    public void TRASH_CHEATERS() {
+        try (Connection connection = DbManager.getConnection();
+             CallableStatement callableStatement = connection.prepareCall("{CALL BanAccountsWithMachineID()}")) {
+
+            boolean hasResultSet = callableStatement.execute();
+
+            if (!hasResultSet && callableStatement.getUpdateCount() > 0) {
+                Logger.info("TRASHED CHEATERS");
+            } else {
+                Logger.warn("No cheaters to trash.");
+            }
+
+        } catch (SQLException e) {
+            Logger.error("Error trashing cheaters: ", e);
+        }
+    }
+
 }

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() {
 
     }
@@ -46,20 +47,10 @@ public class dbItemBaseHandler extends dbHandlerBase {
     }
 
     public void LOAD_DEX_REDUCTION(ItemBase itemBase) {
-
+        if(dexReductions.containsKey(itemBase.getUUID())){
-        try (Connection connection = DbManager.getConnection();
+            itemBase.dexReduction = dexReductions.get(itemBase.getUUID());
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_item_dexpenalty` WHERE `ID` = ?")) {
+        }else{
-
+            itemBase.dexReduction = 0.0f;
-            preparedStatement.setInt(1, itemBase.getUUID());
-            ResultSet rs = preparedStatement.executeQuery();
-
-            // Check if a result was found
-            if (rs.next()) {
-                itemBase.dexReduction = rs.getFloat("item_bulk_factor");
-            }
-
-        } catch (SQLException e) {
-            Logger.error(e);
         }
     }
 
@@ -112,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/devcmd/cmds/DungenonCmd.java

@@ -0,0 +1,54 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.Dungeons.DungeonManager;
+import engine.Enum.GameObjectType;
+import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.BuildingManager;
+import engine.gameManager.ChatManager;
+import engine.gameManager.DbManager;
+import engine.gameManager.ZoneManager;
+import engine.math.Vector3fImmutable;
+import engine.objects.*;
+import org.pmw.tinylog.Logger;
+
+/**
+ * @author Eighty
+ */
+public class DungenonCmd extends AbstractDevCmd {
+
+    public DungenonCmd() {
+        super("dungeon");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pc, String[] words,
+                          AbstractGameObject target) {
+
+        Zone parent = ZoneManager.findSmallestZone(pc.loc);
+        if(parent == null)
+            return;
+
+        Vector3fImmutable loc = Vector3fImmutable.getRandomPointOnCircle(BuildingManager.getBuilding(2827951).loc,30f);
+        pc.teleport(loc);
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "indicate mob or building followed by an id and a level";
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "'/dungeon mob 2001 10'";
+    }
+
+}

src/engine/devcmd/cmds/InfoCmd.java

@@ -335,15 +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 += newline;
                 output += "Swimming : " + targetPC.isSwimming();
                 output += newline;
                 output += "isMoving : " + targetPC.isMoving();
                 output += newline;
-                output += "Zerg Multiplier : " + targetPC.ZergMultiplier+ newline;
+                output += "Zerg Multiplier : " + targetPC.ZergMultiplier + newline;
-                output += "Hidden : " + targetPC.getHidden();
+                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:

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;
@@ -86,6 +87,12 @@ public class PrintStatsCmd extends AbstractDevCmd {
         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);
     }
 

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/gameManager/ArenaManager.java

@@ -18,6 +18,8 @@ public class ArenaManager {
     public static Long pulseDelay = 180000L;
     public static Long lastExecution = 0L;
 
+    public static float arena_radius = 500f;
+
     public static void pulseArenas() {
         if(lastExecution == 0L){
             lastExecution = System.currentTimeMillis();
@@ -110,13 +112,10 @@ public class ArenaManager {
 
         if(winner != null){
             ChatManager.chatPVP("[ARENA] " + winner.getName() + " has slain " + loser.getName() + " in the arena!");
-            //handle prize distribution
+            //handle prize distribution of wrapped rune gift
-            //ItemBase specialLoot = ItemBase.getItemBase(866);
+            //ItemBase specialLoot = ItemBase.getItemBase(971070);
-            //Item promoted = new MobLoot(winner, specialLoot, 1, false).promoteToItem(winner);
+            //MobLoot winnings = new MobLoot(winner,specialLoot,false);
-            //promoted.setNumOfItems(21235);
+            //winner.getCharItemManager().addItemToInventory(winnings.promoteToItem(winner));
-            //promoted.setName("Special Banker(21235)");
-            //DbManager.ItemQueries.UPDATE_NUM_ITEMS(promoted,21235);
-            //winner.getCharItemManager().addItemToInventory(promoted);
             //winner.getCharItemManager().updateInventory();
         }
     }
@@ -132,7 +131,7 @@ public class ArenaManager {
                 float y = 0; // Y coordinate is always 0
 
                 loc = new Vector3fImmutable(x, y, z * -1);
-                HashSet<AbstractWorldObject> inRange = WorldGrid.getObjectsInRangePartial(loc,500f, MBServerStatics.MASK_PLAYER);
+                HashSet<AbstractWorldObject> inRange = WorldGrid.getObjectsInRangePartial(loc,arena_radius, MBServerStatics.MASK_PLAYER);
                 if(inRange.isEmpty() && !isUnderWater(loc))
                     locSet = true;
                 //}

src/engine/gameManager/BaneManager.java

@@ -0,0 +1,45 @@
+package engine.gameManager;
+
+import engine.Enum;
+import engine.objects.Bane;
+import org.joda.time.DateTime;
+
+public class BaneManager {
+
+    public static void default_check(){
+        for(Bane bane : Bane.banes.values()){
+            if(!bane.daySet || !bane.timeSet || !bane.capSet){
+                DateTime placementDate = bane.getPlacementDate();
+                if(DateTime.now().isAfter(placementDate.plusHours(48))){
+                    //set bane for default time
+                    if(!bane.daySet){
+                        bane.daySet = true;
+                        DbManager.BaneQueries.SET_BANE_DAY_NEW(3,bane.getCityUUID());
+                    }
+
+                    if(!bane.timeSet){
+                        bane.timeSet = true;
+                        DbManager.BaneQueries.SET_BANE_TIME_NEW(9,bane.getCityUUID());
+                    }
+
+                    if(!bane.capSet){
+                        bane.capSet = true;
+                        bane.capSize = 20;
+                        DbManager.BaneQueries.SET_BANE_CAP_NEW(20,bane.getCityUUID());
+                    }
+                    bane.setLiveDate(DbManager.BaneQueries.getLiveDate(bane.getCityUUID()));
+                }
+            }
+        }
+    }
+
+    public static void pulse_banes(){
+        //used to pulse the anti-zerg mechanic of active banes
+        for(Bane bane : Bane.banes.values()){
+            if(bane.getSiegePhase().equals(Enum.SiegePhase.WAR)){
+                // bane is live, handle bane anti-zerg mechanic stuff
+                bane.applyZergBuffs();
+            }
+        }
+    }
+}

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

@@ -8,6 +8,7 @@
 
 package engine.gameManager;
 
+import engine.Enum;
 import engine.Enum.*;
 import engine.exception.MsgSendException;
 import engine.job.JobContainer;
@@ -26,7 +27,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;
 
@@ -301,6 +301,21 @@ 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.combatStats == null){
+                    attacker.combatStats = new PlayerCombatStats(attacker);
+                }
+                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)) {
@@ -316,10 +331,13 @@ public enum CombatManager {
                 else if (!tar.isActive())
                     return 0;
 
-                if (target.getObjectType().equals(GameObjectType.PlayerCharacter) && abstractCharacter.getObjectType().equals(GameObjectType.PlayerCharacter) && abstractCharacter.getTimers().get("Attack" + slot) == null)
+                if (target.getObjectType().equals(GameObjectType.PlayerCharacter) && abstractCharacter.getObjectType().equals(GameObjectType.PlayerCharacter) && abstractCharacter.getTimers().get("Attack" + slot) == null) {
+                    if(((PlayerCharacter)target).combatStats == null){
+                        ((PlayerCharacter)target).combatStats = new PlayerCombatStats(((PlayerCharacter)target));
+                    }
                     if (!((PlayerCharacter) abstractCharacter).canSee((PlayerCharacter) target))
                         return 0;
-
+                }
                 //must not be immune to all or immune to attack
 
                 Resists res = tar.getResists();
@@ -452,6 +470,18 @@ 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);
+                }
+            }
+
+            range += 2;
             if (NotInRange(abstractCharacter, target, range)) {
 
                 //target is in stealth and can't be seen by source
@@ -475,6 +505,16 @@ public enum CombatManager {
                 }
             }
 
+            if(abstractCharacter.getObjectType().equals(GameObjectType.PlayerCharacter)){
+                PlayerCharacter pc = (PlayerCharacter)abstractCharacter;
+                if(pc.isBoxed){
+                    if(target.getObjectType().equals(GameObjectType.PlayerCharacter)) {
+                        ChatManager.chatSystemInfo(pc, "You Are PvE Flagged: Cannot Attack Players.");
+                        attackFailure = true;
+                    }
+                }
+            }
+
             //TODO Verify attacker has los (if not ranged weapon).
 
             if (!attackFailure) {
@@ -544,8 +584,14 @@ public enum CombatManager {
 
             if (target == null)
                 return;
+
             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;
@@ -659,6 +705,10 @@ public enum CombatManager {
             } else {
                 AbstractCharacter tar = (AbstractCharacter) target;
                 if(tar.getObjectType().equals(GameObjectType.PlayerCharacter)){
+                    if(((PlayerCharacter)tar).combatStats == null){
+                        ((PlayerCharacter)tar).combatStats = new PlayerCombatStats((PlayerCharacter)tar);
+                    }
+                    ((PlayerCharacter)tar).combatStats.calculateDefense();
                     defense = ((PlayerCharacter)tar).combatStats.defense;
                 }else {
                     defense = tar.getDefenseRating();
@@ -671,7 +721,7 @@ public enum CombatManager {
             //Get hit chance
 
             //int chance;
-            float dif = atr - defense;
+            //float dif = atr - defense;
 
             //if (dif > 100)
             //    chance = 94;
@@ -716,6 +766,18 @@ public enum CombatManager {
 
                         PlayerBonuses bonus = ac.getBonuses();
                         float attackRange = getWeaponRange(wb, bonus);
+
+                        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);
@@ -737,6 +799,18 @@ public enum CombatManager {
 
                     if (dpj != null && dpj.getPower() != null && (dpj.getPowerToken() == -1851459567 || dpj.getPowerToken() == -1851489518)) {
                         float attackRange = getWeaponRange(wb, bonuses);
+
+                        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);
@@ -850,12 +924,35 @@ 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;
 
+                int originalDamage = (int)damage;
+                if(ac != null && ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
+                    damage *= ((PlayerCharacter)ac).ZergMultiplier;
+                } // Health modifications are modified by the ZergMechanic
+
                 errorTrack = 12;
 
                 //Subtract Damage from target's health
 
+                if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
+                    damage *= ((PlayerCharacter)ac).ZergMultiplier;
+                }
                 if (tarAc != null) {
 
                     if (tarAc.isSit())
@@ -865,9 +962,15 @@ public enum CombatManager {
                         ac.setHateValue(damage * MBServerStatics.PLAYER_COMBAT_HATE_MODIFIER);
                         ((Mob) tarAc).handleDirectAggro(ac);
                     }
-
+                    if (tarAc.getHealth() > 0) {
-                    if (tarAc.getHealth() > 0)
                         d = tarAc.modifyHealth(-damage, ac, false);
+                        if(tarAc != null && tarAc.getObjectType().equals(GameObjectType.PlayerCharacter) && ((PlayerCharacter)ac).ZergMultiplier != 1.0f){
+                            PlayerCharacter debugged = (PlayerCharacter)tarAc;
+                            ChatManager.chatSystemInfo(debugged, "ZERG DEBUG: " + ac.getName() + " Hits You For: " + (int)damage + " instead of " + originalDamage);
+                        }
+                    }
+
+                    tarAc.cancelOnTakeDamage();
 
                 } else if (target.getObjectType().equals(GameObjectType.Building)) {
 
@@ -899,64 +1002,67 @@ public enum CombatManager {
                 errorTrack = 14;
 
                 //handle procs
-
+                procChanceHandler(weapon,ac,tarAc);
-                if (weapon != null && tarAc != null && tarAc.isAlive()) {
-
-                    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) {
-                                        try {
-                                            ((WeaponProcEffectModifier) mod).applyProc(ac, target);
-                                        }catch(Exception e){
-                                            Logger.error(eff.getName() + " Failed To Cast Proc");
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
 
                 errorTrack = 15;
 
                 //handle damage shields
 
                 if (ac.isAlive() && tarAc != null && tarAc.isAlive())
-                    handleDamageShields(ac, tarAc, damage);
+                    try {
+                        handleDamageShields(ac, tarAc, damage);
+                    }catch(Exception e){
+                        Logger.error(e.getMessage());
+                    }
 
             } else {
 
                 // Apply Weapon power effect if any.
                 // don't try to apply twice if dual wielding.
+                try {
+                    if (ac.getObjectType().equals(GameObjectType.PlayerCharacter) && (mainHand || wb.isTwoHanded())) {
+                        dpj = ((PlayerCharacter) ac).getWeaponPower();
 
-                if (ac.getObjectType().equals(GameObjectType.PlayerCharacter) && (mainHand || wb.isTwoHanded())) {
+                        if (dpj != null) {
-                    dpj = ((PlayerCharacter) ac).getWeaponPower();
 
-                    if (dpj != null) {
+                            PowersBase wp = dpj.getPower();
 
-                        PowersBase wp = dpj.getPower();
+                            if (wp.requiresHitRoll() == false) {
+                                PlayerBonuses bonus = ac.getBonuses();
+                                float attackRange = getWeaponRange(wb, bonus);
 
-                        if (wp.requiresHitRoll() == false) {
+                                if (ac.isMoving()) {
-                            PlayerBonuses bonus = ac.getBonuses();
+                                    attackRange += (ac.getSpeed() * 0.1f);
-                            float attackRange = getWeaponRange(wb, bonus);
+                                }
-                            if(specialCaseHitRoll(dpj.getPowerToken())) {
+
-                                if(hitLanded) {
+                                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{
+                            } else
-                                dpj.attack(target, attackRange);
+                                ((PlayerCharacter) ac).setWeaponPower(null);
-                            }
+                        }
-                        } else
-                            ((PlayerCharacter) ac).setWeaponPower(null);
                     }
+                }catch(Exception e) {
+                    Logger.error(e.getMessage());
+                }
+                try {
+                    if (target.getObjectType() == GameObjectType.Mob)
+                        ((Mob) target).handleDirectAggro(ac);
+                }catch(Exception e){
+                    Logger.error(e.getMessage());
                 }
-
-                if (target.getObjectType() == GameObjectType.Mob)
-                    ((Mob) target).handleDirectAggro(ac);
-
                 errorTrack = 17;
 
                 //miss, Send miss message
@@ -979,6 +1085,41 @@ public enum CombatManager {
         }
     }
 
+    private static void procChanceHandler(Item weapon, AbstractCharacter ac, AbstractCharacter tarAc) {
+
+        //no weapon means no proc
+        if(weapon == null)
+            return;
+
+        //caster is dead of null, no proc
+        if(ac == null || !ac.isAlive())
+            return;
+
+        //target is dead or null, no proc
+        if(tarAc == null || !tarAc.isAlive())
+            return;
+
+        //no effects on weapon, skip proc
+        if(weapon.effects == null || weapon.effects.isEmpty())
+            return;
+
+        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) {
+                        try {
+                            ((WeaponProcEffectModifier) mod).applyProc(ac, tarAc);
+                            break;
+                        } catch (Exception e) {
+                            Logger.error(eff.getName() + " Failed To Cast Proc");
+                        }
+                    }
+                }
+            }
+        }
+    }
+
     public static boolean canTestParry(AbstractCharacter ac, AbstractWorldObject target) {
 
         if (ac == null || target == null || !AbstractWorldObject.IsAbstractCharacter(target))
@@ -997,6 +1138,12 @@ public enum CombatManager {
         Item tarMain = tarItem.getItemFromEquipped(1);
         Item tarOff = tarItem.getItemFromEquipped(2);
 
+        if(target.getObjectType().equals(GameObjectType.PlayerCharacter)){
+            PlayerCharacter pc = (PlayerCharacter) target;
+            if(pc.getRaceID() == 1999 && !isRanged(acMain) && !isRanged(acOff))
+                return true;
+        }
+
         return !isRanged(acMain) && !isRanged(acOff) && !isRanged(tarMain) && !isRanged(tarOff);
     }
 
@@ -1055,10 +1202,12 @@ public enum CombatManager {
 
         //calculate resists in if any
 
+
+
         if (resists != null)
-            return resists.getResistedDamage(source, target, damageType, damage, 0);
+            damage = resists.getResistedDamage(source, target, damageType, damage, 0);
-        else
+
-            return damage;
+        return damage;
     }
 
     private static void sendPassiveDefenseMessage(AbstractCharacter source, ItemBase wb, AbstractWorldObject target, int passiveType, DeferredPowerJob dpj, boolean mainHand) {
@@ -1087,10 +1236,6 @@ public enum CombatManager {
                 if (eff.getPower() != null && (eff.getPower().getToken() == 429506943 || eff.getPower().getToken() == 429408639 || eff.getPower().getToken() == 429513599 || eff.getPower().getToken() == 429415295))
                     swingAnimation = 0;
 
-        if(source != null && source.getObjectType().equals(GameObjectType.PlayerCharacter)){
-            damage *= ((PlayerCharacter)source).ZergMultiplier;
-        } // Health modifications are modified by the ZergMechanic
-
         TargetedActionMsg cmm = new TargetedActionMsg(source, target, damage, swingAnimation);
         DispatchMessage.sendToAllInRange(target, cmm);
     }
@@ -1212,6 +1357,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)
@@ -1222,7 +1375,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;
 
@@ -1400,9 +1553,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;
             }
 
@@ -1485,20 +1638,21 @@ public enum CombatManager {
             ((AbstractCharacter) awo).getCharItemManager().damageRandomArmor(1);
     }
 
-    public static boolean LandHit(int C5, int D5){
+    public static boolean LandHit(int ATR, int DEF){
 
-        float chance = (C5-((C5+D5) * 0.315f)) / ((D5-((C5+D5) * 0.315f)) + (C5-((C5+D5) * 0.315f)));
+        //float chance = (ATR-((ATR+DEF) * 0.315f)) / ((DEF-((ATR+DEF) * 0.315f)) + (ATR-((ATR+DEF) * 0.315f)));
-        float convertedChance = chance * 100;
+        //float convertedChance = chance * 100;
 
         int roll = ThreadLocalRandom.current().nextInt(101);
 
-        if(roll <= 5)//always 5% chance to miss
+        //if(roll <= 5)//always 5% chance to miss
-            return false;
+        //    return false;
 
-        if(roll >= 95)//always 5% chance to hit
+        //if(roll >= 95)//always 5% chance to hit
-            return true;
+        //    return true;
 
-        return roll <= convertedChance;
+        float chance = PlayerCombatStats.getHitChance(ATR,DEF);
+        return chance >= roll;
     }
 
     public static boolean specialCaseHitRoll(int powerID){

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

@@ -85,6 +85,7 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new AddBuildingCmd());
         DevCmdManager.registerDevCmd(new AddNPCCmd());
         DevCmdManager.registerDevCmd(new AddMobCmd());
+        DevCmdManager.registerDevCmd(new DungenonCmd());
         DevCmdManager.registerDevCmd(new RemoveObjectCmd());
         DevCmdManager.registerDevCmd(new RotateCmd());
         DevCmdManager.registerDevCmd(new FlashMsgCmd());
@@ -177,6 +178,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;
@@ -202,7 +208,7 @@ public enum DevCmdManager {
                 case "printskills":
                 case "printpowers":
                 case "printbonuses":
-                case "gimme":
+                //case "gimme":
                     playerAllowed = true;
                     if (!a.status.equals(Enum.AccountStatus.ADMIN))
                         target = pcSender;

src/engine/gameManager/ForgeManager.java

@@ -0,0 +1,15 @@
+package engine.gameManager;
+
+import engine.objects.ForgeWorkOrder;
+import engine.objects.NPC;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+
+public class ForgeManager {
+    public HashMap<NPC, ArrayList<ForgeWorkOrder>> work_orders;
+
+    public static void add_work_order(NPC npc, ForgeWorkOrder workOrder){
+
+    }
+}

src/engine/gameManager/LootManager.java

@@ -14,12 +14,10 @@ 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;
+import java.util.*;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
 /**
@@ -42,6 +40,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;
@@ -80,6 +87,14 @@ public enum LootManager {
             return;
         }
 
+        if(!mob.getSafeZone()) {
+            SpecialLootHandler.RollContract(mob);
+            SpecialLootHandler.RollGlass(mob);
+            SpecialLootHandler.RollRune(mob);
+            SpecialLootHandler.RollRacialGuard(mob);
+            SpecialLootHandler.ResourceDrop(mob);
+        }
+
         //determine if mob is in hotzone
         boolean inHotzone = false;
 
@@ -117,7 +132,10 @@ public enum LootManager {
             if (ib == null)
                 break;
             if (ib.isDiscRune() || ib.getName().toLowerCase().contains("of the gods")) {
-                ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + mob.getParentZone().getName() + " has found the " + ib.getName() + ". Are you tough enough to take it?");
+                Zone camp = mob.getParentZone();
+                Zone macro = camp.getParent();
+                String name = camp.getName() + "(" + macro.getName() + ")";
+                ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + name + " has found the " + ib.getName() + ". Are you tough enough to take it?");
                 chatMsg.setMessageType(10);
                 chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
                 DispatchMessage.dispatchMsgToAll(chatMsg);
@@ -131,59 +149,6 @@ public enum LootManager {
         boolean hotzoneWasRan = false;
         float dropRate;
 
-        if (!mob.getSafeZone()) {
-            int contractLow = 1, contractHigh = 400;
-            int runeLow = 401, runeHigh = 800;
-            int resourceLow = 801, resourceHigh = 900;
-            int glassLow = 901, glassHigh = 910;
-            int guardLow = 911, guardHigh = 920;
-
-            // Pre-compute adjusted high values
-            int contractAdjust = 0, runeAdjust = 0, resourceAdjust = 0, glassAdjust = 0, guardAdjust = 0;
-            if (mob.level < 50) {
-                int dif = 50 - mob.level;
-                contractAdjust = (int)(400 * (dif * 0.02f));
-                runeAdjust = (int)(400 * (dif * 0.02f));
-                resourceAdjust = (int)(100 * (dif * 0.02f));
-                glassAdjust = (int)(10 * (dif * 0.02f));
-                guardAdjust = (int)(10 * (dif * 0.02f));
-            }
-
-            // Generate a single random roll
-            int specialCaseRoll = ThreadLocalRandom.current().nextInt(1, 100001);
-
-            // Calculate adjusted high values once
-            int contractHighAdjusted = contractHigh - contractAdjust;
-            int runeHighAdjusted = runeHigh - runeAdjust;
-            int resourceHighAdjusted = resourceHigh - resourceAdjust;
-            int glassHighAdjusted = glassHigh - glassAdjust;
-            int guardHighAdjusted = guardHigh - guardAdjust;
-
-            // Check the roll range and handle accordingly
-            if (specialCaseRoll >= contractLow && specialCaseRoll <= contractHighAdjusted) {
-                SpecialCaseContractDrop(mob, entries);
-            } else if (specialCaseRoll >= runeLow && specialCaseRoll <= runeHighAdjusted) {
-                SpecialCaseRuneDrop(mob, entries);
-            } else if (specialCaseRoll >= resourceLow && specialCaseRoll <= resourceHighAdjusted) {
-                SpecialCaseResourceDrop(mob, entries);
-            } else if (specialCaseRoll >= glassLow && specialCaseRoll <= glassHighAdjusted) {
-                int glassID = rollRandomItem(126);
-                ItemBase glassItem = ItemBase.getItemBase(glassID);
-                if (glassItem != null) {
-                    MobLoot toAddGlass = new MobLoot(mob, glassItem, false);
-                    mob.getCharItemManager().addItemToInventory(toAddGlass);
-                }
-            } else if (specialCaseRoll >= guardLow && specialCaseRoll <= guardHighAdjusted) {
-                int guardContractID = racial_guard_uuids.get(new java.util.Random().nextInt(racial_guard_uuids.size()));
-                ItemBase guardContract = ItemBase.getItemBase(guardContractID);
-                if (guardContract != null) {
-                    MobLoot toAddContract = new MobLoot(mob, guardContract, false);
-                    mob.getCharItemManager().addItemToInventory(toAddContract);
-                }
-            }
-        }
-
-
         // Iterate all entries in this bootySet and process accordingly
         Zone zone = ZoneManager.findSmallestZone(mob.loc);
         for (BootySetEntry bse : entries) {
@@ -222,109 +187,6 @@ public enum LootManager {
         }
     }
 
-    public static void SpecialCaseContractDrop(Mob mob,ArrayList<BootySetEntry> entries){
-
-        int lootTableID = 0;
-        for(BootySetEntry entry : entries){
-            if(entry.bootyType.equals("LOOT")){
-                lootTableID = entry.genTable;
-                break;
-            }
-        }
-
-        if(lootTableID == 0)
-            return;
-
-        int ContractTableID = 0;
-        for(GenTableEntry entry : _genTables.get(lootTableID)){
-            try {
-                if (ItemBase.getItemBase(_itemTables.get(entry.itemTableID).get(0).cacheID).getType().equals(Enum.ItemType.CONTRACT)) {
-                    ContractTableID = entry.itemTableID;
-                    break;
-                }
-            }catch(Exception e){
-
-            }
-        }
-
-        if(ContractTableID == 0)
-            return;
-
-        ItemBase ib = ItemBase.getItemBase(rollRandomItem(ContractTableID));
-        if(ib != null){
-            MobLoot toAdd = new MobLoot(mob,ib,false);
-            mob.getCharItemManager().addItemToInventory(toAdd);
-        }
-    }
-
-    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;
-            }
-        }
-
-        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));
-        if(ib != null){
-            MobLoot toAdd = new MobLoot(mob,ib,false);
-            mob.getCharItemManager().addItemToInventory(toAdd);
-        }
-    }
-
-    public static void SpecialCaseResourceDrop(Mob mob,ArrayList<BootySetEntry> entries){
-        int lootTableID = 0;
-        for(BootySetEntry entry : entries){
-            if(entry.bootyType.equals("LOOT")){
-                lootTableID = entry.genTable;
-                break;
-            }
-        }
-
-        if(lootTableID == 0)
-            return;
-
-        int ResourceTableID = 0;
-        for(GenTableEntry entry : _genTables.get(lootTableID)){
-            try {
-                if (ItemBase.getItemBase(_itemTables.get(entry.itemTableID).get(0).cacheID).getType().equals(Enum.ItemType.RESOURCE)) {
-                    ResourceTableID = entry.itemTableID;
-                    break;
-                }
-            }catch(Exception e){
-
-            }
-        }
-
-        if(ResourceTableID == 0)
-            return;
-
-        ItemBase ib = ItemBase.getItemBase(rollRandomItem(ResourceTableID));
-        if(ib != null){
-            MobLoot toAdd = new MobLoot(mob,ib,false);
-            mob.getCharItemManager().addItemToInventory(toAdd);
-        }
-    }
-
     public static MobLoot getGenTableItem(int genTableID, AbstractCharacter mob, Boolean inHotzone) {
 
         if (mob == null || _genTables.containsKey(genTableID) == false)
@@ -360,24 +222,11 @@ public enum LootManager {
         if (itemUUID == 0)
             return null;
 
-        if (ItemBase.getItemBase(itemUUID).getType().ordinal() == Enum.ItemType.RESOURCE.ordinal()) {
+        ItemBase ib = ItemBase.getItemBase(itemUUID);
-            if(ThreadLocalRandom.current().nextInt(1,101) < 91)
+        if (ib == null || ib.getType().equals(Enum.ItemType.RESOURCE) || ib.getName().equals("Mithril") || ib.getType().equals(Enum.ItemType.RUNE) || ib.getType().equals(Enum.ItemType.CONTRACT))
-                return null; // cut down world drops rates of resources by 90%
+            return null;
-            int amount = ThreadLocalRandom.current().nextInt(tableRow.minSpawn, tableRow.maxSpawn + 1);
+
-            return new MobLoot(mob, ItemBase.getItemBase(itemUUID), amount, false);
+        outItem = new MobLoot(mob, ib, false);
-        }
-        if(ItemBase.getItemBase(itemUUID).getType().equals(Enum.ItemType.RUNE)){
-            int randomRune = rollRandomItem(itemTableId);
-            if(randomRune != 0) {
-                itemUUID = randomRune;
-            }
-        } else if(ItemBase.getItemBase(itemUUID).getType().equals(Enum.ItemType.CONTRACT)){
-            int randomContract = rollRandomItem(itemTableId);
-            if(randomContract != 0) {
-                itemUUID = randomContract;
-            }
-        }
-        outItem = new MobLoot(mob, ItemBase.getItemBase(itemUUID), false);
 
         if(selectedRow.pModTable != 0){
             try {
@@ -396,11 +245,6 @@ public enum LootManager {
             }
         }
 
-        if(outItem.getItemBase().getType().equals(Enum.ItemType.CONTRACT) || outItem.getItemBase().getType().equals(Enum.ItemType.RUNE)){
-            if(ThreadLocalRandom.current().nextInt(1,101) < 66)
-                return null; // cut down world drops rates of resources by 65%
-        }
-
         return outItem;
     }
 
@@ -429,8 +273,23 @@ public enum LootManager {
             return inItem;
 
         if (prefixMod.action.length() > 0) {
-            inItem.setPrefix(prefixMod.action);
+            String action = prefixMod.action;
-            inItem.addPermanentEnchantment(prefixMod.action, 0, prefixMod.level, true);
+            if(action.equals("PRE-108") || action.equals("PRE-058") || action.equals("PRE-031")){//massive, barons and avatars to be replaced by leg or warlords
+                int roll = ThreadLocalRandom.current().nextInt(1,100);
+                if(inItem.getItemBase().getRange() > 15){
+                    action = "PRE-040";
+                }else {
+                    if (roll > 50) {
+                        //set warlords
+                        action = "PRE-021";
+                    } else {
+                        //set legendary
+                        action = "PRE-040";
+                    }
+                }
+            }
+            inItem.setPrefix(action);
+            inItem.addPermanentEnchantment(action, 0, prefixMod.level, true);
         }
 
         return inItem;
@@ -460,7 +319,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);
         }
@@ -537,6 +416,10 @@ public enum LootManager {
                 case RESOURCE:
                     return;
             }
+
+            if (ib.getUUID() == 1580021)//mithril
+                return;
+
             toAdd.setIsID(true);
             mob.getCharItemManager().addItemToInventory(toAdd);
         }
@@ -572,7 +455,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)
@@ -596,6 +479,8 @@ public enum LootManager {
         if (chanceRoll > bse.dropChance)
             return;
 
+        if(bse.itemBase == 1580021)//mithril
+            return;
         MobLoot lootItem = new MobLoot(mob, ItemBase.getItemBase(bse.itemBase), true);
 
         if (lootItem != null) {
@@ -605,6 +490,123 @@ 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
+                Random random = new Random();
+                int roll = random.nextInt(100);
+                int itemId;
+                ItemBase runeBase;
+                 if (roll >= 90) {
+                //35 or 40
+                     roll = ThreadLocalRandom.current().nextInt(SpecialLootHandler.static_rune_ids_high.size() + 1);
+                     itemId = SpecialLootHandler.static_rune_ids_high.get(0);
+                    try {
+                        itemId = SpecialLootHandler.static_rune_ids_high.get(roll);
+                   } catch (Exception e) {
+
+                    }
+                  runeBase = ItemBase.getItemBase(itemId);
+                   if (runeBase != null) {
+                       MobLoot rune = new MobLoot(playerCharacter, runeBase, true);
+
+                       if (rune != null)
+                           playerCharacter.getCharItemManager().addItemToInventory(rune);
+                   }
+                } else if (roll >= 65 && roll <= 89) {
+                //30,35 or 40
+                    roll = ThreadLocalRandom.current().nextInt(SpecialLootHandler.static_rune_ids_mid.size() + 1);
+                    itemId = SpecialLootHandler.static_rune_ids_mid.get(0);
+                    try {
+                        itemId = SpecialLootHandler.static_rune_ids_mid.get(roll);
+                   } catch (Exception e) {
+
+                    }
+                    runeBase = ItemBase.getItemBase(itemId);
+                    if (runeBase != null) {
+                        MobLoot rune = new MobLoot(playerCharacter, runeBase, true);
+
+                        if (rune != null)
+                            playerCharacter.getCharItemManager().addItemToInventory(rune.promoteToItem(playerCharacter));
+                    }
+                 } else {
+                //5-30
+                     roll = ThreadLocalRandom.current().nextInt(SpecialLootHandler.static_rune_ids_low.size() + 1);
+                     itemId = SpecialLootHandler.static_rune_ids_low.get(0);
+                    try {
+                        itemId = SpecialLootHandler.static_rune_ids_low.get(roll);
+                    } catch (Exception ignored) {
+
+                   }
+                   runeBase = ItemBase.getItemBase(itemId);
+                   if (runeBase != null) {
+                       MobLoot rune = new MobLoot(playerCharacter, runeBase, true);
+
+                        if (rune != null)
+                            playerCharacter.getCharItemManager().addItemToInventory(rune.promoteToItem(playerCharacter));
+                    }
+                }
+                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
@@ -650,7 +652,7 @@ public enum LootManager {
         ItemBase ib = ItemBase.getItemBase(selectedItem.cacheID);
         if(ib.getUUID() == Warehouse.coalIB.getUUID()){
             //no more coal, give gold instead
-            if (itemMan.getGoldInventory().getNumOfItems() + 250000 > 10000000) {
+            if (itemMan.getGoldInventory().getNumOfItems() + 250000 > MBServerStatics.PLAYER_GOLD_LIMIT) {
                 ErrorPopupMsg.sendErrorPopup(playerCharacter, 21);
                 return;
             }
@@ -708,7 +710,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));
@@ -732,7 +734,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));
@@ -754,7 +756,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));
@@ -776,7 +778,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));
@@ -828,8 +830,8 @@ public enum LootManager {
         }
 
         //present drop chance for all
-        if (ThreadLocalRandom.current().nextInt(100) < 35)
+        //if (ThreadLocalRandom.current().nextInt(100) < 35)
-            DropPresent(mob);
+        //    DropPresent(mob);
 
         //random contract drop chance for all
         if (ThreadLocalRandom.current().nextInt(100) < 40) {

src/engine/gameManager/MovementManager.java

@@ -67,8 +67,10 @@ public enum MovementManager {
             return;
 
         if (toMove.getObjectType().equals(GameObjectType.PlayerCharacter)) {
-            if (((PlayerCharacter) toMove).isCasting())
+            if (((PlayerCharacter) toMove).isCasting()) {
-                ((PlayerCharacter) toMove).update(false);
+                ((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/PowersManager.java

@@ -28,6 +28,7 @@ import engine.net.client.ClientConnection;
 import engine.net.client.msg.*;
 import engine.objects.*;
 import engine.powers.*;
+import engine.powers.effectmodifiers.AbstractEffectModifier;
 import engine.powers.poweractions.AbstractPowerAction;
 import engine.powers.poweractions.TrackPowerAction;
 import engine.server.MBServerStatics;
@@ -166,11 +167,40 @@ public enum PowersManager {
 
         PlayerCharacter pc = SessionManager.getPlayerCharacter(origin);
 
+        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() != 421084024 && origin.getPlayerCharacter().getPromotionClassID() != 2513) {
+            if (!origin.getPlayerCharacter().getPowers().containsKey(msg.getPowerUsedID())) {
+                Logger.error(origin.getPlayerCharacter().getFirstName() + " attempted to cast a power they do not have");
+                return;
+            }
+        }
+        //crusader sacrifice
+        if((msg.getPowerUsedID() == 428695403 && msg.getTargetID() == pc.getObjectUUID())){
+            RecyclePowerMsg recyclePowerMsg = new RecyclePowerMsg(msg.getPowerUsedID());
+            Dispatch dispatch = Dispatch.borrow(origin.getPlayerCharacter(), recyclePowerMsg);
+            DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
+
+            // Send Fail to cast message
+            if (pc != null) {
+                sendPowerMsg(pc, 2, msg);
+                if (pc.isCasting()) {
+                    pc.update(false);
+                }
+
+                pc.setIsCasting(false);
+            }
+            return;
+        }
+
+        if(msg.getPowerUsedID() == -1851459567){//backstab
+            applyPower(pc,pc,pc.loc,-1851459567,msg.getNumTrains(),false);
+        }
 
         if (usePowerA(msg, origin, sendCastToSelf)) {
             // Cast failed for some reason, reset timer
@@ -190,6 +220,10 @@ public enum PowersManager {
             }
 
         }
+
+        if(msg.getPowerUsedID() == 429429978){
+            origin.getPlayerCharacter().getRecycleTimers().remove(429429978);
+        }
     }
 
     public static void useMobPower(Mob caster, AbstractCharacter target, PowersBase pb, int rank) {
@@ -218,16 +252,16 @@ public enum PowersManager {
             City city = ZoneManager.getCityAtLocation(playerCharacter.loc);
             if (city == null) {
                 failed = true;
-            }else{
+            }//else{
-                Bane bane = city.getBane();
+             //   Bane bane = city.getBane();
-                if (bane == null) {
+             //   if (bane == null) {
-                    failed = true;
+             //       failed = true;
-                }else{
+             //   }else{
-                    if(!bane.getSiegePhase().equals(SiegePhase.WAR)){
+             //       if(!bane.getSiegePhase().equals(SiegePhase.WAR)){
-                        failed = true;
+             //           failed = true;
-                    }
+             //       }
-                }
+             //   }
-            }
+            //}
             if(failed){
                 //check to see if we are at an active mine
                 Zone zone = ZoneManager.findSmallestZone(playerCharacter.loc);
@@ -244,8 +278,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) {
@@ -331,17 +372,18 @@ public enum PowersManager {
 
 
         // Check powers for normal users
-        if (playerCharacter.getPowers() == null || !playerCharacter.getPowers().containsKey(msg.getPowerUsedID()))
+        if(msg.getPowerUsedID() != 421084024) {
-            if (!playerCharacter.isCSR()) {
+            if (playerCharacter.getPowers() == null || !playerCharacter.getPowers().containsKey(msg.getPowerUsedID()))
-                if (!MBServerStatics.POWERS_DEBUG) {
+                if (!playerCharacter.isCSR()) {
-                    //  ChatManager.chatSayInfo(pc, "You may not cast that spell!");
+                    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;
 
+                        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();
 
@@ -494,6 +536,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;
         }
@@ -792,15 +851,35 @@ public enum PowersManager {
         if (playerCharacter == null || msg == null)
             return;
 
-        if(msg.getPowerUsedID() == 429005674){ //bard sprint
+        //handle sprint for bard sprint
-            //use sprint instead of ballad of beregund the bold
+        if(msg.getPowerUsedID() == 429005674){
-            //applyPower(playerCharacter,playerCharacter,playerCharacter.loc,429611355,msg.getNumTrains(),false);
             msg.setPowerUsedID(429611355);
         }
-        if(msg.getPowerUsedID() == 429494441) {//wildkins chase
+
+        //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);
@@ -842,6 +921,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
@@ -1011,7 +1093,7 @@ public enum PowersManager {
                     continue;
                 // If something blocks the action, then stop
 
-                if (ab.blocked(target, pb, trains)) {
+                if (ab.blocked(target, pb, trains, playerCharacter)) {
 
                     PowersManager.sendEffectMsg(playerCharacter, 5, ab, pb);
                     continue;
@@ -1098,7 +1180,18 @@ public enum PowersManager {
 
 
         //DispatchMessage.dispatchMsgToInterestArea(playerCharacter, msg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
-
+//handle mob hate values
+        HashSet<AbstractWorldObject> mobs = WorldGrid.getObjectsInRangePartial(playerCharacter.loc,60.0f,MBServerStatics.MASK_MOB);
+        for(AbstractWorldObject awo : mobs){
+            Mob mobTarget = (Mob)awo;
+            if(mobTarget.hate_values != null) {
+                if (mobTarget.hate_values.containsKey(playerCharacter)) {
+                    mobTarget.hate_values.put(playerCharacter, mobTarget.hate_values.get(playerCharacter) + pb.getHateValue(trains));
+                } else {
+                    mobTarget.hate_values.put(playerCharacter, pb.getHateValue(trains));
+                }
+            }
+        }
 
     }
 
@@ -1187,7 +1280,7 @@ public enum PowersManager {
                     continue;
                 // If something blocks the action, then stop
 
-                if (ab.blocked(target, pb, trains))
+                if (ab.blocked(target, pb, trains, caster))
                     continue;
                 // TODO handle overwrite stack order here
                 String stackType = ab.getStackType();
@@ -1388,7 +1481,7 @@ public enum PowersManager {
         // Handle Accepting or Denying a summons.
         // set timer based on summon type.
         boolean wentThrough = false;
-        if (msg.accepted())
+        if (msg.accepted()) {
             // summons accepted, let's move the player if within time
             if (source.isAlive()) {
 
@@ -1434,14 +1527,14 @@ public enum PowersManager {
                     duration = 45000; // Belgosh Summons, 45 seconds
 
                 boolean enemiesNear = false;
-                for(AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(pc.loc,MBServerStatics.CHARACTER_LOAD_RANGE, MBServerStatics.MASK_PLAYER)){
+                for (AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(pc.loc, MBServerStatics.CHARACTER_LOAD_RANGE, MBServerStatics.MASK_PLAYER)) {
-                    PlayerCharacter playerCharacter = (PlayerCharacter)awo;
+                    PlayerCharacter playerCharacter = (PlayerCharacter) awo;
-                    if(!playerCharacter.guild.getNation().equals(pc.guild.getNation())){
+                    if (!playerCharacter.guild.getNation().equals(pc.guild.getNation())) {
                         enemiesNear = true;
                     }
                 }
 
-                if(enemiesNear && !pc.isInSafeZone())
+                if (enemiesNear && !pc.isInSafeZone())
                     duration += 60000;
 
                 // Teleport to summoners location
@@ -1452,7 +1545,10 @@ public enum PowersManager {
                     timers.put("Summon", jc);
                 wentThrough = true;
             }
-
+        }else{
+            // recycle summons power
+            finishRecycleTime(428523680, source, true);
+        }
         // Summons failed
         if (!wentThrough)
             // summons refused. Let's be nice and reset recycle timer
@@ -1553,7 +1649,7 @@ public enum PowersManager {
                 it.remove();
             else if (awo.getObjectType().equals(GameObjectType.PlayerCharacter)) {
                 PlayerBonuses bonus = ((PlayerCharacter) awo).getBonuses();
-                if (bonus != null && bonus.getBool(ModType.CannotTrack, SourceType.None))
+                if (bonus != null && bonus.getBool(ModType.CannotTrack, SourceType.None) || ((PlayerCharacter) awo).getAccount().status.equals(AccountStatus.ADMIN))
                     it.remove();
             }
         }
@@ -1569,17 +1665,28 @@ public enum PowersManager {
 
         // create list of characters
         HashSet<AbstractCharacter> trackChars;
-        switch(msg.getPowerToken()){
+
-            case 431511776:
+        PowersBase trackPower = PowersManager.getPowerByToken(msg.getPowerToken());
-            case 429578587:
+        if(trackPower != null && trackPower.category.equals("TRACK")){
-            case 429503360:
+            trackChars = getTrackList(playerCharacter);
-                trackChars = getTrackList(playerCharacter);
+        }else{
-                break;
+            trackChars = RangeBasedAwo.getTrackList(allTargets, playerCharacter, maxTargets);
-            default:
-                trackChars = RangeBasedAwo.getTrackList(allTargets, playerCharacter, maxTargets);
-                break;
         }
 
+
+
+        //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
@@ -1606,7 +1713,7 @@ public enum PowersManager {
             if(awo.equals(tracker))
                 continue;
             PlayerCharacter pc = (PlayerCharacter)awo;
-            if(!pc.isAlive())
+            if(!pc.isAlive() || pc.getAccount().status.equals(AccountStatus.ADMIN))
                 continue;
             if(guildsPresent.contains(pc.guild.getNation()))
                 list.add(pc);
@@ -1730,6 +1837,10 @@ public enum PowersManager {
     private static void applyPowerA(AbstractCharacter ac, AbstractWorldObject target,
                                     Vector3fImmutable targetLoc, PowersBase pb, int trains,
                                     boolean fromItem) {
+
+        if(fromItem && pb.token == 429021400)
+            trains = 40;
+
         int time = pb.getCastTime(trains);
         if (!fromItem)
             finishApplyPowerA(ac, target, targetLoc, pb, trains, false);
@@ -1795,7 +1906,7 @@ public enum PowersManager {
             if (trains < ab.getMinTrains() || trains > ab.getMaxTrains())
                 continue;
             // If something blocks the action, then stop
-            if (ab.blocked(target, pb, trains))
+            if (ab.blocked(target, pb, trains, ac))
                 // sendPowerMsg(pc, 5, msg);
                 continue;
             // TODO handle overwrite stack order here
@@ -1868,14 +1979,10 @@ public enum PowersManager {
         }
     }
 
-    public static void runPowerAction(AbstractCharacter source,
+    public static void runPowerAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, ActionsBase ab, int trains, PowersBase pb) {
-                                      AbstractWorldObject awo, Vector3fImmutable targetLoc,
-                                      ActionsBase ab, int trains, PowersBase pb) {
         AbstractPowerAction pa = ab.getPowerAction();
         if (pa == null) {
-            Logger.error(
+            Logger.error("runPowerAction(): PowerAction not found of IDString: " + ab.getEffectID());
-                    "runPowerAction(): PowerAction not found of IDString: "
-                            + ab.getEffectID());
             return;
         }
         pa.startAction(source, awo, targetLoc, trains, ab, pb);
@@ -2370,7 +2477,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)) {
@@ -2411,6 +2519,15 @@ 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);
+                    TargetedActionMsg cmm = new TargetedActionMsg(pc, 75, tarAc, MBServerStatics.COMBAT_SEND_BLOCK);
+                    DispatchMessage.sendToAllInRange(tarAc, cmm);
+                    return true;
                 }
             }
             return false;
@@ -2458,7 +2575,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
@@ -2962,6 +3084,8 @@ public enum PowersManager {
             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)
+            if ((_updatePulseTime != 0) && (System.currentTimeMillis() > _updatePulseTime))
-                    && (System.currentTimeMillis() > _updatePulseTime))
                 pulseUpdate();
         } catch (Exception e) {
-            Logger.error(
+            Logger.error("Fatal error in Update Pulse: DISABLED");
-                    "Fatal error in Update Pulse: DISABLED");
-            //  _runegatePulseTime = 0;
         }
 
         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/SpecialLootHandler.java

@@ -0,0 +1,396 @@
+package engine.gameManager;
+import engine.InterestManagement.WorldGrid;
+import engine.math.Vector3fImmutable;
+import engine.objects.*;
+import engine.server.MBServerStatics;
+import org.pmw.tinylog.Logger;
+
+import java.util.*;
+import java.util.concurrent.ThreadLocalRandom;
+public class SpecialLootHandler {
+
+    public static final ArrayList<Integer> static_rune_ids_low = new ArrayList<>(Arrays.asList(
+            250001, 250002, 250003, 250004, 250005, 250006, 250010, 250011,
+            250012, 250013, 250014, 250015, 250019, 250020, 250021, 250022,
+            250023, 250024, 250028, 250029, 250030, 250031, 250032, 250033,
+            250037, 250038, 250039, 250040, 250041, 250042
+    ));
+    public static final ArrayList<Integer> static_rune_ids_mid = new ArrayList<>(Arrays.asList(
+            250006, 250007, 250008,
+            250015, 250016, 250017,
+            250024, 250025, 250026,
+            250033, 250034, 250035,
+            250042, 250043, 250044
+    ));
+    public static final ArrayList<Integer> static_rune_ids_high = new ArrayList<>(Arrays.asList(
+            250007, 250008,
+            250016, 250017,
+            250025, 250026,
+            250034, 250035,
+            250043, 250044
+    ));
+    public static final List<Integer> DWARVEN_contracts = Arrays.asList(
+            35250, 35251, 35252, 35253, 35254, 35255, 35256, 35257, 35258, 35259, 35260, 35261, 35262, 35263
+    );
+    public static final List<Integer> INVORRI_contracts = Arrays.asList(
+            35050, 35051, 35052, 35053, 35054, 35055, 35056, 35057, 35058, 35059, 35060, 35061, 35062, 35063
+    );
+    public static final List<Integer> SHADE_contracts = Arrays.asList(
+            35400, 35401, 35402, 35403, 35404, 35405, 35406, 35407, 35408, 35409, 35410, 35411, 35412, 35413,
+            35414, 35415, 35416, 35417, 35418, 35419, 35420, 35421, 35422, 35423, 35424, 35425, 35426, 35427
+    );
+    public static final List<Integer> VAMPIRE_contracts = Arrays.asList(
+            35545, 35546, 35547, 35548, 35549, 35550, 35551, 35552, 35553, 35554, 35555, 35556, 35557, 35558,
+            35559, 35560, 35561, 35562, 35563, 35564, 35565, 35566, 35567, 35568, 35569, 35570
+    );
+    public static final List<Integer> IREKEI_contracts = Arrays.asList(
+            35100, 35101, 35102, 35103, 35104, 35105, 35106, 35107, 35108, 35109, 35110, 35111, 35112, 35113,
+            35114, 35115, 35116, 35117, 35118, 35119, 35120, 35121, 35122, 35123, 35124, 35125, 35126, 35127
+    );
+    public static final List<Integer> AMAZON_contracts = Arrays.asList(
+            35200, 35201, 35202, 35203, 35204, 35205, 35206, 35207, 35208, 35209, 35210, 35211, 35212, 35213
+    );
+    public static final List<Integer> GWENDANNEN_contracts = Arrays.asList(
+            35350, 35351, 35352, 35353, 35354, 35355, 35356, 35357, 35358, 35359, 35360, 35361, 35362, 35363,
+            35364, 35365, 35366, 35367, 35368, 35369, 35370, 35371, 35372, 35373, 35374, 35375, 35376, 35377
+    );
+    public static final List<Integer> NEPHILIM_contracts = Arrays.asList(
+            35500, 35501, 35502, 35503, 35504, 35505, 35506, 35507, 35508, 35509, 35510, 35511, 35512, 35513,
+            35514, 35515, 35516, 35517, 35518, 35519, 35520, 35521, 35522, 35523, 35524, 35525
+    );
+    public static final List<Integer> ELVEN_contracts = Arrays.asList(
+            35000, 35001, 35002, 35003, 35004, 35005, 35006, 35007, 35008, 35009, 35010, 35011, 35012, 35013,
+            35014, 35015, 35016, 35017, 35018, 35019, 35020, 35021, 35022, 35023, 35024, 35025, 35026, 35027
+    );
+    public static final List<Integer> CENTAUR_contracts = Arrays.asList(
+            35150, 35151, 35152, 35153, 35154, 35155, 35156, 35157, 35158, 35159, 35160, 35161, 35162, 35163,
+            35164, 35165, 35166, 35167, 35168, 35169, 35170, 35171, 35172, 35173, 35174, 35175, 35176, 35177
+    );
+    public static final List<Integer> LIZARDMAN_contracts = Arrays.asList(
+            35300, 35301, 35302, 35303, 35304, 35305, 35306, 35307, 35308, 35309, 35310, 35311, 35312, 35313
+    );
+    public static final List<Integer> GLASS_ITEMS = Arrays.asList(
+            7000100, 7000110, 7000120, 7000130, 7000140, 7000150, 7000160, 7000170, 7000180, 7000190,
+            7000200, 7000210, 7000220, 7000230, 7000240, 7000250, 7000270, 7000280
+    );
+    public static final List<Integer> STAT_RUNES = 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
+    );
+    public static final List<Integer> racial_guard = 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 List<Integer> gold_resources = Arrays.asList(
+            1580000, 1580008, 1580009, 1580010, 1580011, 1580017
+    );
+    public static final List<Integer> lumber_resources = Arrays.asList(
+            1580004, 1580005, 1580006, 1580007, 1580018
+    );
+    public static final List<Integer> ore_resources = Arrays.asList(
+            1580000, 1580001, 1580002, 1580003, 1580019
+    );
+    public static final List<Integer> magic_resources = Arrays.asList(
+            1580012, 1580013, 1580014, 1580015, 1580016, 1580020
+    );
+
+    public static void RollContract(Mob mob){
+        Zone zone = getMacroZone(mob);
+        if(zone == null)
+            return;
+        int contactId = 0;
+        int roll = ThreadLocalRandom.current().nextInt(250);
+        if(roll == 125){
+            contactId = getContractForZone(zone);
+        }
+        if(contactId == 0)
+            return;
+        ItemBase contractBase = ItemBase.getItemBase(contactId);
+        if(contractBase == null)
+            return;
+        if(mob.getCharItemManager() == null)
+            return;
+        MobLoot contract = new MobLoot(mob,contractBase,false);
+        mob.getCharItemManager().addItemToInventory(contract);
+    }
+    public static Zone getMacroZone(Mob mob){
+        Zone parentZone = mob.parentZone;
+        if(parentZone == null)
+            return null;
+        while(!parentZone.isMacroZone() && !parentZone.equals(ZoneManager.getSeaFloor())){
+            parentZone = parentZone.getParent();
+        }
+        return parentZone;
+    }
+    public static int getContractForZone(Zone zone){
+        Random random = new Random();
+        switch (zone.getObjectUUID())
+        {
+            case 178:
+                // Kralgaar Holm
+                return DWARVEN_contracts.get(random.nextInt(DWARVEN_contracts.size()));
+            case 122:
+                // Aurrochs Skrae
+                return INVORRI_contracts.get(random.nextInt(INVORRI_contracts.size()));
+            case 197:
+                // Ymur's Crown
+                return INVORRI_contracts.get(random.nextInt(INVORRI_contracts.size()));
+            case 234:
+                // Ecklund Wilds
+                return INVORRI_contracts.get(random.nextInt(INVORRI_contracts.size()));
+            case 313:
+                // Greensward Pyre
+                return SHADE_contracts.get(random.nextInt(SHADE_contracts.size()));
+            case 331:
+                // The Doomplain
+                return VAMPIRE_contracts.get(random.nextInt(VAMPIRE_contracts.size()));
+            case 353:
+                // Thollok Marsh
+                return LIZARDMAN_contracts.get(random.nextInt(LIZARDMAN_contracts.size()));
+            case 371:
+                // The Black Bog
+                return LIZARDMAN_contracts.get(random.nextInt(LIZARDMAN_contracts.size()));
+            case 388:
+                // Sevaath Mere
+                return LIZARDMAN_contracts.get(random.nextInt(LIZARDMAN_contracts.size()));
+            case 418:
+                // Valkos Wilds
+                return GWENDANNEN_contracts.get(random.nextInt(GWENDANNEN_contracts.size()));
+            case 437:
+                // Grimscairne
+                return SHADE_contracts.get(random.nextInt(SHADE_contracts.size()));
+            case 475:
+                // Phaedra's Prize
+                return AMAZON_contracts.get(random.nextInt(AMAZON_contracts.size()));
+            case 491:
+                // Holloch Forest
+                return GWENDANNEN_contracts.get(random.nextInt(GWENDANNEN_contracts.size()));
+            case 508:
+                // Aeran Belendor
+                return ELVEN_contracts.get(random.nextInt(ELVEN_contracts.size()));
+            case 532:
+                // Tainted Swamp
+                return NEPHILIM_contracts.get(random.nextInt(NEPHILIM_contracts.size()));
+            case 550:
+                // Aerath Hellendroth
+                return ELVEN_contracts.get(random.nextInt(ELVEN_contracts.size()));
+            case 569:
+                // Aedroch Highlands
+                return GWENDANNEN_contracts.get(random.nextInt(GWENDANNEN_contracts.size()));
+            case 590:
+                // Fellgrim Forest
+                return GWENDANNEN_contracts.get(random.nextInt(GWENDANNEN_contracts.size()));
+            case 616:
+                // Derros Plains
+                return CENTAUR_contracts.get(random.nextInt(CENTAUR_contracts.size()));
+            case 632:
+                // Ashfell Plain
+                return SHADE_contracts.get(random.nextInt(SHADE_contracts.size()));
+            case 717:
+                // Kharsoom
+                return IREKEI_contracts.get(random.nextInt(IREKEI_contracts.size()));
+            case 737:
+                // Leth'khalivar Desert
+                return IREKEI_contracts.get(random.nextInt(IREKEI_contracts.size()));
+            case 761:
+                // The Blood Sands
+                return IREKEI_contracts.get(random.nextInt(IREKEI_contracts.size()));
+            case 785:
+                // Vale of Nar Addad
+                return IREKEI_contracts.get(random.nextInt(IREKEI_contracts.size()));
+            case 824:
+                // Western Battleground
+                return NEPHILIM_contracts.get(random.nextInt(NEPHILIM_contracts.size()));
+            case 842:
+                // Pandemonium
+                return NEPHILIM_contracts.get(random.nextInt(NEPHILIM_contracts.size()));
+            case 951:
+                //Bone Marches
+                return VAMPIRE_contracts.get(random.nextInt(VAMPIRE_contracts.size()));
+            case 952:
+                //plain of ashes
+                return VAMPIRE_contracts.get(random.nextInt(VAMPIRE_contracts.size()));
+        }
+        return 0;
+    }
+    public static void RollGlass(Mob mob){
+        int roll = ThreadLocalRandom.current().nextInt(10000);
+        if(roll != 5000)
+            return;
+        Random random = new Random();
+        int glassId = GLASS_ITEMS.get(random.nextInt(GLASS_ITEMS.size()));
+        ItemBase glassBase = ItemBase.getItemBase(glassId);
+        if(glassBase == null)
+            return;
+        if(mob.getCharItemManager() == null)
+            return;
+        MobLoot glass = new MobLoot(mob,glassBase,false);
+        mob.getCharItemManager().addItemToInventory(glass);
+    }
+    public static void RollRune(Mob mob){
+        int runeID = 0;
+        int roll = ThreadLocalRandom.current().nextInt(250);
+        Random random = new Random();
+        if(roll == 125){
+            runeID = STAT_RUNES.get(random.nextInt(STAT_RUNES.size()));
+        }
+        if(runeID == 0)
+            return;
+        ItemBase runeBase = ItemBase.getItemBase(runeID);
+        if(runeBase == null)
+            return;
+        if(mob.getCharItemManager() == null)
+            return;
+        MobLoot rune = new MobLoot(mob,runeBase,false);
+        mob.getCharItemManager().addItemToInventory(rune);
+    }
+    public static void RollRacialGuard(Mob mob){
+        int roll = ThreadLocalRandom.current().nextInt(5000);
+        if(roll != 2500)
+            return;
+        Random random = new Random();
+        int guardId = racial_guard.get(random.nextInt(racial_guard.size()));
+        ItemBase guardBase = ItemBase.getItemBase(guardId);
+        if(guardBase == null)
+            return;
+        if(mob.getCharItemManager() == null)
+            return;
+        MobLoot guard = new MobLoot(mob,guardBase,false);
+        mob.getCharItemManager().addItemToInventory(guard);
+    }
+
+    public static void ResourceDrop(Mob mob){
+        Zone zone = getMacroZone(mob);
+        if(zone == null)
+            return;
+        int resourceId = 0;
+        int roll = ThreadLocalRandom.current().nextInt(125);
+        if(roll == 75){
+            resourceId = getResourceForZone(zone);
+        }
+        if(resourceId == 0)
+            return;
+        ItemBase resourceBase = ItemBase.getItemBase(resourceId);
+        if(resourceBase == null)
+            return;
+        if(mob.getCharItemManager() == null)
+            return;
+        MobLoot resource = new MobLoot(mob,resourceBase,false);
+    try {
+        int stackMax = (int) (getMaxResource(resourceId) * 0.02f);
+        if (stackMax > 100)
+            stackMax = 100;
+
+
+        int amount = ThreadLocalRandom.current().nextInt(stackMax);
+        resource.setNumOfItems(amount);
+
+        Logger.error("Set Stack Size For: " +resource.getName() + " To: " +  amount + ". Actual Amount = " + resource.getNumOfItems());
+
+    }catch(Exception e) {
+        Logger.error("Unable To Get Max Resource Stack Size For: " + resourceId);
+    }
+        mob.getCharItemManager().addItemToInventory(resource);
+    }
+
+    public static int getResourceForZone(Zone zone){
+        Random random = new Random();
+        switch (zone.getObjectUUID())
+        {
+            case 178:
+            case 717:
+            case 632:
+            case 952:
+            case 475:
+            case 371:
+            case 313:
+            case 234:
+                // Ecklund Wilds // ORE MINE
+                // Greensward Pyre // ORE MINE
+                // The Black Bog // ORE MINE
+                // Phaedra's Prize // ORE MINE
+                //plain of ashes ORE MINE
+                // Ashfell Plain // ORE MINE
+                // Kharsoom // ORE MINE
+                // Kralgaar Holm // ORE MINE
+                return ore_resources.get(random.nextInt(ore_resources.size()));
+            case 122:
+            case 824:
+            case 737:
+            case 569:
+            case 590:
+            case 437:
+            case 388:
+                // Sevaath Mere // LUMBER MINE
+                // Grimscairne // LUMBER MINE
+                // Fellgrim Forest // LUMBER MINE
+                // Aedroch Highlands // LUMBER MINE
+                // Leth'khalivar Desert // LUMBER MINE
+                // Western Battleground // LUMBER MINE
+                // Aurrochs Skrae // LUMBER MINE
+                return lumber_resources.get(random.nextInt(lumber_resources.size()));
+            case 197:
+            case 761:
+            case 616:
+            case 951:
+            case 532:
+            case 491:
+            case 353:
+            case 331:
+                // The Doomplain // GOLD MINE
+                // Thollok Marsh // GOLD MINE
+                // Holloch Forest // GOLD MINE
+                // Tainted Swamp // GOLD MINE
+                //Bone Marches // GOLD MINE
+                // Derros Plains // GOLD MINE
+                // The Blood Sands // GOLD MINE
+                // Ymur's Crown // GOLD MINE
+                return gold_resources.get(random.nextInt(gold_resources.size()));
+            case 418:
+            case 842:
+            case 785:
+            case 550:
+            case 508:
+                // Aeran Belendor // MAGIC MINE
+                // Aerath Hellendroth // MAGIC MINE
+                // Vale of Nar Addad // MAGIC MINE
+                // Pandemonium // MAGIC MINE
+                // Valkos Wilds // MAGIC MINE
+                return magic_resources.get(random.nextInt(magic_resources.size()));
+        }
+        return 0;
+    }
+
+    public static int getMaxResource(int key) {
+        switch (key) {
+            case 1580000: return 10000;
+            case 1580001: return 2000;
+            case 1580002: return 2000;
+            case 1580003: return 1000;
+            case 1580004: return 10000;
+            case 1580005: return 3000;
+            case 1580006: return 3000;
+            case 1580007: return 1000;
+            case 1580008: return 3000;
+            case 1580009: return 2000;
+            case 1580010: return 2000;
+            case 1580011: return 1000;
+            case 1580012: return 2000;
+            case 1580013: return 3000;
+            case 1580014: return 1000;
+            case 1580015: return 1000;
+            case 1580016: return 1000;
+            case 1580017: return 500;
+            case 1580018: return 500;
+            case 1580019: return 500;
+            case 1580020: return 500;
+            case 1580021: return 500;
+            default: return 0; // Default value if the key is not found
+        }
+    }
+
+}

src/engine/gameManager/ZergManager.java

@@ -21,9 +21,9 @@ public class ZergManager {
             return 0.0f;
 
         switch(count){
-            case 4: return 0.63f;
+            case 4: return 0.50f;
-            case 5: return 0.40f;
+            case 5: return 0.0f;
-            case 6: return 0.25f;
+            case 6: return 0.0f;
             default: return 1.0f;
         }
     }

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.executeJob(this.getThreadName());
-                this.currentJob = null;
+                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();

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

@@ -9,9 +9,11 @@
 
 package engine.jobs;
 
+import engine.Enum;
 import engine.gameManager.CombatManager;
 import engine.job.AbstractJob;
 import engine.objects.AbstractCharacter;
+import engine.objects.PlayerCharacter;
 
 public class AttackJob extends AbstractJob {
 
@@ -27,7 +29,18 @@ public class AttackJob extends AbstractJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
+
+        if(this.source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
+            PlayerCharacter pc = (PlayerCharacter)source;
+            if(pc.combatTarget != null && pc.combatTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
+                PlayerCharacter target = (PlayerCharacter)pc.combatTarget;
+                if(!pc.canSee(target)) {
+                    this._cancelJob();
+                    return;
+                }
+            }
+        }
         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

@@ -28,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);

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

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

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,11 +40,19 @@ 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;
 
+        if(this.source.isAlive() && this.source.getObjectType().equals(GameObjectType.PlayerCharacter)){
+            PlayerCharacter pc = (PlayerCharacter)this.source;
+            if(pc.getPromotionClassID() == 2511){
+                this.cancelJob();
+                return;
+            }
+        }
+
         if (!this.source.isAlive())
             PowersManager.finishEffectTime(this.source, this.target, this.action, this.trains);
         else if (this.iteration < this.power.getChantIterations()) {

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

@@ -30,7 +30,7 @@ public class StuckJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         Vector3fImmutable stuckLoc;
         Building building = null;

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

@@ -39,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;

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

@@ -22,7 +22,7 @@ public class UpgradeBuildingJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
 
         // Must have a building to rank!

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,10 +9,12 @@
 package engine.mobileAI;
 
 import engine.Enum;
+import engine.InterestManagement.InterestManager;
 import engine.InterestManagement.WorldGrid;
 import engine.gameManager.*;
 import engine.math.Vector3f;
 import engine.math.Vector3fImmutable;
+import engine.mobileAI.MobHandlers.MobHandler;
 import engine.mobileAI.Threads.MobAIThread;
 import engine.mobileAI.utilities.CombatUtilities;
 import engine.mobileAI.utilities.MovementUtilities;
@@ -26,6 +28,7 @@ import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
@@ -48,18 +51,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)) {
+                //if (mob.isPlayerGuard() == false && MobCast(mob)) {
-                    mob.updateLocation();
+                //    mob.updateLocation();
-                    return;
+                //    return;
-                }
+                //}
 
-                if (mob.isPlayerGuard() == true && GuardCast(mob)) {
+                //if (mob.isPlayerGuard() == true && GuardCast(mob)) {
-                    mob.updateLocation();
+                //    mob.updateLocation();
-                    return;
+                //    return;
-                }
+                //}
-            }
+            //}
 
             if (!CombatUtilities.inRangeToAttack(mob, target))
                 return;
@@ -92,7 +96,7 @@ public class MobAI {
             }
 
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackTarget" + " " + e.getMessage());
+            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackTarget" + " " + e.getMessage());
         }
     }
 
@@ -105,6 +109,12 @@ 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);
 
@@ -125,6 +135,9 @@ public class MobAI {
                 if (mob.isMoving() && mob.getRange() > 20)
                     return;
 
+                if(target.combatStats == null)
+                    target.combatStats = new PlayerCombatStats(target);
+
                 // add timer for last attack.
 
                 ItemBase mainHand = mob.getWeaponItemBase(true);
@@ -155,8 +168,14 @@ 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());
+            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackPlayer" + " " + e.getMessage());
         }
 
     }
@@ -170,14 +189,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);
 
@@ -214,7 +233,7 @@ public class MobAI {
             //}
 
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackBuilding" + " " + e.getMessage());
+            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackBuilding" + " " + e.getMessage());
         }
     }
 
@@ -253,7 +272,7 @@ public class MobAI {
                 }
             }
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackMob" + " " + e.getMessage());
+            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackMob" + " " + e.getMessage());
         }
     }
 
@@ -306,7 +325,7 @@ public class MobAI {
                         }
                     }
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackTarget" + " " + e.getMessage());
+            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackTarget" + " " + e.getMessage());
         }
     }
 
@@ -320,6 +339,12 @@ public class MobAI {
             if (mob == null)
                 return false;
 
+            if (mob.nextCastTime == 0)
+                mob.nextCastTime = System.currentTimeMillis() - 1000L;
+
+            if(mob.nextCastTime > System.currentTimeMillis())
+                return false;
+
             if(mob.isPlayerGuard){
 
                 int contractID = 0;
@@ -340,13 +365,11 @@ public class MobAI {
                 mob.setCombatTarget(null);
                 return false;
             }
-            if (mob.nextCastTime == 0)
-                mob.nextCastTime = System.currentTimeMillis();
 
             return mob.nextCastTime <= System.currentTimeMillis();
 
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: canCast" + " " + e.getMessage());
+            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: canCast" + " " + e.getMessage());
         }
         return false;
     }
@@ -400,6 +423,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)
@@ -423,13 +449,13 @@ 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) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: MobCast" + " " + e.getMessage());
+            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: MobCast" + " " + e.getMessage());
         }
         return false;
     }
@@ -548,11 +574,10 @@ 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) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: MobCast" + " " + e.getMessage());
+            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: MobCast" + " " + e.getMessage());
         }
         return false;
     }
@@ -588,7 +613,7 @@ public class MobAI {
                 mob.nextCallForHelp = System.currentTimeMillis() + 60000;
 
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: MobCallForHelp" + " " + e.getMessage());
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: MobCallForHelp" + " " + e.getMessage());
         }
     }
 
@@ -596,13 +621,39 @@ public class MobAI {
 
         try {
 
+            //if(mob.isSiege() || mob.isPet() || mob.isPlayerGuard()){
+            //    SuperSimpleMobAI.run(mob);
+            //    return;
+            //}
+            //boolean override;
+            //switch (mob.BehaviourType) {
+            //    case GuardCaptain:
+            //    case GuardMinion:
+            //    case GuardWallArcher:
+            //    case Pet1:
+            //    case HamletGuard:
+            //        override = false;
+            //        break;
+            //    default:
+             //       override = true;
+            //        break;
+            //}
+
+            //if(mob.isSiege())
+            //    override = false;
+
+            //if(mob.isPet())
+            //    override = false;
+
+            //if(override){
+            //    SuperSimpleMobAI.run(mob);
+            //    return;
+            //}
+
             //always check the respawn que, respawn 1 mob max per second to not flood the client
 
             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());
@@ -658,6 +709,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);
 
@@ -702,18 +757,22 @@ public class MobAI {
                     HamletGuardLogic(mob);
                     break;
                 default:
+                    //SuperSimpleMobAI.run(mob);
+                    //MobHandler.run(mob);
                     DefaultLogic(mob);
                     break;
             }
             if(mob.isAlive())
                 RecoverHealth(mob);
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: DetermineAction" + " " + e.getMessage());
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: DetermineAction" + " " + e.getMessage());
         }
     }
 
     private static void CheckForAggro(Mob aiAgent) {
 
+
+        //old system
         try {
 
             //looks for and sets mobs combatTarget
@@ -748,13 +807,11 @@ public class MobAI {
                     continue;
 
                 // No aggro for this race type
-
+                if (aiAgent.notEnemy.size() > 0 && aiAgent.notEnemy.contains(loadedPlayer.getRace().getRaceType().getMonsterType()))
-                if (aiAgent.notEnemy.size() > 0 && aiAgent.notEnemy.contains(loadedPlayer.getRace().getRaceType().getMonsterType()) == true)
                     continue;
 
                 //mob has enemies and this player race is not it
-
+                if (aiAgent.enemy.size() > 0 && !aiAgent.enemy.contains(loadedPlayer.getRace().getRaceType().getMonsterType()))
-                if (aiAgent.enemy.size() > 0 && aiAgent.enemy.contains(loadedPlayer.getRace().getRaceType().getMonsterType()) == false)
                     continue;
 
                 if (MovementUtilities.inRangeToAggro(aiAgent, loadedPlayer)) {
@@ -783,7 +840,7 @@ public class MobAI {
                 }
             }
         } catch (Exception e) {
-            Logger.info(aiAgent.getObjectUUID() + " " + aiAgent.getName() + " Failed At: CheckForAggro" + " " + e.getMessage());
+            //(aiAgent.getObjectUUID() + " " + aiAgent.getName() + " Failed At: CheckForAggro" + " " + e.getMessage());
         }
     }
 
@@ -844,7 +901,7 @@ public class MobAI {
 
             }
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckMobMovement" + " " + e.getMessage());
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckMobMovement" + " " + e.getMessage());
         }
     }
 
@@ -898,7 +955,7 @@ public class MobAI {
                 }
             }
         } catch (Exception e) {
-            Logger.info(aiAgent.getObjectUUID() + " " + aiAgent.getName() + " Failed At: CheckForRespawn" + " " + e.getMessage());
+            //(aiAgent.getObjectUUID() + " " + aiAgent.getName() + " Failed At: CheckForRespawn" + " " + e.getMessage());
         }
     }
 
@@ -924,7 +981,7 @@ public class MobAI {
                 AttackTarget(mob, mob.getCombatTarget());
 
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckForAttack" + " " + e.getMessage());
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckForAttack" + " " + e.getMessage());
         }
     }
 
@@ -951,7 +1008,8 @@ public class MobAI {
                     if (mob.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardCaptain.ordinal())
                         CheckForPlayerGuardAggro(mob);
                 } else {
-                    CheckForAggro(mob);
+                    if(mob.combatTarget == null)
+                        NewAggroMechanic(mob);
                 }
             }
 
@@ -985,7 +1043,7 @@ public class MobAI {
                 mob.setCombatTarget(null);
             }
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckToSendMobHome" + " " + e.getMessage());
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckToSendMobHome" + " " + e.getMessage());
         }
     }
 
@@ -1028,7 +1086,7 @@ public class MobAI {
             mob.updateMovementState();
             mob.updateLocation();
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: chaseTarget" + " " + e.getMessage());
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: chaseTarget" + " " + e.getMessage());
         }
     }
 
@@ -1060,7 +1118,7 @@ public class MobAI {
                 mob.setCombatTarget(aggroMob);
             }
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: SafeGuardAggro" + " " + e.getMessage());
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: SafeGuardAggro" + " " + e.getMessage());
         }
     }
 
@@ -1083,21 +1141,10 @@ public class MobAI {
             if (mob.getCombatTarget() == null)
                 CheckForPlayerGuardAggro(mob);
 
-            AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);
-
-            if (newTarget != null) {
-
-                if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
-                    if (GuardCanAggro(mob, (PlayerCharacter) newTarget))
-                        mob.setCombatTarget(newTarget);
-                } else
-                    mob.setCombatTarget(newTarget);
-
-            }
             CheckMobMovement(mob);
             CheckForAttack(mob);
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardCaptainLogic" + " " + e.getMessage());
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardCaptainLogic" + " " + e.getMessage());
         }
     }
 
@@ -1119,7 +1166,7 @@ public class MobAI {
             CheckMobMovement(mob);
             CheckForAttack(mob);
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardMinionLogic" + " " + e.getMessage());
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardMinionLogic" + " " + e.getMessage());
         }
     }
 
@@ -1133,7 +1180,7 @@ public class MobAI {
             else
                 CheckForAttack(mob);
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardWallArcherLogic" + " " + e.getMessage());
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardWallArcherLogic" + " " + e.getMessage());
         }
     }
 
@@ -1145,12 +1192,16 @@ 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);
 
             CheckForAttack(mob);
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: PetLogic" + " " + e.getMessage());
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: PetLogic" + " " + e.getMessage());
         }
     }
 
@@ -1166,7 +1217,7 @@ public class MobAI {
 
             CheckForAttack(mob);
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: HamletGuardLogic" + " " + e.getMessage());
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: HamletGuardLogic" + " " + e.getMessage());
         }
     }
 
@@ -1181,17 +1232,11 @@ public class MobAI {
 
             if (mob.BehaviourType.isAgressive) {
 
-                AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);
+                if (mob.getCombatTarget() == null) {
-
+                    if (mob.BehaviourType == Enum.MobBehaviourType.HamletGuard)
-                if (newTarget != null)
+                        SafeGuardAggro(mob);  //safehold guard
-                    mob.setCombatTarget(newTarget);
+                    else
-                else {
+                        NewAggroMechanic(mob);//CheckForAggro(mob);   //normal aggro
-                    if (mob.getCombatTarget() == null) {
-                        if (mob.BehaviourType == Enum.MobBehaviourType.HamletGuard)
-                            SafeGuardAggro(mob);  //safehold guard
-                        else
-                            CheckForAggro(mob);   //normal aggro
-                    }
                 }
             }
 
@@ -1205,8 +1250,9 @@ 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());
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: DefaultLogic" + " " + e.getMessage());
         }
     }
 
@@ -1256,7 +1302,7 @@ public class MobAI {
                 }
             }
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckForPlayerGuardAggro" + e.getMessage());
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckForPlayerGuardAggro" + e.getMessage());
         }
     }
 
@@ -1319,7 +1365,7 @@ public class MobAI {
                 }
             }
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardCanAggro" + " " + e.getMessage());
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardCanAggro" + " " + e.getMessage());
         }
         return false;
     }
@@ -1368,41 +1414,10 @@ public class MobAI {
                 }
             }
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: randomGuardPatrolPoints" + " " + e.getMessage());
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: randomGuardPatrolPoints" + " " + e.getMessage());
         }
     }
 
-    public static AbstractWorldObject ChangeTargetFromHateValue(Mob mob) {
-
-        try {
-
-            float CurrentHateValue = 0;
-
-            if (mob.getCombatTarget() != null && mob.getCombatTarget().getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
-                CurrentHateValue = ((PlayerCharacter) mob.getCombatTarget()).getHateValue();
-
-            AbstractWorldObject mostHatedTarget = null;
-
-            for (Entry playerEntry : mob.playerAgroMap.entrySet()) {
-
-                PlayerCharacter potentialTarget = PlayerCharacter.getFromCache((int) playerEntry.getKey());
-
-                if (potentialTarget.equals(mob.getCombatTarget()))
-                    continue;
-
-                if (potentialTarget != null && potentialTarget.getHateValue() > CurrentHateValue && MovementUtilities.inRangeToAggro(mob, potentialTarget)) {
-                    CurrentHateValue = potentialTarget.getHateValue();
-                    mostHatedTarget = potentialTarget;
-                }
-
-            }
-            return mostHatedTarget;
-        } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: ChangeTargetFromMostHated" + " " + e.getMessage());
-        }
-        return null;
-    }
-
     public static void RecoverHealth(Mob mob) {
         //recover health
         try {
@@ -1420,7 +1435,7 @@ public class MobAI {
                         mob.setHealth(mob.getHealthMax());
                 }
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: RecoverHealth" + " " + e.getMessage());
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: RecoverHealth" + " " + e.getMessage());
         }
     }
 
@@ -1430,4 +1445,69 @@ public class MobAI {
         rwss.setPlayer(mob);
         DispatchMessage.sendToAllInRange(mob, rwss);
     }
+
+    public static void NewAggroMechanic(Mob mob){
+
+        if(mob == null || !mob.isAlive() || mob.playerAgroMap.isEmpty()){
+            return;
+        }
+
+        if(mob.BehaviourType.equals(Enum.MobBehaviourType.HamletGuard)){
+            return;
+        }
+
+        if(mob.hate_values == null)
+            mob.hate_values = new HashMap<>();
+
+        if(mob.combatTarget != null)
+            return;
+
+        HashSet<AbstractWorldObject> inRange = WorldGrid.getObjectsInRangePartial(mob.loc,60.0f,MBServerStatics.MASK_PLAYER);
+
+        if(inRange.isEmpty()){
+            mob.setCombatTarget(null);
+            return;
+        }
+
+        //clear out any players who are not in hated range anymore
+        ArrayList<PlayerCharacter> toRemove = new ArrayList<>();
+        for(PlayerCharacter pc : mob.hate_values.keySet()){
+            if(!inRange.contains(pc))
+                toRemove.add(pc);
+        }
+        for(PlayerCharacter pc : toRemove){
+            mob.hate_values.remove(pc);
+        }
+
+        //find most hated target
+        PlayerCharacter mostHated = (PlayerCharacter)inRange.iterator().next();
+        for(AbstractWorldObject awo : inRange){
+            PlayerCharacter loadedPlayer = (PlayerCharacter)awo;
+            if (loadedPlayer == null)
+                continue;
+
+            //Player is Dead, Mob no longer needs to attempt to aggro. Remove them from aggro map.
+            if (!loadedPlayer.isAlive())
+                continue;
+
+            //Can't see target, skip aggro.
+            if (!mob.canSee(loadedPlayer))
+                continue;
+
+            // No aggro for this race type
+            if (mob.notEnemy != null && mob.notEnemy.size() > 0 && mob.notEnemy.contains(loadedPlayer.getRace().getRaceType().getMonsterType()))
+                continue;
+
+            //mob has enemies and this player race is not it
+            if (mob.enemy != null && mob.enemy.size() > 0 && !mob.enemy.contains(loadedPlayer.getRace().getRaceType().getMonsterType()))
+                continue;
+
+            if(mob.hate_values.containsKey(loadedPlayer))
+                if(mob.hate_values.get(loadedPlayer) > mob.hate_values.get(mostHated))
+                    mostHated = loadedPlayer;
+        }
+
+        if(mostHated != null)
+            mob.setCombatTarget(mostHated);
+    }
 }

src/engine/mobileAI/MobHandlers/MobHandler.java

@@ -0,0 +1,282 @@
+package engine.mobileAI.MobHandlers;
+
+import engine.InterestManagement.WorldGrid;
+import engine.gameManager.PowersManager;
+import engine.mobileAI.Threads.MobAIThread;
+import engine.mobileAI.utilities.CombatUtilities;
+import engine.mobileAI.utilities.MovementUtilities;
+import engine.objects.*;
+import engine.powers.PowersBase;
+import engine.server.MBServerStatics;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class MobHandler {
+    public static void run(Mob mob){
+
+        if (!mob.isAlive()) {
+            CheckForRespawn(mob);
+            return;
+        }
+
+        if(mob.playerAgroMap.isEmpty())
+            return;
+
+        CheckToSendMobHome(mob);
+
+        if(mob.combatTarget == null || !mob.combatTarget.isAlive()){
+            CheckForAggro(mob);
+        }
+        if(mob.combatTarget != null)
+            CheckToDropAggro(mob);
+
+        if(MovementUtilities.canMove(mob))
+            CheckMobMovement(mob);
+
+        if(mob.combatTarget != null && CombatUtilities.inRangeToAttack(mob,mob.combatTarget))
+            CheckToAttack(mob);
+    }
+
+    public static void CheckToDropAggro(Mob mob){
+        if(mob.loc.distanceSquared(mob.combatTarget.loc) > (128f * 128f))
+            mob.setCombatTarget(null);
+    }
+
+    public static void CheckForRespawn(Mob mob){
+        try {
+
+            if (mob.deathTime == 0) {
+                mob.setDeathTime(System.currentTimeMillis());
+                return;
+            }
+
+            //handles checking for respawn of dead mobs even when no players have mob loaded
+            //Despawn Timer with Loot currently in inventory.
+
+            if (!mob.despawned) {
+
+                if (mob.getCharItemManager().getInventoryCount() > 0) {
+                    if (System.currentTimeMillis() > mob.deathTime + MBServerStatics.DESPAWN_TIMER_WITH_LOOT) {
+                        mob.despawn();
+                        mob.deathTime = System.currentTimeMillis();
+                        return;
+                    }
+                    //No items in inventory.
+                } else if (mob.isHasLoot()) {
+                    if (System.currentTimeMillis() > mob.deathTime + MBServerStatics.DESPAWN_TIMER_ONCE_LOOTED) {
+                        mob.despawn();
+                        mob.deathTime = System.currentTimeMillis();
+                        return;
+                    }
+                    //Mob never had Loot.
+                } else {
+                    if (System.currentTimeMillis() > mob.deathTime + MBServerStatics.DESPAWN_TIMER) {
+                        mob.despawn();
+                        mob.deathTime = System.currentTimeMillis();
+                        return;
+                    }
+                }
+                return;
+            }
+
+            if(Mob.discDroppers.contains(mob))
+                return;
+
+            if (mob.despawned && System.currentTimeMillis() > (mob.deathTime + (mob.spawnTime * 1000L))) {
+                if (!Zone.respawnQue.contains(mob)) {
+                    Zone.respawnQue.add(mob);
+                }
+            }
+        } catch (Exception e) {
+            //(aiAgent.getObjectUUID() + " " + aiAgent.getName() + " Failed At: CheckForRespawn" + " " + e.getMessage());
+        }
+    }
+
+    public static void CheckForAggro(Mob mob){
+        switch(mob.BehaviourType){
+            case SimpleStandingGuard:
+            case Simple:
+            case None:
+                return;
+        }
+        PlayerCharacter tar = null;
+        for(int id : mob.playerAgroMap.keySet()){
+            PlayerCharacter target = PlayerCharacter.getFromCache(id);
+
+            if(target.loc.distanceSquared(mob.loc) > mob.getAggroRange() * mob.getAggroRange())
+                continue;
+
+            if(tar == null || mob.loc.distanceSquared(tar.loc) < mob.loc.distanceSquared(target.loc))
+                if(MobCanAggro(mob,target))
+                    tar = target;
+        }
+        if(tar != null)
+            mob.setCombatTarget(tar);
+    }
+
+    public static Boolean MobCanAggro(Mob mob, PlayerCharacter loadedPlayer){
+        if (loadedPlayer == null)
+            return false;
+
+        //Player is Dead, Mob no longer needs to attempt to aggro. Remove them from aggro map.
+        if (!loadedPlayer.isAlive())
+            return false;
+
+        //Can't see target, skip aggro.
+        if (!mob.canSee(loadedPlayer))
+            return false;
+
+        // No aggro for this race type
+        if (mob.notEnemy != null && mob.notEnemy.size() > 0 && mob.notEnemy.contains(loadedPlayer.getRace().getRaceType().getMonsterType()))
+            return false;
+
+        //mob has enemies and this player race is not it
+        if (mob.enemy != null && mob.enemy.size() > 0 && !mob.enemy.contains(loadedPlayer.getRace().getRaceType().getMonsterType()))
+            return false;
+
+        return true;
+    }
+
+    public static void CheckMobMovement(Mob mob){
+        if(!mob.isAlive())
+            return;
+
+        mob.updateLocation();
+
+        if(mob.combatTarget == null){
+            //patrol
+            Patrol(mob);
+        }else{
+            //combat movement
+            if(CombatUtilities.inRangeToAttack(mob,mob.combatTarget)) {
+                return;
+            }else {
+                MovementUtilities.moveToLocation(mob, mob.combatTarget.loc, mob.getRange());
+            }
+        }
+    }
+
+    public static void CheckToAttack(Mob mob){
+        try {
+
+            if(mob.getLastAttackTime() > System.currentTimeMillis())
+                return;
+
+            PlayerCharacter target = (PlayerCharacter) mob.combatTarget;
+
+            if (!mob.canSee(target)) {
+                mob.setCombatTarget(null);
+                return;
+            }
+
+            //if (mob.BehaviourType.callsForHelp)
+            MobCallForHelp(mob);
+
+            if (mob.isMoving() && mob.getRange() > 20)
+                return;
+
+            if(target.combatStats == null)
+                target.combatStats = new PlayerCombatStats(target);
+
+            ItemBase mainHand = mob.getWeaponItemBase(true);
+            ItemBase offHand = mob.getWeaponItemBase(false);
+
+            if (mainHand == null && offHand == null) {
+                CombatUtilities.combatCycle(mob, target, true, null);
+                int delay = 3000;
+                mob.setLastAttackTime(System.currentTimeMillis() + delay);
+            } else if (mob.getWeaponItemBase(true) != null) {
+                int delay = 3000;
+                CombatUtilities.combatCycle(mob, target, true, mob.getWeaponItemBase(true));
+                mob.setLastAttackTime(System.currentTimeMillis() + delay);
+            } else if (mob.getWeaponItemBase(false) != null) {
+                int attackDelay = 3000;
+                CombatUtilities.combatCycle(mob, target, false, mob.getWeaponItemBase(false));
+                mob.setLastAttackTime(System.currentTimeMillis() + attackDelay);
+            }
+
+            if (target.getPet() != null)
+                if (target.getPet().getCombatTarget() == null && target.getPet().assist)
+                    target.getPet().setCombatTarget(mob);
+
+        } catch (Exception e) {
+            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackPlayer" + " " + e.getMessage());
+        }
+    }
+
+    public static void MobCallForHelp(Mob mob) {
+
+        try {
+            HashSet<AbstractWorldObject> helpers = WorldGrid.getObjectsInRangePartial(mob.loc,mob.getAggroRange() * 2, MBServerStatics.MASK_MOB);
+            for (AbstractWorldObject awo : helpers) {
+                if(awo.equals(mob))
+                    continue;
+                Mob helper = (Mob) awo;
+
+                if(helper.equals(mob))
+                    continue;
+
+                if(helper.combatTarget != null)
+                    continue;
+
+                helper.setCombatTarget(mob.getCombatTarget());
+            }
+
+        } catch (Exception e) {
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: MobCallForHelp" + " " + e.getMessage());
+        }
+    }
+
+    private static void Patrol(Mob mob) {
+
+        try {
+
+            if(mob.isMoving())
+                return;
+            //make sure mob is out of combat stance
+
+            int patrolDelay = ThreadLocalRandom.current().nextInt((int) (MobAIThread.AI_PATROL_DIVISOR * 0.5f), MobAIThread.AI_PATROL_DIVISOR) + MobAIThread.AI_PATROL_DIVISOR;
+
+            //early exit while waiting to patrol again
+
+            if (mob.stopPatrolTime + (patrolDelay * 1000) > System.currentTimeMillis())
+                return;
+
+            if (mob.lastPatrolPointIndex > mob.patrolPoints.size() - 1)
+                mob.lastPatrolPointIndex = 0;
+
+            mob.destination = mob.patrolPoints.get(mob.lastPatrolPointIndex);
+            mob.lastPatrolPointIndex += 1;
+
+            MovementUtilities.aiMove(mob, mob.destination, true);
+
+        } catch (Exception e) {
+            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackTarget" + " " + e.getMessage());
+        }
+    }
+
+    private static void CheckToSendMobHome(Mob mob) {
+
+        if(mob.isNecroPet())
+            return;
+
+        try {
+
+            if (!MovementUtilities.inRangeOfBindLocation(mob)) {
+
+                PowersBase recall = PowersManager.getPowerByToken(-1994153779);
+                PowersManager.useMobPower(mob, mob, recall, 40);
+
+                for (Map.Entry playerEntry : mob.playerAgroMap.entrySet())
+                    PlayerCharacter.getFromCache((int) playerEntry.getKey()).setHateValue(0);
+
+                mob.setCombatTarget(null);
+            }
+        } catch (Exception e) {
+            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckToSendMobHome" + " " + e.getMessage());
+        }
+    }
+
+}

src/engine/mobileAI/MobHandlers/PetHandler.java

@@ -0,0 +1,66 @@
+package engine.mobileAI.MobHandlers;
+
+import engine.Enum;
+import engine.gameManager.MovementManager;
+import engine.gameManager.ZoneManager;
+import engine.mobileAI.utilities.CombatUtilities;
+import engine.mobileAI.utilities.MovementUtilities;
+import engine.objects.City;
+import engine.objects.Mob;
+import engine.objects.PlayerCharacter;
+
+public class PetHandler {
+
+    public static void run(Mob pet){
+        PlayerCharacter owner = pet.getOwner();
+
+        if(owner == null)
+            return;
+
+        if(!pet.isAlive()){
+            return;
+        }
+
+        if(!owner.isAlive()) {
+            owner.dismissPet();
+            return;
+        }
+
+        pet.updateLocation();
+
+        if(pet.combatTarget == null){
+            //follow owner
+            if(!CombatUtilities.inRangeToAttack(pet,owner)) {
+                MovementUtilities.moveToLocation(pet, owner.loc, pet.getRange());
+            }
+        }else{
+
+            if (pet.combatTarget.equals(pet)) {
+                pet.setCombatTarget(null);
+                return;
+            }
+
+            //chase target
+            if(!CombatUtilities.inRangeToAttack(pet,pet.combatTarget)) {
+                MovementUtilities.moveToLocation(pet, pet.combatTarget.loc, pet.getRange());
+            }else{
+                if(pet.getLastAttackTime() > System.currentTimeMillis())
+                    return;
+
+                pet.setLastAttackTime(System.currentTimeMillis() + 3000);
+
+                //attack target
+                if(pet.combatTarget.getObjectType().equals(Enum.GameObjectType.Building)){
+                    //attacking building
+                    City playercity = ZoneManager.getCityAtLocation(pet.getLoc());
+                    if (playercity != null)
+                        for (Mob guard : playercity.getParent().zoneMobSet)
+                            if (guard.combatTarget == null && guard.getGuild() != null && pet.getGuild() != null && !guard.getGuild().equals(pet.getGuild()))
+                                MovementUtilities.aiMove(guard,pet.loc,false);
+                }
+
+                CombatUtilities.combatCycle(pet,pet.combatTarget,true,null);
+            }
+        }
+    }
+}

src/engine/mobileAI/MobHandlers/PlayerGuardHandler.java

@@ -0,0 +1,449 @@
+package engine.mobileAI.MobHandlers;
+
+import engine.gameManager.PowersManager;
+import engine.math.Vector3fImmutable;
+import engine.mobileAI.Threads.MobAIThread;
+import engine.mobileAI.utilities.CombatUtilities;
+import engine.mobileAI.utilities.MovementUtilities;
+import engine.net.client.msg.PerformActionMsg;
+import engine.objects.*;
+import engine.powers.ActionsBase;
+import engine.powers.PowersBase;
+import engine.server.MBServerStatics;
+
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class PlayerGuardHandler {
+    public static void run(Mob guard) {
+        if(!guard.isAlive() || guard.despawned){
+            CheckRespawn(guard);
+            return;
+        }
+
+        CheckForRecall(guard);
+
+        if (guard.contract != null && guard.contract.getName().contains("Wall Archer")) {
+            runWallArcherGuard(guard);
+            return;
+        }else if (guard.contract != null && guard.contract.getName().contains("Magister")) {
+            runMagisterGuard(guard);
+            return;
+        }else if (guard.contract != null && guard.contract.getName().contains("Archer")) {
+            runArcherGuard(guard);
+            return;
+        }
+        runMeleGuard(guard);
+    }
+
+    public static void runMeleGuard(Mob guard){
+        try {
+            if (guard.combatTarget != null)
+                checkToDropGuardAggro(guard);
+
+            if (guard.combatTarget == null)
+                CheckForPlayerGuardAggro(guard);
+
+            if(MovementUtilities.canMove(guard))
+                CheckGuardMovement(guard);
+
+            if (guard.combatTarget != null && CombatUtilities.inRangeToAttack(guard, guard.combatTarget))
+                CheckToAttack(guard);
+
+        } catch (Exception ignored) {
+
+        }
+    }
+
+    public static void runArcherGuard(Mob guard){
+        try {
+            if (guard.combatTarget != null)
+                checkToDropGuardAggro(guard);
+
+            if (guard.combatTarget == null)
+                CheckForPlayerGuardAggro(guard);
+
+            if(MovementUtilities.canMove(guard))
+                CheckGuardMovement(guard);
+
+            if (guard.combatTarget != null && CombatUtilities.inRangeToAttack(guard, guard.combatTarget))
+                CheckToAttack(guard);
+
+        } catch (Exception ignored) {
+
+        }
+    }
+
+    public static void runMagisterGuard(Mob guard){
+        try {
+            if (guard.combatTarget != null)
+                checkToDropGuardAggro(guard);
+
+            if (guard.combatTarget == null)
+                CheckForPlayerGuardAggro(guard);
+
+            if(MovementUtilities.canMove(guard))
+                CheckMagisterMovement(guard);
+
+            if (guard.combatTarget != null && inRangeToCast(guard, guard.combatTarget))
+                GuardCast(guard);
+
+        } catch (Exception ignored) {
+
+        }
+    }
+
+    public static void runWallArcherGuard(Mob guard){
+        try {
+            if (guard.combatTarget != null)
+                checkToDropGuardAggro(guard);
+
+            if (guard.combatTarget == null)
+                CheckForPlayerGuardAggro(guard);
+
+            if (guard.combatTarget != null && CombatUtilities.inRangeToAttack(guard, guard.combatTarget))
+                CheckToAttack(guard);
+
+        } catch (Exception ignored) {
+
+        }
+    }
+
+    public static void checkToDropGuardAggro(Mob guard){
+        if(guard.combatTarget.loc.distanceSquared(guard.loc) > (128f * 128f))
+            guard.setCombatTarget(null);
+    }
+
+    public static void CheckForPlayerGuardAggro(Mob guard){
+        PlayerCharacter tar = null;
+        for(int id : guard.playerAgroMap.keySet()){
+            PlayerCharacter target = PlayerCharacter.getFromCache(id);
+
+            float aggroRange = guard.getAggroRange();
+
+            if(guard.getEquip().get(2) != null && guard.getEquip().get(2).getItemBase().getRange() > 15)
+                aggroRange = guard.getEquip().get(2).getItemBase().getRange() * 1.5f;
+
+            float squared = aggroRange * aggroRange;
+
+            if(target.loc.distanceSquared(guard.loc) > squared)
+                continue;
+
+            if(tar == null || guard.loc.distanceSquared(tar.loc) < guard.loc.distanceSquared(target.loc))
+                if(GuardCanAggro(guard,target))
+                    tar = target;
+        }
+        if(tar != null)
+            guard.setCombatTarget(tar);
+    }
+
+    public static Boolean GuardCanAggro(Mob guard, PlayerCharacter loadedPlayer){
+        if (loadedPlayer == null)
+            return false;
+
+        //Player is Dead, Mob no longer needs to attempt to aggro. Remove them from aggro map.
+        if (!loadedPlayer.isAlive())
+            return false;
+
+        //Can't see target, skip aggro.
+        if (!guard.canSee(loadedPlayer))
+            return false;
+
+        if(guard.guardedCity != null && guard.guardedCity.cityOutlaws.contains(loadedPlayer.getObjectUUID()))
+            return true;
+
+        if(loadedPlayer.guild.getNation().equals(guard.guardedCity.getGuild().getNation()))
+            return false;
+
+        return !guard.guardedCity.isOpen();
+    }
+
+    public static void GuardCast(Mob mob) {
+
+        if(mob.nextCastTime > System.currentTimeMillis())
+            return;
+
+        try {
+            // Method picks a random spell from a mobile's list of powers
+            // and casts it on the current target (or itself).  Validation
+            // (including empty lists) is done previously within canCast();
+
+            ArrayList<Integer> powerTokens;
+            ArrayList<Integer> purgeTokens;
+            AbstractCharacter target = (AbstractCharacter) mob.getCombatTarget();
+
+            // Generate a list of tokens from the mob powers for this mobile.
+
+            powerTokens = new ArrayList<>(mob.mobPowers.keySet());
+            purgeTokens = new ArrayList<>();
+
+            // If player has this effect on them currently then remove
+            // this token from our list.
+
+            for (int powerToken : powerTokens) {
+
+                PowersBase powerBase = PowersManager.getPowerByToken(powerToken);
+
+                for (ActionsBase actionBase : powerBase.getActions()) {
+
+                    String stackType = actionBase.stackType;
+
+                    if (target.getEffects() != null && target.getEffects().containsKey(stackType))
+                        purgeTokens.add(powerToken);
+                }
+            }
+
+            powerTokens.removeAll(purgeTokens);
+
+            // Sanity check
+
+            if (powerTokens.isEmpty())
+                return;
+
+            int powerToken;
+            int nukeRoll = ThreadLocalRandom.current().nextInt(1,100);
+
+            if (nukeRoll < 55) {
+
+                //use direct damage spell
+                powerToken = powerTokens.get(powerTokens.size() - 1);
+
+            } else {
+                //use random spell
+                powerToken = powerTokens.get(ThreadLocalRandom.current().nextInt(powerTokens.size()));
+            }
+
+            int powerRank = 1;
+
+            switch(mob.getRank()){
+                case 1:
+                    powerRank = 10;
+                    break;
+                case 2:
+                    powerRank = 15;
+                    break;
+                case 3:
+                    powerRank = 20;
+                    break;
+                case 4:
+                    powerRank = 25;
+                    break;
+                case 5:
+                    powerRank = 30;
+                    break;
+                case 6:
+                    powerRank = 35;
+                    break;
+                case 7:
+                    powerRank = 40;
+                    break;
+            }
+
+            PowersBase mobPower = PowersManager.getPowerByToken(powerToken);
+
+            //check for hit-roll
+
+            if (mobPower.requiresHitRoll)
+                if (CombatUtilities.triggerDefense(mob, mob.getCombatTarget()))
+                    return;
+
+            // Cast the spell
+
+            if (CombatUtilities.inRange2D(mob, mob.getCombatTarget(), mobPower.getRange())) {
+
+                PerformActionMsg msg;
+
+                if (!mobPower.isHarmful() || mobPower.targetSelf) {
+
+                    if (mobPower.category.equals("DISPEL")) {
+                        PowersManager.useMobPower(mob, target, mobPower, powerRank);
+                        msg = PowersManager.createPowerMsg(mobPower, powerRank, mob, target);
+                    } else {
+                        PowersManager.useMobPower(mob, mob, mobPower, powerRank);
+                        msg = PowersManager.createPowerMsg(mobPower, powerRank, mob, mob);
+                    }
+                } else {
+                    PowersManager.useMobPower(mob, target, mobPower, powerRank);
+                    msg = PowersManager.createPowerMsg(mobPower, powerRank, mob, target);
+                }
+
+                msg.setUnknown04(2);
+
+                PowersManager.finishUseMobPower(msg, mob, 0, 0);
+            }
+            mob.nextCastTime = (long) (System.currentTimeMillis() + MobAIThread.AI_CAST_FREQUENCY);
+        } catch (Exception e) {
+            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: MobCast" + " " + e.getMessage());
+        }
+    }
+
+    public static void CheckToAttack(Mob guard){
+        try {
+
+            if(guard.getLastAttackTime() > System.currentTimeMillis())
+                return;
+
+            PlayerCharacter target = (PlayerCharacter) guard.combatTarget;
+
+            if (!guard.canSee(target)) {
+                guard.setCombatTarget(null);
+                return;
+            }
+
+            if (guard.isMoving() && guard.getRange() > 20)
+                return;
+
+            if(target.combatStats == null)
+                target.combatStats = new PlayerCombatStats(target);
+
+            ItemBase mainHand = guard.getWeaponItemBase(true);
+            ItemBase offHand = guard.getWeaponItemBase(false);
+
+            if (mainHand == null && offHand == null) {
+                CombatUtilities.combatCycle(guard, target, true, null);
+                int delay = 3000;
+                guard.setLastAttackTime(System.currentTimeMillis() + delay);
+            } else if (guard.getWeaponItemBase(true) != null) {
+                int delay = 3000;
+                CombatUtilities.combatCycle(guard, target, true, guard.getWeaponItemBase(true));
+                guard.setLastAttackTime(System.currentTimeMillis() + delay);
+            } else if (guard.getWeaponItemBase(false) != null) {
+                int attackDelay = 3000;
+                CombatUtilities.combatCycle(guard, target, false, guard.getWeaponItemBase(false));
+                guard.setLastAttackTime(System.currentTimeMillis() + attackDelay);
+            }
+
+            if (target.getPet() != null)
+                if (target.getPet().getCombatTarget() == null && target.getPet().assist)
+                    target.getPet().setCombatTarget(guard);
+
+        } catch (Exception e) {
+            ////(guard.getObjectUUID() + " " + guard.getName() + " Failed At: AttackPlayer" + " " + e.getMessage());
+        }
+    }
+
+    public static void CheckGuardMovement(Mob guard){
+        if (guard.getCombatTarget() == null) {
+            if (!guard.isMoving())
+                Patrol(guard);
+            else {
+                guard.stopPatrolTime = System.currentTimeMillis();
+            }
+        } else {
+            MovementUtilities.moveToLocation(guard, guard.combatTarget.loc, guard.getRange());
+        }
+    }
+
+    private static void Patrol(Mob mob) {
+
+        try {
+
+            if(mob.isMoving())
+                return;
+            //make sure mob is out of combat stance
+
+            int patrolDelay = ThreadLocalRandom.current().nextInt((int) (MobAIThread.AI_PATROL_DIVISOR * 0.5f), MobAIThread.AI_PATROL_DIVISOR) + MobAIThread.AI_PATROL_DIVISOR;
+
+            //early exit while waiting to patrol again
+
+            if (mob.stopPatrolTime + (patrolDelay * 1000L) > System.currentTimeMillis())
+                return;
+
+            if (mob.lastPatrolPointIndex > mob.patrolPoints.size() - 1)
+                mob.lastPatrolPointIndex = 0;
+
+            mob.destination = Vector3fImmutable.getRandomPointOnCircle(mob.patrolPoints.get(mob.lastPatrolPointIndex),16f);
+            mob.lastPatrolPointIndex += 1;
+
+            MovementUtilities.aiMove(mob, mob.destination, true);
+
+        } catch (Exception e) {
+            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackTarget" + " " + e.getMessage());
+        }
+    }
+
+    private static boolean inRangeToCast(Mob guard, AbstractWorldObject target){
+        float castRangeSquared = 50f * 50f;
+        float rangeSquared = guard.loc.distanceSquared(target.loc);
+        return castRangeSquared >= rangeSquared;
+    }
+
+    public static void CheckMagisterMovement(Mob guard){
+        if (guard.getCombatTarget() == null) {
+            if (!guard.isMoving())
+                Patrol(guard);
+            else {
+                guard.stopPatrolTime = System.currentTimeMillis();
+            }
+        } else {
+            if(guard.isMoving()){
+                float desiredRangeSquared = 40f * 40f;
+                float distance = guard.loc.distanceSquared(guard.combatTarget.loc);
+                if(distance <= desiredRangeSquared){
+                    guard.stopMovement(guard.getMovementLoc());
+                    guard.updateLocation();
+                }
+            }else {
+                MovementUtilities.moveToLocation(guard, guard.combatTarget.loc, guard.getRange());
+            }
+        }
+    }
+
+    public static void CheckForRecall(Mob guard){
+
+        if(guard.loc.distanceSquared(guard.parentZone.getLoc()) > (800 * 800)) {
+
+            PowersBase recall = PowersManager.getPowerByToken(-1994153779);
+            PowersManager.useMobPower(guard, guard, recall, 40);
+
+            for (Map.Entry playerEntry : guard.playerAgroMap.entrySet())
+                PlayerCharacter.getFromCache((int) playerEntry.getKey()).setHateValue(0);
+
+            guard.setCombatTarget(null);
+        }
+    }
+
+    public static void CheckRespawn(Mob guard){
+        if(!guard.despawned)
+            guard.despawn();
+
+        long respawnTime = 0L;
+
+        Building barracks = guard.building;
+        if(barracks == null){
+            respawnTime = MBServerStatics.FIFTEEN_MINUTES;
+        }else{
+            switch(barracks.getRank()) {
+                case 2:
+                    respawnTime = 750000; // 12.5 minutes
+                    break;
+                case 3:
+                    respawnTime = 660000; // 11 minutes
+                    break;
+                case 4:
+                    respawnTime = 570000; // 9.5 minutes
+                    break;
+                case 5:
+                    respawnTime = 480000; // 8 minutes
+                    break;
+                case 6:
+                    respawnTime = 450000; // 6.5 minutes
+                    break;
+                case 7:
+                    respawnTime = MBServerStatics.FIVE_MINUTES;
+                    break;
+                default:
+                    respawnTime = MBServerStatics.FIFTEEN_MINUTES;
+                    break;
+            }
+
+        }
+
+        if(guard.deathTime + respawnTime < System.currentTimeMillis()){
+            if (!Zone.respawnQue.contains(guard)) {
+                Zone.respawnQue.add(guard);
+            }
+        }
+    }
+}

src/engine/mobileAI/MobHandlers/SiegeHandler.java

@@ -0,0 +1,56 @@
+package engine.mobileAI.MobHandlers;
+
+import engine.Enum;
+import engine.gameManager.MovementManager;
+import engine.gameManager.ZoneManager;
+import engine.mobileAI.utilities.CombatUtilities;
+import engine.mobileAI.utilities.MovementUtilities;
+import engine.objects.Building;
+import engine.objects.City;
+import engine.objects.Mob;
+import engine.server.MBServerStatics;
+
+public class SiegeHandler {
+    public static void run(Mob engine){
+
+        if(!engine.isAlive()) {
+            check_siege_respawn(engine);
+            return;
+        }
+
+        if(engine.getOwner() == null || !engine.getOwner().isAlive() || !engine.playerAgroMap.containsKey(engine.getOwner().getObjectUUID()))
+            return;
+
+        if(engine.combatTarget == null || !engine.combatTarget.getObjectType().equals(Enum.GameObjectType.Building))
+            return;
+
+        siege_attack(engine);
+    }
+
+    public static void check_siege_respawn(Mob engine){
+        if(!engine.despawned) {
+            engine.despawn();
+        }else{
+            if(engine.deathTime + MBServerStatics.FIFTEEN_MINUTES > System.currentTimeMillis()){
+                engine.respawn();
+            }
+        }
+    }
+
+    public static void siege_attack(Mob engine){
+        if(engine.getLastAttackTime() > System.currentTimeMillis())
+            return;
+
+        if(CombatUtilities.inRangeToAttack(engine,engine.combatTarget)){
+            CombatUtilities.combatCycle(engine, engine.combatTarget, true, null);
+            engine.setLastAttackTime(System.currentTimeMillis() + 15000);
+            City playercity = ZoneManager.getCityAtLocation(engine.getLoc());
+            if (playercity != null)
+                for (Mob guard : playercity.getParent().zoneMobSet)
+                    if (guard.isPlayerGuard && guard.combatTarget == null && guard.getGuild() != null && engine.getGuild() != null && !guard.getGuild().equals(engine.getGuild()))
+                        MovementUtilities.aiMove(guard,engine.loc,false);
+
+            MovementManager.sendRWSSMsg(engine);
+        }
+    }
+}

src/engine/mobileAI/SuperSimpleMobAI.java

@@ -0,0 +1,26 @@
+package engine.mobileAI;
+
+import engine.mobileAI.MobHandlers.MobHandler;
+import engine.mobileAI.MobHandlers.PetHandler;
+import engine.mobileAI.MobHandlers.PlayerGuardHandler;
+import engine.mobileAI.MobHandlers.SiegeHandler;
+import engine.objects.Mob;
+
+public class SuperSimpleMobAI {
+
+    public static void run(Mob mob){
+        mob.updateLocation();
+        if(mob.isPet() && !mob.isSiege()) {
+            PetHandler.run(mob);
+            return;
+        }else if (mob.isSiege()) {
+            SiegeHandler.run(mob);
+            return;
+        }else if(mob.isPlayerGuard()){
+            PlayerGuardHandler.run(mob);
+            return;
+        }else {
+            MobHandler.run(mob);
+        }
+    }
+}

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.SuperSimpleMobAI;
 import engine.objects.Mob;
 import engine.objects.Zone;
 import engine.server.MBServerStatics;
@@ -27,26 +28,26 @@ public class MobAIThread implements Runnable{
         AI_CAST_FREQUENCY = Float.parseFloat(ConfigManager.MB_AI_CAST_FREQUENCY.getValue());
         AI_BASE_AGGRO_RANGE = (int)(60 * Float.parseFloat(ConfigManager.MB_AI_AGGRO_RANGE.getValue()));
         while (true) {
-            for (Zone zone : ZoneManager.getAllZones()) {
+            try {
-                if (zone != null && zone.zoneMobSet != null) {
+                for (Zone zone : ZoneManager.getAllZones()) {
-                    synchronized (zone.zoneMobSet) {
+                    if (zone != null && zone.zoneMobSet != null) {
-                        for (Mob mob : zone.zoneMobSet) {
+                        synchronized (zone.zoneMobSet) {
-                            try {
+                            for (Mob mob : zone.zoneMobSet) {
-                                if (mob != null) {
+                                try {
-                                    MobAI.DetermineAction(mob);
+                                    if (mob != null) {
+                                        //MobAI.DetermineAction(mob);
+                                        SuperSimpleMobAI.run(mob);
+                                    }
+                                } catch (Exception e) {
+                                    Logger.error("Error processing Mob [Name: {}, UUID: {}]", mob.getName(), mob.getObjectUUID(), e);
                                 }
-                            } catch (Exception e) {
-                                Logger.error("Error processing Mob [Name: {}, UUID: {}]", mob.getName(), mob.getObjectUUID(), e);
                             }
                         }
                     }
                 }
-            }
-            try {
                 Thread.sleep(100);
-            } catch (InterruptedException e) {
+            }catch(Exception e){
-                Logger.error("AI Thread interrupted", e);
+                Logger.error(e.getMessage());
-                Thread.currentThread().interrupt();
             }
         }
     }

src/engine/mobileAI/Threads/MobRespawnThread.java

@@ -43,14 +43,13 @@ public class MobRespawnThread implements Runnable {
                 if (zones != null) {
                     for (Zone zone : zones) {
                         synchronized (zone) { // Optional: Synchronize on zone
-                            if (!zone.respawnQue.isEmpty() &&
+                            if (!Zone.respawnQue.isEmpty() && Zone.lastRespawn + RESPAWN_INTERVAL < System.currentTimeMillis()) {
-                                    zone.lastRespawn + RESPAWN_INTERVAL < System.currentTimeMillis()) {
 
-                                Mob respawner = zone.respawnQue.iterator().next();
+                                Mob respawner = Zone.respawnQue.iterator().next();
                                 if (respawner != null) {
                                     respawner.respawn();
-                                    zone.respawnQue.remove(respawner);
+                                    Zone.respawnQue.remove(respawner);
-                                    zone.lastRespawn = System.currentTimeMillis();
+                                    Zone.lastRespawn = System.currentTimeMillis();
                                     Thread.sleep(100);
                                 }
                             }

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.
@@ -147,13 +155,19 @@ public class CombatUtilities {
         }
         switch (target.getObjectType()) {
             case PlayerCharacter:
-                defense = ((AbstractCharacter) target).getDefenseRating();
+                PlayerCharacter pc = (PlayerCharacter)target;
+                if(pc.combatStats == null)
+                    pc.combatStats = new PlayerCombatStats(pc);
+                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;
@@ -196,12 +210,10 @@ public class CombatUtilities {
                 return;
 
         int anim = 75;
-        float speed;
 
-        if (mainHand)
+        //handle the retaliate here because even if the mob misses you can still retaliate
-            speed = agent.getSpeedHandOne();
+        if (AbstractWorldObject.IsAbstractCharacter(target))
-        else
+            CombatManager.handleRetaliate((AbstractCharacter) target, agent);
-            speed = agent.getSpeedHandTwo();
 
         DamageType dt = DamageType.Crush;
 
@@ -283,11 +295,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())
@@ -322,9 +329,9 @@ public class CombatUtilities {
             damage = calculateMobDamage(agent);
         }
         if (AbstractWorldObject.IsAbstractCharacter(target)) {
-            if (((AbstractCharacter) target).isSit()) {
+            //if (((AbstractCharacter) target).isSit()) {
-                damage *= 2.5f; //increase damage if sitting
+            //    damage *= 2.5f; //increase damage if sitting
-            }
+            //}
             return (int) (((AbstractCharacter) target).getResists().getResistedDamage(agent, (AbstractCharacter) target, dt, damage, 0));
         }
         if (target.getObjectType() == GameObjectType.Building) {

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<>();

src/engine/net/AbstractConnectionManager.java

@@ -87,6 +87,7 @@ public abstract class AbstractConnectionManager extends ControlledRunnable {
 
                 this.processChangeRequests();
                 this.auditSocketChannelToConnectionMap();
+                //this.selector.select();
                 this.selector.select(250L);
                 this.processNewEvents();
 
@@ -664,7 +665,7 @@ public abstract class AbstractConnectionManager extends ControlledRunnable {
         }
 
         @Override
-        protected void doJob() {
+        public void doJob() {
             if (runStatus) {
                 this.ac.connMan.receive(sk);
                 this.ac.execTask.compareAndSet(true, false);
@@ -693,7 +694,7 @@ public abstract class AbstractConnectionManager extends ControlledRunnable {
         }
 
         @Override
-        protected void doJob() {
+        public void doJob() {
             if (runStatus) {
                 this.ac.connMan.sendFinish(sk);
                 this.ac.execTask.compareAndSet(true, false);

src/engine/net/CheckNetMsgFactoryJob.java

@@ -23,7 +23,7 @@ public class CheckNetMsgFactoryJob extends AbstractJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
         NetMsgFactory factory = conn.getFactory();
 
         // Make any/all msg possible

src/engine/net/ConnectionMonitorJob.java

@@ -26,7 +26,7 @@ public class ConnectionMonitorJob extends AbstractJob {
     }
 
     @Override
-    protected void doJob() {
+    public void doJob() {
 
         if (this.cnt >= 5) {
             this.connMan.auditSocketChannelToConnectionMap();

src/engine/net/client/ClientConnection.java

@@ -44,9 +44,16 @@ public class ClientConnection extends AbstractConnection {
     public ReentrantLock buyLock = new ReentrantLock();
     public boolean desyncDebug = false;
     public byte[] lastByteBuffer;
+    public long lastTargetSwitchTime;
     protected SessionID sessionID = null;
     private byte cryptoInitTries = 0;
 
+    public int strikes = 0;
+    public Long lastStrike = 0L;
+
+    public int finalStrikes = 0;
+    public long finalStrikeRefresh = 0L;
+
     public ClientConnection(ClientConnectionManager connMan,
                             SocketChannel sockChan) {
         super(connMan, sockChan, true);

src/engine/net/client/ClientMessagePump.java

@@ -29,6 +29,7 @@ import engine.objects.*;
 import engine.server.MBServerStatics;
 import engine.server.world.WorldServer;
 import engine.session.Session;
+import engine.util.KeyCloneAudit;
 import engine.util.StringUtils;
 import org.pmw.tinylog.Logger;
 
@@ -238,6 +239,11 @@ public class ClientMessagePump implements NetMsgHandler {
             return;
         }
 
+        if(pc.getRaceID() == 1999 && msg.getSlotNumber() == MBServerStatics.SLOT_FEET){
+            forceTransferFromEquipToInventory(msg, origin, "Saetors Cannot Wear FEET Slot Items");
+            return;
+        }
+
         //dupe check
         if (!i.validForInventory(origin, pc, itemManager))
             return;
@@ -565,6 +571,11 @@ public class ClientMessagePump implements NetMsgHandler {
             return;
 
         if (i.isCanDestroy()) {
+
+            if (i.getItemBase().isRune() && !sourcePlayer.isInSafeZone()) {
+                ChatManager.chatSystemInfo(sourcePlayer, "You May Only Delete Runes In A Safe Zone.");
+                return;
+            }
             int goldValue = i.getBaseValue();
             if (i.getItemBase().isRune())
                 goldValue = 500000;
@@ -572,7 +583,7 @@ public class ClientMessagePump implements NetMsgHandler {
             if (i.getItemBaseID() == 980066)
                 goldValue = 0;
 
-            if(itemManager.getGoldInventory().getNumOfItems() + goldValue > 10000000)
+            if(itemManager.getGoldInventory().getNumOfItems() + goldValue > MBServerStatics.PLAYER_GOLD_LIMIT)
                 return;
 
             if (itemManager.delete(i)) {
@@ -786,6 +797,8 @@ public class ClientMessagePump implements NetMsgHandler {
         if (item == null)
             return;
 
+        item.stripCastableEnchants();
+
         if (item.lootLock.tryLock()) {
             try {
                 Item itemRet = null;
@@ -1281,7 +1294,7 @@ public class ClientMessagePump implements NetMsgHandler {
 
                 cost *= profit;
 
-                if (gold.getNumOfItems() + cost > 10000000) {
+                if (gold.getNumOfItems() + cost > MBServerStatics.PLAYER_GOLD_LIMIT) {
                     return;
                 }
 
@@ -1474,6 +1487,7 @@ public class ClientMessagePump implements NetMsgHandler {
                                 if (buy != null) {
                                     me.transferEnchants(buy);
                                     itemMan.addItemToInventory(buy);
+                                    buy.stripCastableEnchants();
                                     if(npc.contractUUID == 900 && buy.getItemBaseID() == 1705032){
                                         buy.setNumOfItems(10);
                                         DbManager.ItemQueries.UPDATE_NUM_ITEMS(buy,buy.getNumOfItems());
@@ -1880,6 +1894,7 @@ public class ClientMessagePump implements NetMsgHandler {
 
             switch (protocolMsg) {
                 case SETSELECTEDOBECT:
+                    KeyCloneAudit.auditTargetMsg(msg);
                     ClientMessagePump.targetObject((TargetObjectMsg) msg, origin);
                     break;
 

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

@@ -66,6 +66,7 @@ public class ArcLoginNotifyMsgHandler extends AbstractClientMsgHandler {
         // Send Guild, Nation and IC MOTD
         GuildManager.enterWorldMOTD(player);
         ChatManager.sendSystemMessage(player, ConfigManager.MB_WORLD_GREETING.getValue());
+        ChatManager.sendSystemMessage(player, " Experience Gain: " + ConfigManager.MB_NORMAL_EXP_RATE.getValue());
 
         // Send branch string if available from ConfigManager.
 

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

@@ -54,7 +54,7 @@ public class DestroyBuildingHandler extends AbstractClientMsgHandler {
             return true;
         }
 
-        if (!BuildingManager.PlayerCanControlNotOwner(building, pc))
+        if (!BuildingManager.PlayerCanControlNotOwner(building, pc) && !pc.getAccount().status.equals(Enum.AccountStatus.ADMIN))
             return true;
 
         // Can't delete siege assets during an active bane.
@@ -72,8 +72,8 @@ public class DestroyBuildingHandler extends AbstractClientMsgHandler {
             return true;
 
         // Can't destroy a shrine
-        if (blueprint.getBuildingGroup() == BuildingGroup.SHRINE)
+        //if (blueprint.getBuildingGroup() == BuildingGroup.SHRINE)
-            return true;
+        //    return true;
 
         // Cannot destroy  mines outside of normal mine mechanics
 

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

@@ -21,6 +21,7 @@ import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.ErrorPopupMsg;
 import engine.net.client.msg.guild.InviteToSubMsg;
+import engine.objects.Bane;
 import engine.objects.Guild;
 import engine.objects.GuildStatusController;
 import engine.objects.PlayerCharacter;
@@ -112,6 +113,12 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
             return true;
         }
 
+        //ensure bane to be subbed does not have a bane dropped
+        for(Bane bane : Bane.banes.values()){
+            if(bane.getOwner().guild.getNation().equals(targetGuild))
+                return true;
+        }
+
         //all tests passed, let's send invite.
 
         if (target.getClientConnection() != null) {

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

@@ -24,6 +24,7 @@ import engine.net.client.msg.ErrorPopupMsg;
 import engine.net.client.msg.ItemProductionMsg;
 import engine.net.client.msg.ManageNPCMsg;
 import engine.objects.*;
+import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
 import java.util.HashMap;
@@ -361,7 +362,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
                 vendor.removeItemFromForge(targetItem);
 
                 //refund the gold for cancelled item
-                if(vendor.building.getStrongboxValue() + targetItem.getItemBase().getBaseValue() < 15000000){
+                if(vendor.building.getStrongboxValue() + targetItem.getItemBase().getBaseValue() < MBServerStatics.BUILDING_GOLD_LIMIT){
                     vendor.building.setStrongboxValue(vendor.building.getStrongboxValue() + targetItem.getItemBase().getBaseValue());
                 }
 

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

@@ -282,6 +282,14 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
                 }
             }
             if(mineTele == null){
+                //must be the dungeon request?
+                Vector3fImmutable loc = Vector3fImmutable.getRandomPointOnCircle(BuildingManager.getBuilding(2827951).loc,30f);
+                ChatManager.chatSystemInfo(player, "You Will Teleport To Whitehorn Citadel In " + 10 +  " Seconds.");
+                if (10 > 0) {
+                    //TODO add timer to teleport
+                    TeleportJob tj = new TeleportJob(player, npc, loc, origin, true);
+                    JobScheduler.getInstance().scheduleJob(tj, 10 * 1000);
+                }
                 return;
             }else {
                 int time = MBServerStatics.TELEPORT_TIME_IN_SECONDS;

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

@@ -232,11 +232,13 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
         if (pc == null || origin == null) {
             return;
         }
+        ItemBase runeBase = ItemBase.getItemBase(runeID);
 
-        //remove only if rune is discipline
+        boolean discRune = runeBase.isDiscRune();
-        if (runeID < 3001 || runeID > 3048) {
+        boolean statRune = runeBase.isStatRune();
+        if(!runeBase.isDiscRune() && !runeBase.isStatRune())
             return;
-        }
+
 
         //see if pc has rune
         ArrayList<CharacterRune> runes = pc.getRunes();
@@ -422,9 +424,9 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                             }
                             break;
                         case 31:
-                            LootManager.peddleFate(player,item);
+                            //LootManager.peddleFate(player,item);
+                            LootManager.newFatePeddler(player,item);
                             break;
-
                         case 30: //water bucket
                         case 8: //potions, tears of saedron
                         case 5: //runes, petition, warrant, scrolls

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

@@ -568,7 +568,15 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
             return false;
         }
 
-        serverCity = ZoneManager.getCityAtLocation(buildingList.getLoc());
+        //serverCity = ZoneManager.getCityAtLocation(buildingList.getLoc());
+        Bane validBane = null;
+        serverCity = null;
+        for(Bane b : Bane.banes.values()){
+                City c = b.getCity();
+                if(c.getGuild().equals(player.guild) || b.getOwner().guild.equals(player.guild))
+                    serverCity = b.getCity();
+        }
+
 
         // No valid player city found
 
@@ -611,6 +619,13 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
             return false;
         }
 
+        //make sure building is withing range
+        float distanceSquared = buildingList.getLoc().distanceSquared(serverCity.loc);
+        float allowedSquared = (CityBoundsType.SIEGEBOUNDS.extents * 0.65f) * (CityBoundsType.SIEGEBOUNDS.extents * 0.65f);
+        if(allowedSquared < distanceSquared) {
+            PlaceAssetMsg.sendPlaceAssetError(origin, 52, ""); // Cannot place outisde a guild zone
+            return false;
+        }
         // If there is a bane placed, we limit bow placement to 2x the stone rank's worth of attacker assets
         // and 1x the tree rank for defenders
 
@@ -652,7 +667,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         // Count bow for attackers and defenders
 
-        awoList = WorldGrid.getObjectsInRangePartial(serverCity, 1000, MBServerStatics.MASK_BUILDING);
+        awoList = WorldGrid.getObjectsInRangePartial(serverCity, CityBoundsType.SIEGEBOUNDS.extents, MBServerStatics.MASK_BUILDING);
 
         for (AbstractWorldObject awo : awoList) {
             Building building = (Building) awo;
@@ -661,7 +676,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
                 if (!building.getBlueprint().isSiegeEquip())
                     continue;
 
-            if (!building.getLoc().isInsideCircle(serverCity.getLoc(), CityBoundsType.ZONE.extents))
+            if (!building.getLoc().isInsideCircle(serverCity.getLoc(), CityBoundsType.SIEGEBOUNDS.extents))
                 continue;
 
             if (building.getGuild() == null)
@@ -1027,6 +1042,10 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
     private boolean placeCityWalls(PlayerCharacter player, ClientConnection origin, PlaceAssetMsg msg) {
 
+        if(player.getAccount().status.equals(AccountStatus.ADMIN)){
+            adminCreateBuildings(player,msg);
+            return false;
+        }
         // Member variables
 
         Zone serverZone;
@@ -1165,7 +1184,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
         return true;
     }
 
-    private Building createStructure(PlayerCharacter playerCharacter, PlacementInfo buildingInfo, Zone currentZone) {
+    private static Building createStructure(PlayerCharacter playerCharacter, PlacementInfo buildingInfo, Zone currentZone) {
 
         Blueprint blueprint;
         Building newMesh;
@@ -1387,4 +1406,16 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         return true;
     }
+
+    public static void adminCreateBuildings(PlayerCharacter pc, PlaceAssetMsg msg){
+        //handled for building dungeon layouts
+        Zone zone = ZoneManager.getZoneByZoneID(993);
+        for(PlacementInfo placement : msg.getPlacementInfo()){
+            Building building = createStructure(pc,placement,zone);
+            if(building != null) {
+                building.setProtectionState(ProtectionState.NPC);
+                building.setRank(1);
+            }
+        }
+    }
 }

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

@@ -48,7 +48,7 @@ public class RequestEnterWorldHandler extends AbstractClientMsgHandler {
 
         PlayerCharacter player = origin.getPlayerCharacter();
 
-        WorldGrid.RemoveWorldObject(player);
+
         Dispatch dispatch;
 
         if (player == null) {
@@ -57,6 +57,11 @@ public class RequestEnterWorldHandler extends AbstractClientMsgHandler {
             return true;
         }
 
+        //if(player.isEnteredWorld()){
+        //    if(player != null) {
+       //         WorldGrid.RemoveWorldObject(player);
+       //     }
+        //}
         player.setEnteredWorld(false);
 
         Account acc = SessionManager.getAccount(origin);
@@ -106,9 +111,14 @@ public class RequestEnterWorldHandler extends AbstractClientMsgHandler {
 
         player.getTimestamps().put("EnterWorld", System.currentTimeMillis());
 
-        if (player.getLoc().equals(Vector3fImmutable.ZERO) || System.currentTimeMillis() > player.getTimeStamp("logout") + (15 * 60 * 1000)) {
+        Long logout = player.getTimeStamp("logout");
+        if (player.getLoc().equals(Vector3fImmutable.ZERO) || System.currentTimeMillis() > logout + (15 * 60 * 1000)) {
             player.stopMovement(player.getBindLoc());
-            player.setSafeMode();
+            try {
+                player.setSafeMode();
+            }catch(Exception e){
+                Logger.error(e);
+            }
             player.updateLocation();
             player.setRegion(AbstractWorldObject.GetRegionByWorldObject(player));
         }

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

@@ -78,6 +78,27 @@ public class ApplyRuneMsg extends ClientNetMsg {
         }
         int raceID = playerCharacter.getRaceID();
         //Check race is met
+
+        //confirm sub-race runes are applicable only by proper races
+        switch(runeID){
+            case 252134: //elf
+            case 252135: // elf
+            case 252136:  // elf
+                if(playerCharacter.getRaceID() != 2008 && playerCharacter.getRaceID() != 2009)
+                    return false;
+                break;
+            case 252129: // human
+            case 252130: // human
+            case 252131: // human
+            case 252132: // human
+            case 252133: // human
+                if(playerCharacter.getRaceID() != 2011 && playerCharacter.getRaceID() != 2012)
+                    return false;
+                break;
+
+        }
+
+
         ConcurrentHashMap<Integer, Boolean> races = rb.getRace();
         if(runeID != 3007 && runeID != 3014) {//bounty hunter and huntsman
             if (races.size() > 0) {

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

@@ -567,8 +567,12 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
             writer.put(labelSiege);// 1 sets the protection under siege
             writer.put(labelCeaseFire); //0 with 1 set above sets to under siege // 1 with 1 set above sets protection status to under siege(cease fire)
 
-            writer.put(buttonTransfer);// 1 enables the transfer asset button
+            writer.put(buttonTransfer);
-            writer.put(buttonDestroy);// 1 enables the destroy asset button
+            if(building.getBlueprint() != null && building.getBlueprint().getBuildingGroup() != null && building.getBlueprint().getBuildingGroup().equals(BuildingGroup.SHRINE)) {// 1 enables the transfer asset button
+                writer.put((byte)1);
+            }else {
+                writer.put(buttonDestroy);// 1 enables the destroy asset button
+            }
             writer.put(buttonAbandon);// 1 here enables the abandon asset button
             writer.put(buttonUpgrade); //disable upgrade building
 

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

@@ -10,6 +10,7 @@
 package engine.net.client.msg;
 
 
+import engine.Dungeons.Dungeon;
 import engine.net.AbstractConnection;
 import engine.net.AbstractNetMsg;
 import engine.net.ByteBufferReader;
@@ -108,7 +109,7 @@ public class TeleportRepledgeListMsg extends ClientNetMsg {
         for (int i = 0; i < 3; i++)
             writer.putInt(0);
 
-        writer.putInt(cities.size() + mines.size());
+        writer.putInt(cities.size() + mines.size());// + 1);
 
         for (City city : cities)
             City.serializeForClientMsg(city, writer);
@@ -116,6 +117,7 @@ public class TeleportRepledgeListMsg extends ClientNetMsg {
         for(Mine mine : mines)
             Mine.serializeForClientMsgTeleport(mine, writer);
 
+        //Dungeon.serializeForClientMsgTeleport(writer);
     }
 
     public PlayerCharacter getPlayer() {

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

@@ -124,6 +124,9 @@ public class VendorDialogMsg extends ClientNetMsg {
         }else if(contract.getContractID() == 1502042){
            vd = Contract.HandleBaneCommanderOptions(msg.unknown03, npc, playerCharacter);
            msg.updateMessage(3, vd);
+        }else if(contract.getContractID() == 1502044){
+            vd = Contract.HandleGamblerOptions(msg.unknown03, npc, playerCharacter);
+            msg.updateMessage(3, vd);
         }else {
 
             if (contract == null)
@@ -576,6 +579,7 @@ public class VendorDialogMsg extends ClientNetMsg {
             case 2520:
             case 2521:
             case 2523:
+            case 2525:
                 valid = true;
                 break;
         }
@@ -632,7 +636,7 @@ public class VendorDialogMsg extends ClientNetMsg {
         DispatchMessage.dispatchMsgToInterestArea(pc, arm, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
 
         if(pc.getCharItemManager() != null && pc.getCharItemManager().getGoldInventory() != null && pc.getCharItemManager().getGoldInventory().getNumOfItems() < 1000) {
-            pc.getCharItemManager().addGoldToInventory(1000, false);
+            pc.getCharItemManager().addGoldToInventory(1500, false);
             pc.getCharItemManager().addItemToInventory(new MobLoot(pc, ItemBase.getItemBase(980066), 1, false).promoteToItem(pc));
             pc.getCharItemManager().updateInventory();
         }

src/engine/objects/AbstractCharacter.java

@@ -1187,13 +1187,13 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
 
     public final float modifyHealth(float value, final AbstractCharacter attacker, final boolean fromCost) {
 
-        if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
+        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
-            value *= ((PlayerCharacter)attacker).ZergMultiplier;
+        //    value *= ((PlayerCharacter)attacker).ZergMultiplier;
-        } // Health modifications are modified by the ZergMechanic
+        //} // Health modifications are modified by the ZergMechanic
 
-        if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
+        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
-            value *= ((Mob)attacker).getOwner().ZergMultiplier;
+        //    value *= ((Mob)attacker).getOwner().ZergMultiplier;
-        }// Health modifications from pets are modified by the owner's ZergMechanic
+        //}// Health modifications from pets are modified by the owner's ZergMechanic
 
         try {
 
@@ -1262,13 +1262,13 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
             final boolean fromCost
     ) {
 
-        if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
+        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
-            value *= ((PlayerCharacter)attacker).ZergMultiplier;
+        //    value *= ((PlayerCharacter)attacker).ZergMultiplier;
-        } // Health modifications are modified by the ZergMechanic
+        //} // Health modifications are modified by the ZergMechanic
 
-        if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
+        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
-            value *= ((Mob)attacker).getOwner().ZergMultiplier;
+        //    value *= ((Mob)attacker).getOwner().ZergMultiplier;
-        }// Health modifications from pets are modified by the owner's ZergMechanic
+        //}// Health modifications from pets are modified by the owner's ZergMechanic
 
         if (!this.isAlive()) {
             return 0f;
@@ -1309,13 +1309,13 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
             final boolean fromCost
     ) {
 
-        if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
+        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
-            value *= ((PlayerCharacter)attacker).ZergMultiplier;
+        //    value *= ((PlayerCharacter)attacker).ZergMultiplier;
-        } // Health modifications are modified by the ZergMechanic
+        //} // Health modifications are modified by the ZergMechanic
 
-        if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
+        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
-            value *= ((Mob)attacker).getOwner().ZergMultiplier;
+       //     value *= ((Mob)attacker).getOwner().ZergMultiplier;
-        }// Health modifications from pets are modified by the owner's ZergMechanic
+        //}// Health modifications from pets are modified by the owner's ZergMechanic
 
         if (!this.isAlive()) {
             return 0f;
@@ -1464,6 +1464,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
 
             if (eff == null)
                 continue;
+
             if (eff.cancelOnAttack() && eff.cancel()) {
                 eff.cancelJob();
                 this.effects.remove(s);
@@ -1718,7 +1719,11 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
 
                 // clear bonuses and reapply rune bonuses
                 if (this.getObjectType().equals(GameObjectType.PlayerCharacter)) {
-                    this.bonuses.calculateRuneBaseEffects((PlayerCharacter) this);
+                    try {
+                        this.bonuses.calculateRuneBaseEffects((PlayerCharacter) this);
+                    }catch(Exception ignored){
+
+                    }
                 } else {
                     this.bonuses.clearRuneBaseEffects();
                 }

src/engine/objects/AbstractWorldObject.java

@@ -15,6 +15,7 @@ import engine.Enum.GameObjectType;
 import engine.Enum.GridObjectType;
 import engine.InterestManagement.HeightMap;
 import engine.InterestManagement.WorldGrid;
+import engine.gameManager.ZoneManager;
 import engine.job.AbstractScheduleJob;
 import engine.job.JobContainer;
 import engine.job.JobScheduler;
@@ -175,11 +176,11 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
         }
 
         //set players new altitude to region lerp altitude.
-        if (region != null)
+        //if (region != null)
-            if (region.center.y == region.highLerp.y)
+        //    if (region.center.y == region.highLerp.y)
-                worldObject.loc = worldObject.loc.setY(region.center.y + worldObject.getAltitude());
+        //        worldObject.loc = worldObject.loc.setY(region.center.y + worldObject.getAltitude());
-            else
+        //    else
-                worldObject.loc = worldObject.loc.setY(region.lerpY(worldObject) + worldObject.getAltitude());
+        //        worldObject.loc = worldObject.loc.setY(region.lerpY(worldObject) + worldObject.getAltitude());
 
         return region;
     }
@@ -271,7 +272,8 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
             if (this.getObjectType().equals(GameObjectType.PlayerCharacter))
                 if (name.equals("Flight")) {
                     ((PlayerCharacter) this).update(false);
-                    PlayerCharacter.GroundPlayer((PlayerCharacter) this);
+                    if(!AbstractCharacter.CanFly((PlayerCharacter) this))
+                        PlayerCharacter.GroundPlayer((PlayerCharacter) this);
                 }
         }
         applyAllBonuses();
@@ -499,8 +501,28 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
             if (loc.x > MBServerStatics.MAX_WORLD_WIDTH || loc.z < MBServerStatics.MAX_WORLD_HEIGHT)
                 return;
             this.lastLoc = new Vector3fImmutable(this.loc);
-            this.loc = loc;
+            if(AbstractCharacter.IsAbstractCharacter(this)){
-            this.loc = this.loc.setY(HeightMap.getWorldHeight(this) + this.getAltitude());
+                float y;
+                float worldHeight = HeightMap.getWorldHeight(loc);
+                Zone zone = ZoneManager.findSmallestZone(loc);
+                if(zone != null && zone.isPlayerCity()){
+                    worldHeight = zone.getWorldAltitude();
+                }
+                if(this.region != null){
+                    float regionAlt = this.region.lerpY(this);
+                    float altitude = this.getAltitude();
+                    y = regionAlt + altitude + worldHeight;
+                }else{
+                    y = HeightMap.getWorldHeight(loc) + this.getAltitude();
+                }
+                Vector3fImmutable newLoc = new Vector3fImmutable(loc.x,y,loc.z);
+                this.loc = newLoc;
+                WorldGrid.addObject(this, newLoc.x, newLoc.z);
+                return;
+            }else{
+                this.loc = loc;
+            }
+            //this.loc = this.loc.setY(HeightMap.getWorldHeight(this) + this.getAltitude());
 
             //lets not add mob to world grid if he is currently despawned.
             if (this.getObjectType().equals(GameObjectType.Mob) && ((Mob) this).despawned)

src/engine/objects/Account.java

@@ -59,6 +59,11 @@ public class Account extends AbstractGameObject {
         this.status = Enum.AccountStatus.valueOf(resultSet.getString("status"));
     }
 
+    public Account() {
+        this.uname = "";
+        this.status = Enum.AccountStatus.ACTIVE;
+    }
+
     public ArrayList<Item> getVault() {
         return vault;
     }