player update optimized

This reverts commit cd1e38b184.

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) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_item_dexpenalty` WHERE `ID` = ?")) {
-
-            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);
+        if(dexReductions.containsKey(itemBase.getUUID())){
+            itemBase.dexReduction = dexReductions.get(itemBase.getUUID());
+        }else{
+            itemBase.dexReduction = 0.0f;
         }
     }
 
@@ -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/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/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/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

@@ -301,6 +301,17 @@ public enum CombatManager {
             if (target == null)
                 return 0;
 
+            //pet to assist in attacking target
+            if(abstractCharacter.getObjectType().equals(GameObjectType.PlayerCharacter)){
+                PlayerCharacter attacker = (PlayerCharacter)abstractCharacter;
+                if(attacker.getPet() != null){
+                    Mob pet = attacker.getPet();
+                    if(pet.combatTarget == null && pet.assist)
+                        pet.setCombatTarget(attacker.combatTarget);
+                }
+            }
+
+
             //target must be valid type
 
             if (AbstractWorldObject.IsAbstractCharacter(target)) {
@@ -546,6 +557,8 @@ public enum CombatManager {
                 return;
             if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
                 PlayerCharacter pc = (PlayerCharacter) ac;
+                pc.combatStats.calculateATR(true);
+                pc.combatStats.calculateATR(false);
                 if (mainHand) {
                     atr = pc.combatStats.atrHandOne;
                     minDamage = pc.combatStats.minDamageHandOne;
@@ -659,6 +672,7 @@ public enum CombatManager {
             } else {
                 AbstractCharacter tar = (AbstractCharacter) target;
                 if(tar.getObjectType().equals(GameObjectType.PlayerCharacter)){
+                    ((PlayerCharacter)tar).combatStats.calculateDefense();
                     defense = ((PlayerCharacter)tar).combatStats.defense;
                 }else {
                     defense = tar.getDefenseRating();
@@ -671,7 +685,7 @@ public enum CombatManager {
             //Get hit chance
 
             //int chance;
-            float dif = atr - defense;
+            //float dif = atr - defense;
 
             //if (dif > 100)
             //    chance = 94;
@@ -850,6 +864,22 @@ public enum CombatManager {
                 else
                     damage = calculateDamage(ac, tarAc, minDamage, maxDamage, damageType, resists);
 
+                if(weapon != null && weapon.effects != null){
+                    float armorPierce = 0;
+                    for(Effect eff : weapon.effects.values()){
+                        for(AbstractEffectModifier mod : eff.getEffectModifiers()){
+                            if(mod.modType.equals(ModType.ArmorPiercing)){
+                                armorPierce += mod.minMod * (mod.getRamp() * eff.getTrains());
+                            }
+                        }
+                    }
+                    if(armorPierce > 0){
+                        damage *= 1 - armorPierce;
+                    }
+                }
+
+                //Resists.handleFortitude(tarAc,damageType,damage);
+
                 float d = 0f;
 
                 errorTrack = 12;
@@ -1055,10 +1085,12 @@ public enum CombatManager {
 
         //calculate resists in if any
 
+
+
         if (resists != null)
-            return resists.getResistedDamage(source, target, damageType, damage, 0);
-        else
-            return damage;
+            damage = resists.getResistedDamage(source, target, damageType, damage, 0);
+
+        return damage;
     }
 
     private static void sendPassiveDefenseMessage(AbstractCharacter source, ItemBase wb, AbstractWorldObject target, int passiveType, DeferredPowerJob dpj, boolean mainHand) {
@@ -1212,6 +1244,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 +1262,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 +1440,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 +1525,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 convertedChance = chance * 100;
+        //float chance = (ATR-((ATR+DEF) * 0.315f)) / ((DEF-((ATR+DEF) * 0.315f)) + (ATR-((ATR+DEF) * 0.315f)));
+        //float convertedChance = chance * 100;
 
         int roll = ThreadLocalRandom.current().nextInt(101);
 
-        if(roll <= 5)//always 5% chance to miss
-            return false;
+        //if(roll <= 5)//always 5% chance to miss
+        //    return false;
 
-        if(roll >= 95)//always 5% chance to hit
-            return true;
+        //if(roll >= 95)//always 5% chance to hit
+        //    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

@@ -177,6 +177,11 @@ public enum DevCmdManager {
             return false;
         }
 
+        if(!pcSender.getTimestamps().containsKey("DEVCOMMAND"))
+            pcSender.getTimestamps().put("DEVCOMMAND",System.currentTimeMillis() - 1500L);
+        else if(System.currentTimeMillis() - pcSender.getTimestamps().get("DEVCOMMAND") < 1000L)
+            return false;
+
         //kill any commands not available to everyone on production server
         //only admin level can run dev commands on production
         boolean playerAllowed = false;
@@ -202,7 +207,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/MovementManager.java

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

src/engine/gameManager/PowersManager.java

@@ -166,12 +166,20 @@ 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() == 429429978){
+            applyPower(origin.getPlayerCharacter(),origin.getPlayerCharacter(),origin.getPlayerCharacter().getLoc(),429429978,msg.getNumTrains(),false);
+            return;
+        }
+
         if (usePowerA(msg, origin, sendCastToSelf)) {
             // Cast failed for some reason, reset timer
 
@@ -218,16 +226,16 @@ public enum PowersManager {
             City city = ZoneManager.getCityAtLocation(playerCharacter.loc);
             if (city == null) {
                 failed = true;
-            }else{
-                Bane bane = city.getBane();
-                if (bane == null) {
-                    failed = true;
-                }else{
-                    if(!bane.getSiegePhase().equals(SiegePhase.WAR)){
-                        failed = true;
-                    }
-                }
-            }
+            }//else{
+             //   Bane bane = city.getBane();
+             //   if (bane == null) {
+             //       failed = true;
+             //   }else{
+             //       if(!bane.getSiegePhase().equals(SiegePhase.WAR)){
+             //           failed = true;
+             //       }
+             //   }
+            //}
             if(failed){
                 //check to see if we are at an active mine
                 Zone zone = ZoneManager.findSmallestZone(playerCharacter.loc);
@@ -244,8 +252,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 +346,18 @@ public enum PowersManager {
 
 
         // Check powers for normal users
-        if (playerCharacter.getPowers() == null || !playerCharacter.getPowers().containsKey(msg.getPowerUsedID()))
-            if (!playerCharacter.isCSR()) {
-                if (!MBServerStatics.POWERS_DEBUG) {
-                    //  ChatManager.chatSayInfo(pc, "You may not cast that spell!");
-
-                    Logger.info("usePowerA(): Cheat attempted? '" + msg.getPowerUsedID() + "' was not associated with " + playerCharacter.getName());
-                    return true;
-                }
-            } else
-                CSRCast = true;
+        if(msg.getPowerUsedID() != 421084024) {
+            if (playerCharacter.getPowers() == null || !playerCharacter.getPowers().containsKey(msg.getPowerUsedID()))
+                if (!playerCharacter.isCSR()) {
+                    if (!MBServerStatics.POWERS_DEBUG) {
+                        //  ChatManager.chatSayInfo(pc, "You may not cast that spell!");
 
+                        Logger.info("usePowerA(): Cheat attempted? '" + msg.getPowerUsedID() + "' was not associated with " + playerCharacter.getName());
+                        return true;
+                    }
+                } else
+                    CSRCast = true;
+        }
         // get numTrains for power
         int trains = msg.getNumTrains();
 
@@ -494,6 +510,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 +825,36 @@ public enum PowersManager {
         if (playerCharacter == null || msg == null)
             return;
 
-        if(msg.getPowerUsedID() == 429005674){ //bard sprint
-            //use sprint instead of ballad of beregund the bold
-            //applyPower(playerCharacter,playerCharacter,playerCharacter.loc,429611355,msg.getNumTrains(),false);
+
+        //handle sprint for bard sprint
+        if(msg.getPowerUsedID() == 429005674){
             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)
+                    PlayerCharacter.getPlayerCharacter(msg.getTargetID()).removeEffectBySource(EffectSourceType.Transform, msg.getNumTrains(), true);
+        }
+
         if (playerCharacter.isCasting()) {
             playerCharacter.update(false);
             playerCharacter.updateStamRegen(-100);
@@ -1573,6 +1627,7 @@ public enum PowersManager {
             case 431511776:
             case 429578587:
             case 429503360:
+            case 44106356:
                 trackChars = getTrackList(playerCharacter);
                 break;
             default:
@@ -2411,6 +2466,13 @@ public enum PowersManager {
                     dodgeMsg.setTargetID(awo.getObjectUUID());
                     sendPowerMsg(pc, 4, dodgeMsg);
                     return true;
+                } else if (testPassive(pc, tarAc, "Block")) {
+                    // Dodge fired, send dodge message
+                    PerformActionMsg dodgeMsg = new PerformActionMsg(msg);
+                    dodgeMsg.setTargetType(awo.getObjectType().ordinal());
+                    dodgeMsg.setTargetID(awo.getObjectUUID());
+                    sendPowerMsg(pc, 4, dodgeMsg);
+                    return true;
                 }
             }
             return false;
@@ -2458,7 +2520,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 +3029,7 @@ public enum PowersManager {
             case 429767544:
             case 429502507:
             case 428398816:
+            case 429446315:
                 return false;
         }
         return true;

src/engine/gameManager/SimulationManager.java

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

src/engine/job/AbstractJob.java

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

src/engine/job/AbstractScheduleJob.java

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

src/engine/job/JobContainer.java

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

src/engine/job/JobThread.java

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

src/engine/job/JobWorker.java

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

src/engine/jobs/AbstractEffectJob.java

@@ -45,7 +45,7 @@ public abstract class AbstractEffectJob extends AbstractScheduleJob {
     }
 
     @Override
-    protected abstract void doJob();
+    public abstract void doJob();
 
     @Override
     protected abstract void _cancelJob();

src/engine/jobs/ActivateBaneJob.java

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

src/engine/jobs/AttackJob.java

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

src/engine/jobs/BaneDefaultTimeJob.java

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

src/engine/jobs/BasicScheduledJob.java

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

src/engine/jobs/BonusCalcJob.java

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

src/engine/jobs/CSessionCleanupJob.java

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

src/engine/jobs/ChangeAltitudeJob.java

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

src/engine/jobs/ChantJob.java

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

src/engine/jobs/CloseGateJob.java

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

src/engine/jobs/DamageOverTimeJob.java

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

src/engine/jobs/DatabaseUpdateJob.java

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

src/engine/jobs/RefreshGroupJob.java

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

src/engine/jobs/RemoveCorpseJob.java

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

src/engine/jobs/SiegeSpireWithdrawlJob.java

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

src/engine/jobs/StuckJob.java

@@ -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,6 +9,7 @@
 package engine.mobileAI;
 
 import engine.Enum;
+import engine.InterestManagement.InterestManager;
 import engine.InterestManagement.WorldGrid;
 import engine.gameManager.*;
 import engine.math.Vector3f;
@@ -48,18 +49,19 @@ public class MobAI {
                 return;
             }
 
-            if (target.getObjectType() == Enum.GameObjectType.PlayerCharacter && canCast(mob)) {
+            //mob casting disabled
+            //if (target.getObjectType() == Enum.GameObjectType.PlayerCharacter && canCast(mob)) {
 
-                if (mob.isPlayerGuard() == false && MobCast(mob)) {
-                    mob.updateLocation();
-                    return;
-                }
+                //if (mob.isPlayerGuard() == false && MobCast(mob)) {
+                //    mob.updateLocation();
+                //    return;
+                //}
 
-                if (mob.isPlayerGuard() == true && GuardCast(mob)) {
-                    mob.updateLocation();
-                    return;
-                }
-            }
+                //if (mob.isPlayerGuard() == true && GuardCast(mob)) {
+                //    mob.updateLocation();
+                //    return;
+                //}
+            //}
 
             if (!CombatUtilities.inRangeToAttack(mob, target))
                 return;
@@ -105,6 +107,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);
 
@@ -155,6 +163,12 @@ public class MobAI {
                 if (target.getPet().getCombatTarget() == null && target.getPet().assist == true)
                     target.getPet().setCombatTarget(mob);
 
+            try{
+                InterestManager.forceLoad(mob);
+            }catch(Exception e){
+
+            }
+
         } catch (Exception e) {
             Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackPlayer" + " " + e.getMessage());
         }
@@ -170,14 +184,14 @@ public class MobAI {
 
             if (target.getRank() == -1 || !target.isVulnerable() || BuildingManager.getBuildingFromCache(target.getObjectUUID()) == null) {
                 mob.setCombatTarget(null);
-            return;
+                return;
             }
 
             City playercity = ZoneManager.getCityAtLocation(mob.getLoc());
 
             if (playercity != null)
                 for (Mob guard : playercity.getParent().zoneMobSet)
-                    if (guard.BehaviourType != null && guard.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardCaptain.ordinal())
+                    if (guard.BehaviourType != null && guard.BehaviourType.equals(Enum.MobBehaviourType.GuardCaptain))
                         if (guard.getCombatTarget() == null && guard.getGuild() != null && mob.getGuild() != null && !guard.getGuild().equals(mob.getGuild()))
                             guard.setCombatTarget(mob);
 
@@ -320,6 +334,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,8 +360,6 @@ public class MobAI {
                 mob.setCombatTarget(null);
                 return false;
             }
-            if (mob.nextCastTime == 0)
-                mob.nextCastTime = System.currentTimeMillis();
 
             return mob.nextCastTime <= System.currentTimeMillis();
 
@@ -400,6 +418,9 @@ public class MobAI {
 
             PowersBase mobPower = PowersManager.getPowerByToken(powerToken);
 
+            if(mobPower.powerCategory.equals(Enum.PowerCategoryType.DEBUFF))
+                return false;
+
             //check for hit-roll
 
             if (mobPower.requiresHitRoll)
@@ -423,9 +444,9 @@ public class MobAI {
                 msg.setUnknown04(2);
 
                 PowersManager.finishUseMobPower(msg, mob, 0, 0);
-                long randomCooldown = (long)((ThreadLocalRandom.current().nextInt(10,15) * 1000) * MobAIThread.AI_CAST_FREQUENCY);
+                long delay = 20000L;
+                mob.nextCastTime = System.currentTimeMillis() + delay;
 
-                mob.nextCastTime = System.currentTimeMillis() + randomCooldown;
                 return true;
             }
         } catch (Exception e) {
@@ -548,7 +569,6 @@ public class MobAI {
                 PowersManager.finishUseMobPower(msg, mob, 0, 0);
 
                 long randomCooldown = (long)((ThreadLocalRandom.current().nextInt(10,15) * 1000) * MobAIThread.AI_CAST_FREQUENCY);
-                mob.nextCastTime = System.currentTimeMillis() + randomCooldown;
                 return true;
             }
         } catch (Exception e) {
@@ -1145,6 +1165,10 @@ public class MobAI {
                 if (ZoneManager.getSeaFloor().zoneMobSet.contains(mob))
                     mob.killCharacter("no owner");
 
+            if(!mob.isSiege())
+                mob.BehaviourType.canRoam = true;
+
+
             if (MovementUtilities.canMove(mob) && mob.BehaviourType.canRoam)
                 CheckMobMovement(mob);
 
@@ -1205,6 +1229,7 @@ public class MobAI {
             if (!mob.BehaviourType.isWimpy && mob.getCombatTarget() != null)
                 CheckForAttack(mob);
 
+
         } catch (Exception e) {
             Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: DefaultLogic" + " " + e.getMessage());
         }

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() &&
-                                    zone.lastRespawn + RESPAWN_INTERVAL < System.currentTimeMillis()) {
+                            if (!Zone.respawnQue.isEmpty() && 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.lastRespawn = System.currentTimeMillis();
+                                    Zone.respawnQue.remove(respawner);
+                                    Zone.lastRespawn = System.currentTimeMillis();
                                     Thread.sleep(100);
                                 }
                             }

src/engine/mobileAI/utilities/CombatUtilities.java

@@ -101,9 +101,10 @@ public class CombatUtilities {
         if (!target.isAlive())
             return;
 
-        if (AbstractWorldObject.IsAbstractCharacter(target))
+        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 +148,17 @@ public class CombatUtilities {
         }
         switch (target.getObjectType()) {
             case PlayerCharacter:
-                defense = ((AbstractCharacter) target).getDefenseRating();
+                PlayerCharacter pc = (PlayerCharacter)target;
+                pc.combatStats.calculateDefense();
+                defense = pc.combatStats.defense;
                 break;
             case Mob:
 
                 Mob mob = (Mob) target;
                 if (mob.isSiege())
                     defense = atr;
+                else
+                    defense = ((Mob) target).mobBase.getDefense();
                 break;
             case Building:
                 return false;
@@ -196,12 +201,10 @@ public class CombatUtilities {
                 return;
 
         int anim = 75;
-        float speed;
 
-        if (mainHand)
-            speed = agent.getSpeedHandOne();
-        else
-            speed = agent.getSpeedHandTwo();
+        //handle the retaliate here because even if the mob misses you can still retaliate
+        if (AbstractWorldObject.IsAbstractCharacter(target))
+            CombatManager.handleRetaliate((AbstractCharacter) target, agent);
 
         DamageType dt = DamageType.Crush;
 
@@ -283,11 +286,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 +320,9 @@ public class CombatUtilities {
             damage = calculateMobDamage(agent);
         }
         if (AbstractWorldObject.IsAbstractCharacter(target)) {
-            if (((AbstractCharacter) target).isSit()) {
-                damage *= 2.5f; //increase damage if sitting
-            }
+            //if (((AbstractCharacter) target).isSit()) {
+            //    damage *= 2.5f; //increase damage if sitting
+            //}
             return (int) (((AbstractCharacter) target).getResists().getResistedDamage(agent, (AbstractCharacter) target, dt, damage, 0));
         }
         if (target.getObjectType() == GameObjectType.Building) {

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;
@@ -1880,6 +1886,7 @@ public class ClientMessagePump implements NetMsgHandler {
 
             switch (protocolMsg) {
                 case SETSELECTEDOBECT:
+                    KeyCloneAudit.auditTargetMsg(msg);
                     ClientMessagePump.targetObject((TargetObjectMsg) msg, origin);
                     break;
 

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
-        if (runeID < 3001 || runeID > 3048) {
+        boolean discRune = runeBase.isDiscRune();
+        boolean statRune = runeBase.isStatRune();
+        if(!runeBase.isDiscRune() && !runeBase.isStatRune())
             return;
-        }
+
 
         //see if pc has rune
         ArrayList<CharacterRune> runes = pc.getRunes();

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

@@ -1718,7 +1718,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

@@ -271,7 +271,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();

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;
     }

src/engine/objects/CharacterItemManager.java

@@ -610,7 +610,7 @@ public class CharacterItemManager {
         if (i == null)
             return false;
 
-        i.stripCastableEnchants();
+        //i.stripCastableEnchants();
 
         if (!this.doesCharOwnThisItem(i.getObjectUUID()))
             return false;
@@ -1056,7 +1056,11 @@ public class CharacterItemManager {
         // add to Bank
         this.bank.add(i);
         i.addToCache();
-        i.stripCastableEnchants();
+        try {
+            i.stripCastableEnchants();
+        }catch(Exception ignored){
+            Logger.error("FAILED TO STRIP CASTABLE ENCHANTS: Move Item To Bank");
+        }
 
         calculateWeights();
 
@@ -1197,6 +1201,12 @@ public class CharacterItemManager {
         } else
             return false; // NPC's dont have vaults!
 
+        try {
+            i.stripCastableEnchants();
+        }catch(Exception ignored){
+            Logger.error("FAILED TO STRIP CASTABLE ENCHANTS: Move Item To Vault");
+        }
+
         // remove it from other lists:
         this.remItemFromLists(i, slot);
 
@@ -1205,7 +1215,6 @@ public class CharacterItemManager {
 
         calculateWeights();
 
-        i.stripCastableEnchants();
         return true;
     }
 
@@ -2013,7 +2022,7 @@ public class CharacterItemManager {
                     if (item.getItemBase().getType().equals(ItemType.GOLD)) {
                         int amt = item.getNumOfItems();
                         item.setNumOfItems(0);
-                        item.stripCastableEnchants();
+                        //item.stripCastableEnchants();
                         MobLoot ml = new MobLoot(this.absCharacter, amt);
                         ml.zeroItem();
                         ml.containerType = Enum.ItemContainerType.INVENTORY;

src/engine/objects/CharacterRune.java

@@ -164,6 +164,19 @@ public class CharacterRune extends AbstractGameObject {
                     runes.remove(runes.indexOf(rune));
                     CharacterSkill.calculateSkills(pc);
                     pc.applyBonuses();
+                    if(ItemBase.getItemBase(rune.getRuneBaseID()) != null && ItemBase.getItemBase(rune.getRuneBaseID()).isStatRune()){
+                        //handle point refund
+                        int creationCost = 0;
+                        for(RuneBaseAttribute attr : rune.runeBase.getAttrs()){
+                            if(attr.getAttributeID() == MBServerStatics.RUNE_COST_ATTRIBUTE_ID){
+                                creationCost = (int)attr.getModValue();
+                            }
+                        }
+                        if(creationCost > 0){
+                            pc.unusedStatPoints += creationCost;
+                            pc.syncClient();
+                        }
+                    }
                     return true;
                 }
             }

src/engine/objects/City.java

@@ -389,18 +389,22 @@ public class City extends AbstractWorldObject {
 
                     if (pc.getAccount().status.equals(AccountStatus.ADMIN)) {
                         cities.add(city);
-                    } else
+                    } else {
                         //list Player cities
 
                         //open city, just list
                         if (city.open && city.getTOL() != null && city.getTOL().getRank() > 4) {
-
-                            if (!BuildingManager.IsPlayerHostile(city.getTOL(), pc))
-                                cities.add(city); //verify nation or guild is same
-                        } else if (Guild.sameNationExcludeErrant(city.getGuild(), pcG))
                             cities.add(city);
-
-
+                        }else {
+                            try {
+                                if (city.getGuild().getNation().equals(pc.guild.getNation())) {
+                                    cities.add(city);
+                                }
+                            }catch(Exception e){
+                                Logger.error(e);
+                            }
+                        }
+                    }
                 } else if (city.isNpc == 1) {
                     //list NPC cities
                     Guild g = city.getGuild();
@@ -811,8 +815,10 @@ public class City extends AbstractWorldObject {
 
         // Set city motto to current guild motto
 
-        if (BuildingManager.getBuilding(this.treeOfLifeID) == null)
+        if (BuildingManager.getBuilding(this.treeOfLifeID) == null) {
             Logger.info("City UID " + this.getObjectUUID() + " Failed to Load Tree of Life with ID " + this.treeOfLifeID);
+            this.destroy();
+        }
 
         if ((ConfigManager.serverType.equals(ServerType.WORLDSERVER))
                 && (this.isNpc == (byte) 0)) {

src/engine/objects/Contract.java

@@ -22,6 +22,7 @@ import org.pmw.tinylog.Logger;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.concurrent.ThreadLocalRandom;
 
 public class Contract extends AbstractGameObject {
 
@@ -248,6 +249,80 @@ public class Contract extends AbstractGameObject {
         }
         return vd;
     }
+    public static VendorDialog HandleGamblerOptions(int optionId, NPC npc, PlayerCharacter pc){
+        pc.setLastNPCDialog(npc);
+        VendorDialog vd = new VendorDialog(VendorDialog.getHostileVendorDialog().getDialogType(),VendorDialog.getHostileVendorDialog().getIntro(),-1);//VendorDialog.getHostileVendorDialog();
+        vd.getOptions().clear();
+        MenuOption option1 = new MenuOption(15020441, "Gamble 1000", 15020441);
+        vd.getOptions().add(option1);
+
+        MenuOption option2 = new MenuOption(15020442, "Gamble 10,000", 15020442);
+        vd.getOptions().add(option2);
+
+        MenuOption option3 = new MenuOption(15020443, "Gamble 100,000", 15020443);
+        vd.getOptions().add(option3);
+        switch(optionId) {
+            case 15020441: // gamble 1000
+                gamble(pc,1000);
+                break;
+            case 15020442: // gamble 10,000
+                gamble(pc,10000);
+                break;
+            case 15020443: // gamble 100,000
+                gamble(pc,100000);
+                break;
+        }
+        return vd;
+    }
+
+    public static void gamble(PlayerCharacter pc, int amount){
+
+        if(!pc.timestamps.containsKey("NextSlot"))
+            pc.timestamps.put("NextSlot",System.currentTimeMillis());
+
+        if(pc.timestamps.get("NextSlot") > System.currentTimeMillis())
+            return;
+
+        pc.timestamps.put("NextSlot",System.currentTimeMillis() + 2000L);
+
+        if(pc.charItemManager == null){
+            return;
+        }
+
+        int goldAmount = pc.charItemManager.getGoldInventory().getNumOfItems();
+
+        if(goldAmount < amount) {
+            ChatManager.chatSystemInfo(pc, "You Cannot Afford This Wager");
+            return;
+        }
+        goldAmount -= amount;
+
+        pc.charItemManager.getGoldInventory().setNumOfItems(goldAmount);
+        pc.charItemManager.updateInventory();
+
+        ChatManager.chatSystemInfo(pc, "You Attempt To Gamble " + amount + " ...");
+        int roll1 = ThreadLocalRandom.current().nextInt(1,7);
+        int roll2 = ThreadLocalRandom.current().nextInt(1,7);
+        int roll3 = ThreadLocalRandom.current().nextInt(1,7);
+
+        ChatManager.chatSystemInfo(pc, "Gambler Has Rolled: " + roll1 + "     " + roll2 + "     " + roll3);
+
+        int winnings = 0;
+
+        if(roll1 == roll2 && roll1 == roll3)
+            winnings = amount * roll1 * 10;
+
+        if(winnings > 0)
+            ChatManager.chatSystemInfo(pc, "You Have Won " + winnings + " Gold Coins!");
+        else
+            ChatManager.chatSystemInfo(pc, "You Have Lost The Wager");
+
+        goldAmount += winnings;
+
+        pc.charItemManager.getGoldInventory().setNumOfItems(goldAmount);
+        pc.charItemManager.updateInventory();
+
+    }
     public static VendorDialog HandleBaneCommanderOptions(int optionId, NPC npc, PlayerCharacter pc){
         pc.setLastNPCDialog(npc);
         VendorDialog vd = new VendorDialog(VendorDialog.getHostileVendorDialog().getDialogType(),VendorDialog.getHostileVendorDialog().getIntro(),-1);//VendorDialog.getHostileVendorDialog();

src/engine/objects/Effect.java

@@ -326,6 +326,10 @@ public class Effect {
             writer.putString(item.getName());
             writer.putFloat(-1000f);
         } else {
+            if(true){
+                serializeForClientMsg(writer);
+                return;
+            }
             float duration = this.jc.timeToExecutionLeft() / 1000;
             writer.putInt(this.eb.getToken());
             writer.putInt(aej.getTrains());
@@ -338,6 +342,10 @@ public class Effect {
     }
 
     public void serializeForClientMsg(ByteBufferWriter writer) {
+        if(true){
+            serializeForLoad(writer);
+            return;
+        }
         AbstractJob aj = this.jc.getJob();
         if (aj == null || (!(aj instanceof AbstractEffectJob))) {
             //TODO put error message here

src/engine/objects/Experience.java

@@ -409,7 +409,6 @@ public class Experience {
 
                 grantedExperience = (double) LOOTMANAGER.NORMAL_EXP_RATE * maxXPPerKill(playerCharacter.getLevel());
 
-                grantedExperience *= (1/ giveEXPTo.size()+0.9);
                 // Adjust XP for Mob Level
 
                 grantedExperience *= getConMod(playerCharacter, mob);
@@ -446,6 +445,9 @@ public class Experience {
                 if (grantedExperience == 0)
                     grantedExperience = 1;
 
+                //scaling
+                grantedExperience *= (1 / giveEXPTo.size()+0.9);
+
                 // Grant the player the EXP
                 playerCharacter.grantXP((int) Math.floor(grantedExperience));
             }
@@ -469,9 +471,13 @@ public class Experience {
                 grantedExperience *= LOOTMANAGER.HOTZONE_EXP_RATE;
 
             // Errant penalty
-            if (grantedExperience != 1)
+            if (grantedExperience != 1) {
                 if (killer.getGuild().isEmptyGuild())
-                    grantedExperience *= .6;
+                    grantedExperience *= 0.6f;
+            }
+
+            //bonus for no group
+            grantedExperience *= 1.9f;
 
             // Grant XP
             killer.grantXP((int) Math.floor(grantedExperience));

src/engine/objects/Item.java

@@ -818,24 +818,15 @@ public class Item extends AbstractWorldObject {
     }
 
     public void stripCastableEnchants(){
-        ArrayList<String> keys =new ArrayList<>();
-
-        for(String eff : this.effects.keySet()){
-            for(AbstractEffectModifier mod : this.effects.get(eff).getEffectsBase().getModifiers()){
-                if(mod.modType.equals(ModType.WeaponProc)){
-                    keys.add(eff);
-                }
-            }
-        }
-
-        for(String eff : keys){
-            try {
-                this.effects.get(eff).endEffect();
-                this.effects.remove(eff);
-            }catch(Exception e){
-
+        ArrayList<Effect> ToRemove = new ArrayList<>();
+        for(Effect eff : this.effects.values()){
+            if(eff.getJobContainer() != null && !eff.getJobContainer().noTimer()){
+                eff.endEffectNoPower();
+                eff.getJobContainer().cancelJob();
+                ToRemove.add(eff);
             }
         }
+        this.effects.values().removeAll(ToRemove);
     }
     //Only to be used for trading
     public void setOwnerID(int ownerID) {
@@ -1085,7 +1076,7 @@ public class Item extends AbstractWorldObject {
         this.ownerID = pc.getObjectUUID();
         this.ownerType = OwnerType.PlayerCharacter;
         this.containerType = ItemContainerType.INVENTORY;
-        this.stripCastableEnchants();
+        //this.stripCastableEnchants();
         return true;
     }
 
@@ -1106,7 +1097,7 @@ public class Item extends AbstractWorldObject {
         this.ownerID = npc.getObjectUUID();
         this.ownerType = OwnerType.Npc;
         this.containerType = Enum.ItemContainerType.INVENTORY;
-        this.stripCastableEnchants();
+        //this.stripCastableEnchants();
         return true;
     }
 
@@ -1124,7 +1115,7 @@ public class Item extends AbstractWorldObject {
         this.ownerID = 0;
         this.ownerType = null;
         this.containerType = Enum.ItemContainerType.INVENTORY;
-        this.stripCastableEnchants();
+        //this.stripCastableEnchants();
         return true;
     }
 

src/engine/objects/Mine.java

@@ -341,6 +341,7 @@ public class Mine extends AbstractGameObject {
             if(!mine.isActive)
                 if(mine.getOwningGuild() != null)
                   if(mine.getOwningGuild().getNation().equals(player.getGuild().getNation()))
+                      if(!mine.getOwningGuild().equals(Guild.getErrantGuild()))
                          mines.add(mine);
 
         return mines;

src/engine/objects/Mob.java

@@ -620,6 +620,7 @@ public class Mob extends AbstractIntelligenceAgent {
             DbManager.addToCache(mob);
             mob.setPet(owner, true);
             mob.setWalkMode(false);
+            mob.level = level;
             mob.runAfterLoad();
 
         } catch (Exception e) {
@@ -628,8 +629,12 @@ public class Mob extends AbstractIntelligenceAgent {
             createLock.writeLock().unlock();
         }
         parent.zoneMobSet.add(mob);
-        mob.level = level;
-        mob.healthMax = mob.getMobBase().getHealthMax() * (mob.level * 0.5f);
+       // mob.level = level;
+        float healthMax = mob.getMobBase().getHealthMax();
+        if(mob.bonuses != null){
+            healthMax += mob.bonuses.getFloat(ModType.HealthFull,SourceType.None);
+        }
+        mob.healthMax = healthMax;
         mob.health.set(mob.healthMax);
         return mob;
     }

src/engine/objects/MobBase.java

@@ -308,6 +308,10 @@ public class MobBase extends AbstractGameObject {
     }
 
     public static void applyMobbaseEffects(Mob mob){
+        if(mob.getMobBaseID() == 12008)
+            mob.level = 65;
+        else if(mob.getMobBaseID() == 12019)
+            mob.level = 80;
         for(MobBaseEffects mbe : mob.mobBase.mobbaseEffects){
             if(mob.level >= mbe.getReqLvl()){
                 try {

src/engine/objects/PlayerCharacter.java

@@ -45,6 +45,7 @@ import engine.util.MiscUtils;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;
 
+import javax.swing.*;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.*;
@@ -4432,7 +4433,7 @@ public class PlayerCharacter extends AbstractCharacter {
             //set parry if fighter or thief and no invalid weapon found
             this.bonuses.setBool(ModType.Parry, SourceType.None, false);
             if ((this.baseClass != null && this.baseClass.getObjectUUID() == 2500)
-                    || (this.promotionClass != null && this.promotionClass.getObjectUUID() == 2520))
+                    || (this.promotionClass != null && this.promotionClass.getObjectUUID() == 2520) || this.getRaceID() == 1999)
                 if (wbMain == null || wbMain.getRange() < MBServerStatics.RANGED_WEAPON_RANGE)
                     if (wbOff == null || wbOff.getRange() < MBServerStatics.RANGED_WEAPON_RANGE)
                         this.bonuses.setBool(ModType.Parry, SourceType.None, true);
@@ -4704,29 +4705,100 @@ public class PlayerCharacter extends AbstractCharacter {
         ModType modType = ModType.GetModType(type);
 
         // must be allowed to use this passive
-        if (!this.bonuses.getBool(modType, SourceType.None) && this.getRaceID() != 1999)
+        if (!this.bonuses.getBool(modType, SourceType.None))
             return 0f;
 
         // must not be stunned
         if (this.bonuses.getBool(ModType.Stunned, SourceType.None))
             return 0f;
+        CharacterSkill passiveSkill;
 
-        // Get base skill amount
-        CharacterSkill sk = this.skills.get(type);
-        float amount;
-        if (sk == null)
-            amount = CharacterSkill.getQuickMastery(this, type);
-        else
-            amount = sk.getModifiedAmount();
+        Item mainHand = null;
+        Item offHand = null;
+        if(this.charItemManager != null){
+            mainHand = this.charItemManager.getEquipped(1);
+            offHand = this.charItemManager.getEquipped(2);
+        }
+        switch(type){
+            case "Block":
+                //if(!fromCombat)
+                    //return 0;
 
-        // Add bonuses
-        amount += this.bonuses.getFloat(modType, SourceType.None);
+                if(offHand == null)
+                    return 0;
 
-        // Add item bonuses and return
-        if (type.equals(ModType.Dodge) && !fromCombat)
-            return ((amount / 4) - attackerLevel + this.getLevel()) / 4;
-        else
-            return (amount - attackerLevel + this.getLevel()) / 4;
+                if(!offHand.getItemBase().isShield())
+                    return 0;
+
+                passiveSkill = this.skills.get("Block");
+                if(passiveSkill == null)
+                    return 0;
+
+                float blockBonusFromShield = 0;
+                ItemBase ib = offHand.getItemBase();
+                blockBonusFromShield = ib.getBlockMod() * 5;
+                for(Effect eff : offHand.effects.values()){
+                    for(AbstractEffectModifier mod : eff.getEffectModifiers()){
+                        if(mod.modType.equals(ModType.PassiveDefense)){
+                            float min = mod.minMod;
+                            int trains = eff.getTrains();
+                            float ramp = mod.getRamp();
+                            blockBonusFromShield += (min + (trains * ramp)) * 5;
+                        }
+                    }
+                }
+                int divisr = 4;
+                if(!fromCombat)
+                    divisr = 16;
+                float blockChance = ((passiveSkill.getModifiedAmount() + blockBonusFromShield) / divisr);
+                if(this.bonuses != null)
+                    blockChance *= 1 + this.bonuses.getFloatPercentAll(ModType.Block, SourceType.None);
+                return blockChance;
+
+            case "Parry":
+                if(!fromCombat)
+                    return 0;
+
+                if(mainHand == null && this.getRaceID() != 1999) // saetors can always parry using their horns
+                    return 0;
+                int parryBonus = 0;
+
+                if(mainHand != null && offHand != null && !offHand.getItemBase().isShield())
+                    parryBonus = 5;
+
+                if(mainHand != null && mainHand.getItemBase().isTwoHanded())
+                    parryBonus = 10;
+
+                passiveSkill = this.skills.get("Parry");
+                if(passiveSkill == null)
+                    return 0;
+
+                float parryChance =((passiveSkill.getModifiedAmount() + parryBonus) / 4);
+
+                if(this.bonuses != null)
+                    parryChance *= 1 + this.bonuses.getFloatPercentAll(ModType.Parry, SourceType.None);
+
+                return parryChance;
+
+            case "Dodge":
+                passiveSkill = this.skills.get("Dodge");
+                if(passiveSkill == null)
+                    return 0;
+
+                int divisor = 4;
+                if(!fromCombat)
+                    divisor = 16;
+
+                float dodgeChance = ((passiveSkill.getModifiedAmount()) / divisor);
+
+                if(this.bonuses != null)
+                    dodgeChance *= 1 + this.bonuses.getFloatPercentAll(ModType.Dodge, SourceType.None);
+
+                return dodgeChance;
+            default:
+                return 0;
+
+        }
     }
 
     public float getRegenModifier(ModType type) {
@@ -5037,82 +5109,121 @@ public class PlayerCharacter extends AbstractCharacter {
     @Override
     public void update(Boolean newSystem) {
 
-        //if(!newSystem)
-        //    return;
+        this.updateLocation();
+        this.updateMovementState();
 
-        if (this.updateLock.writeLock().tryLock()) {
-            try {
+        if(!newSystem)
+            return;
 
-                if (!this.isAlive() && this.isEnteredWorld()) {
-                    if(!this.timestamps.containsKey("DeathTime")){
-                        this.timestamps.put("DeathTime",System.currentTimeMillis());
-                    }else if((System.currentTimeMillis() - this.timestamps.get("DeathTime")) > 600000)
-                        forceRespawn(this);
-                    return;
-                }
-                this.updateLocation();
-                this.updateMovementState();
-                this.updateRegen();
+        this.updateLocation();
+        this.updateMovementState();
 
-                if (this.getStamina() < 10) {
-                    if (this.getAltitude() > 0 || this.getDesiredAltitude() > 0) {
-                        PlayerCharacter.GroundPlayer(this);
-                        this.updateRegen();
+        try {
+
+            if (this.updateLock.writeLock().tryLock()) {
+                try {
+                    //if (!this.timestamps.contains("STAMHEALTICK")) {
+                     //   this.timestamps.put("STAMHEALTICK", System.currentTimeMillis());
+                    //}
+                    //if (this.containsEffect(441156455)) {
+                    //    long length = System.currentTimeMillis() - this.timestamps.get("STAMHEALTICK").longValue();
+                     //   if (length > 10000 ) {
+                     //       float stamIncrease = 6.5f;
+                     //       if (this.stamina.get() + stamIncrease > this.staminaMax)
+                     //           this.stamina.compareAndSet(this.stamina.get(), this.staminaMax);
+                     //       else
+                     //           this.stamina.compareAndSet(this.stamina.get(), this.stamina.get() + stamIncrease);
+                     //       this.timestamps.put("STAMHEALTICK", System.currentTimeMillis());
+                    //        ChatManager.chatSystemInfo(this, "Healed 7 Stamina");
+                    //    }
+                    //} else {
+                    //    this.timestamps.put("STAMHEALTICK", System.currentTimeMillis());
+                    //}
+
+                    if (!this.isAlive() && this.isEnteredWorld()) {
+                        if (!this.timestamps.containsKey("DeathTime")) {
+                            this.timestamps.put("DeathTime", System.currentTimeMillis());
+                        } else if ((System.currentTimeMillis() - this.timestamps.get("DeathTime")) > 600000)
+                            forceRespawn(this);
+                        return;
                     }
-                }
 
-                RealmMap.updateRealm(this);
-                this.updateBlessingMessage();
+                    if (this.isAlive() && this.isActive && this.enteredWorld) {
 
-                this.safeZone = this.isInSafeZone();
-                if(!this.timestamps.containsKey("nextBoxCheck"))
-                    this.timestamps.put("nextBoxCheck", System.currentTimeMillis() + 10000);
+                        this.updateMovementState();
 
-                if(!this.isBoxed && this.timestamps.get("nextBoxCheck") < System.currentTimeMillis()) {
-                    this.isBoxed = checkIfBoxed(this);
-                    this.timestamps.put("nextBoxCheck", System.currentTimeMillis() + 10000);
-                }
-
-                if(this.level < 10 && this.enteredWorld) {
-                   // this.setLevel((short) 10);
-                    while (this.level < 10) {
-                        grantXP(Experience.getBaseExperience(this.level + 1) - this.exp);
+                        if (this.combatStats == null) {
+                            this.combatStats = new PlayerCombatStats(this);
+                        } else {
+                            this.combatStats.update();
+                        }
+                        this.doRegen();
                     }
-                }
 
-                if(this.isBoxed && !this.containsEffect(1672601862)) {
-                    PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false);
-                }
-
-                if(this.isFlying()){
-                    //if (!AbstractCharacter.CanFly(this)) {
-                    if(this.effects.containsKey("MoveBuff")){
-                        GroundPlayer(this);
-                        //ChatManager.chatSystemInfo(this, "You Cannot Fly While Having A MovementBuff");
-                    }
-                    if(!this.timestamps.containsKey("StunGrounded"))
-                        this.timestamps.put("StunGrounded",System.currentTimeMillis() - 1000L);
-                    if(this.bonuses.getBool(ModType.Stunned, SourceType.None) && this.timestamps.get("StunGrounded") < System.currentTimeMillis()){
-                        boolean isFlyMoving = this.getDesiredAltitude() != this.altitude;
-                        if(!isFlyMoving && this.bonuses.getBool(ModType.Stunned, SourceType.None)){
-                            this.setDesiredAltitude(this.altitude - 10);
-                            this.setTakeOffTime(System.currentTimeMillis());
-
-                            ChangeAltitudeMsg msg = new ChangeAltitudeMsg(this.getObjectType().ordinal(), this.getObjectUUID(), false, this.getAltitude(), this.getDesiredAltitude(), this.getAltitude());
-                            // force a landing
-                            DispatchMessage.dispatchMsgToInterestArea(this, msg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
-                            this.timestamps.put("StunGrounded",System.currentTimeMillis() + 1500L);
-                            ChatManager.chatSystemInfo(this,"Applying 1 Tier Ground");
+                    if (this.getStamina() < 10) {
+                        if (this.getAltitude() > 0 || this.getDesiredAltitude() > 0) {
+                            PlayerCharacter.GroundPlayer(this);
                         }
                     }
 
-                }
+                    RealmMap.updateRealm(this);
+                    this.updateBlessingMessage();
 
-            } catch (Exception e) {
-                Logger.error(e);
-            } finally {
-                this.updateLock.writeLock().unlock();
+                    this.safeZone = this.isInSafeZone();
+                    if (!this.timestamps.containsKey("nextBoxCheck"))
+                        this.timestamps.put("nextBoxCheck", System.currentTimeMillis() + 10000);
+
+                    if (!this.isBoxed && this.timestamps.get("nextBoxCheck") < System.currentTimeMillis()) {
+                        this.isBoxed = checkIfBoxed(this);
+                        this.timestamps.put("nextBoxCheck", System.currentTimeMillis() + 10000);
+                    }
+
+                    if (this.level < 10 && this.enteredWorld) {
+                        while (this.level < 10) {
+                            grantXP(Experience.getBaseExperience(this.level + 1) - this.exp);
+                        }
+                    }
+
+                    if (this.isBoxed && !this.containsEffect(508555434)) {
+                        PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 508555434, 40, false);
+                    }
+
+                    if (this.ZergMultiplier != 1.0f && !this.containsEffect(-906894951)) {
+                        PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, -906894951, 40, false);
+                    }else if(this.containsEffect(-906894951)){
+                        this.effects.remove("Zerg Penalty");
+                    }
+
+                    if (this.isFlying()) {
+                        if (this.effects.containsKey("MoveBuff")) {
+                            GroundPlayer(this);
+                        }
+                        if (!this.timestamps.containsKey("StunGrounded"))
+                            this.timestamps.put("StunGrounded", System.currentTimeMillis() - 1000L);
+                        if (this.bonuses.getBool(ModType.Stunned, SourceType.None) && this.timestamps.get("StunGrounded") < System.currentTimeMillis()) {
+                            boolean isFlyMoving = this.getDesiredAltitude() != this.altitude;
+                            if (!isFlyMoving && this.bonuses.getBool(ModType.Stunned, SourceType.None)) {
+                                this.setDesiredAltitude(this.altitude - 10);
+                                this.setTakeOffTime(System.currentTimeMillis());
+
+                                ChangeAltitudeMsg msg = new ChangeAltitudeMsg(this.getObjectType().ordinal(), this.getObjectUUID(), false, this.getAltitude(), this.getDesiredAltitude(), this.getAltitude());
+                                // force a landing
+                                DispatchMessage.dispatchMsgToInterestArea(this, msg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
+                                this.timestamps.put("StunGrounded", System.currentTimeMillis() + 1500L);
+                                ChatManager.chatSystemInfo(this, "Applying 1 Tier Ground");
+                            }
+                        }
+
+                    }
+
+                } catch (Exception e) {
+                    Logger.error(e);
+                } finally {
+                    this.updateLock.writeLock().unlock();
+                }
             }
+        }catch(Exception e){
+            Logger.error("UPDATE ISSUE: " + e);
         }
     }
     public static void unboxPlayer(PlayerCharacter player){
@@ -5124,17 +5235,25 @@ public class PlayerCharacter extends AbstractCharacter {
             }
         }
 
-        for(PlayerCharacter pc : sameMachine)
-            pc.isBoxed = true;
-
-        player.isBoxed = false;
-        if(player.containsEffect(1672601862)) {
-            player.removeEffectBySource(EffectSourceType.DeathShroud,41,false);
+        boolean valid = true;
+        for(PlayerCharacter pc : sameMachine){
+            if(!pc.safeZone)
+                valid = false;
         }
+        if(valid) {
+            for (PlayerCharacter pc : sameMachine)
+                pc.isBoxed = true;
 
+            player.isBoxed = false;
+            if (player.containsEffect(1672601862)) {
+                player.removeEffectBySource(EffectSourceType.DeathShroud, 41, false);
+            }
+        }else{
+            ChatManager.chatSystemInfo(player, "All Boxes Must Be In Safezone To Switch");
+        }
     }
     public static boolean checkIfBoxed(PlayerCharacter player){
-        if(ConfigManager.MB_WORLD_TESTMODE.getValue().equals("true")) {
+        if(ConfigManager.MB_WORLD_BOXLIMIT.getValue().equals("false")) {
             return false;
         }
         try {
@@ -5313,206 +5432,6 @@ public class PlayerCharacter extends AbstractCharacter {
 
     }
 
-    @Override
-    public void updateRegen() {
-
-        if(true)
-            return;
-
-        float healthRegen = 0f;
-        float manaRegen = 0f;
-        float stamRegen = 0f;
-
-        boolean updateClient = false;
-
-        // Early exit if char is dead or disconnected
-        if ((this.isAlive() == false)
-                || (this.isActive() == false) || this.getLoc().x == 0 && this.getLoc().z == 0)
-            return;
-
-        // Calculate Regen amount from last simulation tick
-        switch (this.movementState) {
-
-            case IDLE:
-
-                healthRegen = ((this.healthMax * MBServerStatics.HEALTH_REGEN_IDLE) + MBServerStatics.HEALTH_REGEN_IDLE_STATIC) * (getRegenModifier(ModType.HealthRecoverRate));
-
-                if (this.isCasting() || this.isItemCasting())
-                    healthRegen *= .75f;
-                // Characters regen mana when in only walk mode and idle
-                if (this.walkMode)
-                    manaRegen = ((this.manaMax * MBServerStatics.MANA_REGEN_IDLE) * getRegenModifier(ModType.ManaRecoverRate));
-                else if (!this.isCasting() && !this.isItemCasting())
-                    manaRegen = ((this.manaMax * MBServerStatics.MANA_REGEN_RUN) * getRegenModifier(ModType.ManaRecoverRate));
-                else
-                    manaRegen = 0;
-
-                if (!PlayerCharacter.CanBreathe(this))
-                    stamRegen = MBServerStatics.STAMINA_REGEN_SWIM;
-                else if ((!this.isCasting() && !this.isItemCasting()) || this.lastMovementState.equals(MovementState.FLYING))
-                    stamRegen = MBServerStatics.STAMINA_REGEN_IDLE * getRegenModifier(ModType.StaminaRecoverRate);
-                else
-                    stamRegen = 0;
-                break;
-            case SITTING:
-                healthRegen = ((this.healthMax * MBServerStatics.HEALTH_REGEN_SIT) + MBServerStatics.HEALTH_REGEN_SIT_STATIC) * getRegenModifier(ModType.HealthRecoverRate);
-                manaRegen = (this.manaMax * MBServerStatics.MANA_REGEN_SIT) * (getRegenModifier(ModType.ManaRecoverRate));
-                stamRegen = MBServerStatics.STAMINA_REGEN_SIT * getRegenModifier(ModType.StaminaRecoverRate);
-                break;
-            case RUNNING:
-                if (this.walkMode == true) {
-                    healthRegen = ((this.healthMax * MBServerStatics.HEALTH_REGEN_WALK) + MBServerStatics.HEALTH_REGEN_IDLE_STATIC) * getRegenModifier(ModType.HealthRecoverRate);
-                    manaRegen = this.manaMax * MBServerStatics.MANA_REGEN_WALK * getRegenModifier(ModType.ManaRecoverRate);
-                    stamRegen = MBServerStatics.STAMINA_REGEN_WALK;
-                } else {
-                    healthRegen = 0;
-                    manaRegen = 0;
-
-                    if (this.combat == true)
-                        stamRegen = MBServerStatics.STAMINA_REGEN_RUN_COMBAT;
-                    else
-                        stamRegen = MBServerStatics.STAMINA_REGEN_RUN_NONCOMBAT;
-                }
-                break;
-            case FLYING:
-
-                float seventyFive = this.staminaMax * .75f;
-                float fifty = this.staminaMax * .5f;
-                float twentyFive = this.staminaMax * .25f;
-
-                if (this.getDesiredAltitude() == 0 && this.getAltitude() <= 10) {
-                    if (this.isCombat())
-                        stamRegen = 0;
-                    else
-                        stamRegen = MBServerStatics.STAMINA_REGEN_IDLE * getRegenModifier(ModType.StaminaRecoverRate);
-                } else if (!this.useFlyMoveRegen()) {
-
-                    healthRegen = ((this.healthMax * MBServerStatics.HEALTH_REGEN_IDLE) + MBServerStatics.HEALTH_REGEN_IDLE_STATIC) * (getRegenModifier(ModType.HealthRecoverRate));
-
-                    if (this.isCasting() || this.isItemCasting())
-                        healthRegen *= .75f;
-                    // Characters regen mana when in only walk mode and idle
-                    if (this.walkMode)
-                        manaRegen = (this.manaMax * MBServerStatics.MANA_REGEN_IDLE + (this.getSpiMod() * .015f)) * (getRegenModifier(ModType.ManaRecoverRate));
-                    else if (!this.isCasting() && !this.isItemCasting())
-                        manaRegen = (this.manaMax * MBServerStatics.MANA_REGEN_IDLE + (this.getSpiMod() * .015f)) * (getRegenModifier(ModType.ManaRecoverRate));
-                    else
-                        manaRegen = 0;
-
-                    if (!this.isItemCasting() && !this.isCasting() || this.getTakeOffTime() != 0)
-                        stamRegen = MBServerStatics.STAMINA_REGEN_FLY_IDLE;
-                    else
-                        stamRegen = -1f;
-                } else if (this.walkMode == true) {
-                    healthRegen = ((this.healthMax * MBServerStatics.HEALTH_REGEN_WALK) + MBServerStatics.HEALTH_REGEN_IDLE_STATIC) * getRegenModifier(ModType.HealthRecoverRate);
-                    manaRegen = ((this.manaMax * MBServerStatics.MANA_REGEN_WALK) + (this.getSpiMod() * .015f)) * (getRegenModifier(ModType.ManaRecoverRate));
-                    stamRegen = MBServerStatics.STAMINA_REGEN_FLY_WALK;
-                } else {
-                    healthRegen = 0;
-                    manaRegen = 0;
-                    if (this.isCombat())
-                        stamRegen = MBServerStatics.STAMINA_REGEN_FLY_RUN_COMBAT;
-                    else
-                        stamRegen = MBServerStatics.STAMINA_REGEN_FLY_RUN;
-                }
-
-                float oldStamina = this.stamina.get();
-
-                if (FastMath.between(oldStamina, 0, twentyFive) && !this.wasTripped25) {
-                    updateClient = true;
-                    this.wasTripped25 = true;
-                    this.wasTripped50 = false;
-                    this.wasTripped75 = false;
-                } else if (FastMath.between(oldStamina, twentyFive, fifty) && !this.wasTripped50) {
-                    updateClient = true;
-                    this.wasTripped25 = false;
-                    this.wasTripped50 = true;
-                    this.wasTripped75 = false;
-                } else if (FastMath.between(oldStamina, fifty, seventyFive) && !this.wasTripped75) {
-                    updateClient = true;
-                    this.wasTripped25 = false;
-                    this.wasTripped50 = false;
-                    this.wasTripped75 = true;
-                }
-                break;
-            case SWIMMING:
-                if (this.walkMode == true) {
-                    healthRegen = ((this.healthMax * MBServerStatics.HEALTH_REGEN_WALK) + MBServerStatics.HEALTH_REGEN_IDLE_STATIC) * getRegenModifier(ModType.HealthRecoverRate);
-                    manaRegen = ((this.manaMax * MBServerStatics.MANA_REGEN_WALK) + (this.getSpiMod() * .015f)) * (getRegenModifier(ModType.ManaRecoverRate));
-                    stamRegen = MBServerStatics.STAMINA_REGEN_SWIM;
-                } else {
-                    healthRegen = 0;
-                    manaRegen = 0;
-                    stamRegen = MBServerStatics.STAMINA_REGEN_SWIM;
-
-                    if (this.combat == true)
-                        stamRegen += MBServerStatics.STAMINA_REGEN_RUN_COMBAT;
-                    else
-                        stamRegen += MBServerStatics.STAMINA_REGEN_RUN_NONCOMBAT;
-                }
-                break;
-        }
-
-        // Are we drowning?
-        if ((this.getStamina() <= 0)
-                && (PlayerCharacter.CanBreathe(this) == false))
-            healthRegen = (this.healthMax * -.03f);
-
-        // Multiple regen values by current deltaTime
-        //     Logger.info("", healthRegen + "");
-        healthRegen *= getDeltaTime();
-        manaRegen *= getDeltaTime();
-        stamRegen *= getStamDeltaTime();
-
-        boolean workedHealth = false;
-        boolean workedMana = false;
-        boolean workedStamina = false;
-
-        float old, mod;
-        while (!workedHealth || !workedMana || !workedStamina) {
-            if (!this.isAlive() || !this.isActive())
-                return;
-            if (!workedHealth) {
-                old = this.health.get();
-                mod = old + healthRegen;
-                if (mod > this.healthMax)
-                    mod = healthMax;
-                else if (mod <= 0) {
-                    if (this.isAlive.compareAndSet(true, false))
-                        killCharacter("Water");
-                    return;
-                }
-                workedHealth = this.health.compareAndSet(old, mod);
-            }
-            if (!workedStamina) {
-                old = this.stamina.get();
-                mod = old + stamRegen;
-                if (mod > this.staminaMax)
-                    mod = staminaMax;
-                else if (mod < 0)
-                    mod = 0;
-                workedStamina = this.stamina.compareAndSet(old, mod);
-            }
-            if (!workedMana) {
-                old = this.mana.get();
-                mod = old + manaRegen;
-                if (mod > this.manaMax)
-                    mod = manaMax;
-                else if (mod < 0)
-                    mod = 0;
-                workedMana = this.mana.compareAndSet(old, mod);
-            }
-        }
-
-        if (updateClient)
-            this.syncClient();
-
-        // Reset this char's frame time.
-        this.lastUpdateTime = System.currentTimeMillis();
-        this.lastStamUpdateTime = System.currentTimeMillis();
-
-    }
-
     public synchronized void updateStamRegen(long time) {
 
         boolean disable = true;
@@ -5797,28 +5716,199 @@ public class PlayerCharacter extends AbstractCharacter {
         dirtyLock.writeLock().unlock();
     }
 
-    public void doRegen(){
-        if(!this.timestamps.containsKey("SyncClient"))
-            this.timestamps.put("SyncClient",System.currentTimeMillis());
-        if (this.updateLock.writeLock().tryLock()) {
-            try {
-                if(!this.isAlive() || !this.enteredWorld || !this.isActive) {
-                    this.resetRegenUpdateTime();
-                    return;
-                }
-                this.updateMovementState();
-                boolean updateHealth = this.regenerateHealth();
-                boolean updateMana = this.regenerateMana();
-                boolean updateStamina = this.regenerateStamina();
-                boolean consumeStamina = this.consumeStamina();
-                if(this.timestamps.get("SyncClient") + 5000L > System.currentTimeMillis())
-                    if(updateHealth || updateMana || updateStamina || consumeStamina)
-                        this.syncClient();
-            } catch (Exception e) {
-                Logger.error(e);
-            } finally {
-                this.updateLock.writeLock().unlock();
+    public void doRegen() {
+        if (!this.timestamps.containsKey("SyncClient"))
+            this.timestamps.put("SyncClient", System.currentTimeMillis());
+
+        if (!this.isAlive() || !this.enteredWorld || !this.isActive) {
+            this.resetRegenUpdateTime();
+            return;
+        }
+            float healthRegen = 0f;
+            float manaRegen = 0f;
+            float stamRegen = 0f;
+            boolean updateClient = false;
+            // Early exit if char is dead or disconnected
+            if ((this.isAlive() == false)
+                    || (this.isActive() == false) || this.getLoc().x == 0 && this.getLoc().z == 0)
+                return;
+            // Calculate Regen amount from last simulation tick
+            switch (this.movementState) {
+                case IDLE:
+                    healthRegen = ((this.healthMax * MBServerStatics.HEALTH_REGEN_IDLE) + MBServerStatics.HEALTH_REGEN_IDLE_STATIC) * (getRegenModifier(ModType.HealthRecoverRate));
+                    if (this.isCasting() || this.isItemCasting())
+                        healthRegen *= .75f;
+                    // Characters regen mana when in only walk mode and idle
+                    if (this.walkMode)
+                        manaRegen = ((this.manaMax * MBServerStatics.MANA_REGEN_IDLE) * getRegenModifier(ModType.ManaRecoverRate));
+                    else if (!this.isCasting() && !this.isItemCasting())
+                        manaRegen = ((this.manaMax * MBServerStatics.MANA_REGEN_IDLE) * getRegenModifier(ModType.ManaRecoverRate));
+                    else
+                        manaRegen = 0;
+                    if (!PlayerCharacter.CanBreathe(this))
+                        stamRegen = MBServerStatics.STAMINA_REGEN_SWIM;
+                    else if ((!this.isCasting() && !this.isItemCasting()) || this.lastMovementState.equals(MovementState.FLYING))
+                        stamRegen = MBServerStatics.STAMINA_REGEN_IDLE * getRegenModifier(ModType.StaminaRecoverRate);
+                    else
+                        stamRegen = 0;
+                    break;
+                case SITTING:
+                    healthRegen = ((this.healthMax * MBServerStatics.HEALTH_REGEN_SIT) + MBServerStatics.HEALTH_REGEN_SIT_STATIC) * getRegenModifier(ModType.HealthRecoverRate);
+                    manaRegen = (this.manaMax * MBServerStatics.MANA_REGEN_SIT) * (getRegenModifier(ModType.ManaRecoverRate));
+                    stamRegen = MBServerStatics.STAMINA_REGEN_SIT * getRegenModifier(ModType.StaminaRecoverRate);
+                    break;
+                case RUNNING:
+                    if (this.walkMode == true) {
+                        healthRegen = ((this.healthMax * MBServerStatics.HEALTH_REGEN_WALK) + MBServerStatics.HEALTH_REGEN_IDLE_STATIC) * getRegenModifier(ModType.HealthRecoverRate);
+                        manaRegen = this.manaMax * MBServerStatics.MANA_REGEN_WALK * getRegenModifier(ModType.ManaRecoverRate);
+                        stamRegen = MBServerStatics.STAMINA_REGEN_WALK;
+                    } else {
+                        healthRegen = 0;
+                        manaRegen = 0;
+                        if (this.combat == true)
+                            stamRegen = MBServerStatics.STAMINA_REGEN_RUN_COMBAT;
+                        else
+                            stamRegen = MBServerStatics.STAMINA_REGEN_RUN_NONCOMBAT;
+                    }
+                    break;
+                case FLYING:
+                    float seventyFive = this.staminaMax * .75f;
+                    float fifty = this.staminaMax * .5f;
+                    float twentyFive = this.staminaMax * .25f;
+                    if (this.getDesiredAltitude() == 0 && this.getAltitude() <= 10) {
+                        if (this.isCombat())
+                            stamRegen = 0;
+                        else
+                            stamRegen = MBServerStatics.STAMINA_REGEN_IDLE * getRegenModifier(ModType.StaminaRecoverRate);
+                    } else if (!this.useFlyMoveRegen()) {
+                        healthRegen = ((this.healthMax * MBServerStatics.HEALTH_REGEN_IDLE) + MBServerStatics.HEALTH_REGEN_IDLE_STATIC) * (getRegenModifier(ModType.HealthRecoverRate));
+                        if (this.isCasting() || this.isItemCasting())
+                            healthRegen *= .75f;
+                        // Characters regen mana when in only walk mode and idle
+                        if (this.walkMode)
+                            manaRegen = (this.manaMax * MBServerStatics.MANA_REGEN_IDLE + (this.getSpiMod() * .015f)) * (getRegenModifier(ModType.ManaRecoverRate));
+                        else if (!this.isCasting() && !this.isItemCasting())
+                            manaRegen = (this.manaMax * MBServerStatics.MANA_REGEN_IDLE + (this.getSpiMod() * .015f)) * (getRegenModifier(ModType.ManaRecoverRate));
+                        else
+                            manaRegen = 0;
+                        if (!this.isItemCasting() && !this.isCasting() || this.getTakeOffTime() != 0)
+                            stamRegen = MBServerStatics.STAMINA_REGEN_FLY_IDLE;
+                        else
+                            stamRegen = -1f;
+                    } else if (this.walkMode == true) {
+                        healthRegen = ((this.healthMax * MBServerStatics.HEALTH_REGEN_WALK) + MBServerStatics.HEALTH_REGEN_IDLE_STATIC) * getRegenModifier(ModType.HealthRecoverRate);
+                        manaRegen = ((this.manaMax * MBServerStatics.MANA_REGEN_WALK) + (this.getSpiMod() * .015f)) * (getRegenModifier(ModType.ManaRecoverRate));
+                        stamRegen = MBServerStatics.STAMINA_REGEN_FLY_WALK;
+                    } else {
+                        healthRegen = 0;
+                        manaRegen = 0;
+                        if (this.isCombat())
+                            stamRegen = MBServerStatics.STAMINA_REGEN_FLY_RUN_COMBAT;
+                        else
+                            stamRegen = MBServerStatics.STAMINA_REGEN_FLY_RUN;
+                    }
+                    float oldStamina = this.stamina.get();
+                    if (FastMath.between(oldStamina, 0, twentyFive) && !this.wasTripped25) {
+                        updateClient = true;
+                        this.wasTripped25 = true;
+                        this.wasTripped50 = false;
+                        this.wasTripped75 = false;
+                    } else if (FastMath.between(oldStamina, twentyFive, fifty) && !this.wasTripped50) {
+                        updateClient = true;
+                        this.wasTripped25 = false;
+                        this.wasTripped50 = true;
+                        this.wasTripped75 = false;
+                    } else if (FastMath.between(oldStamina, fifty, seventyFive) && !this.wasTripped75) {
+                        updateClient = true;
+                        this.wasTripped25 = false;
+                        this.wasTripped50 = false;
+                        this.wasTripped75 = true;
+                    }
+                    break;
+                case SWIMMING:
+                    if (this.walkMode == true) {
+                        healthRegen = ((this.healthMax * MBServerStatics.HEALTH_REGEN_WALK) + MBServerStatics.HEALTH_REGEN_IDLE_STATIC) * getRegenModifier(ModType.HealthRecoverRate);
+                        manaRegen = ((this.manaMax * MBServerStatics.MANA_REGEN_WALK) + (this.getSpiMod() * .015f)) * (getRegenModifier(ModType.ManaRecoverRate));
+                        stamRegen = MBServerStatics.STAMINA_REGEN_SWIM;
+                    } else {
+                        healthRegen = 0;
+                        manaRegen = 0;
+                        stamRegen = MBServerStatics.STAMINA_REGEN_SWIM;
+                        if (this.combat == true)
+                            stamRegen += MBServerStatics.STAMINA_REGEN_RUN_COMBAT;
+                        else
+                            stamRegen += MBServerStatics.STAMINA_REGEN_RUN_NONCOMBAT;
+                    }
+                    break;
             }
+            // Are we drowning?
+            if ((this.getStamina() <= 0)
+                    && (PlayerCharacter.CanBreathe(this) == false))
+                healthRegen = (this.healthMax * -.03f);
+            // Multiple regen values by current deltaTime
+            //     Logger.info("", healthRegen + "");
+            healthRegen *= getDeltaTime();
+            manaRegen *= 0.01f;
+            manaRegen *= getDeltaTime();
+            stamRegen *= getStamDeltaTime();
+            if(this.isSit()){
+                healthRegen *= 1.5;
+                manaRegen *= 1.5;
+                stamRegen *= 1.5;
+            }
+            boolean workedHealth = false;
+            boolean workedMana = false;
+            boolean workedStamina = false;
+            float old, mod;
+            while (!workedHealth || !workedMana || !workedStamina) {
+                if (!this.isAlive() || !this.isActive())
+                    return;
+                if (!workedHealth) {
+                    old = this.health.get();
+                    mod = old + healthRegen;
+                    if (mod > this.healthMax)
+                        mod = healthMax;
+                    else if (mod <= 0) {
+                        if (this.isAlive.compareAndSet(true, false))
+                            killCharacter("Water");
+                        return;
+                    }
+                    workedHealth = this.health.compareAndSet(old, mod);
+                }
+                if (!workedStamina) {
+                    old = this.stamina.get();
+                    mod = old + stamRegen;
+                    if (mod > this.staminaMax)
+                        mod = staminaMax;
+                    else if (mod < 0)
+                        mod = 0;
+                    workedStamina = this.stamina.compareAndSet(old, mod);
+                }
+                if (!workedMana) {
+                    old = this.mana.get();
+                    mod = old + manaRegen;
+                    if (mod > this.manaMax)
+                        mod = manaMax;
+                    else if (mod < 0)
+                        mod = 0;
+                    workedMana = this.mana.compareAndSet(old, mod);
+                }
+            }
+            if (updateClient)
+                this.syncClient();
+            // Reset this char's frame time.
+            this.lastUpdateTime = System.currentTimeMillis();
+            this.lastStamUpdateTime = System.currentTimeMillis();
+        //this.updateMovementState();
+        ///boolean updateHealth = this.regenerateHealth();
+        //boolean updateMana = this.regenerateMana();
+        //boolean updateStamina = this.regenerateStamina();
+        //boolean consumeStamina = this.consumeStamina();
+        if (this.timestamps.get("SyncClient") + 5000L < System.currentTimeMillis()) {
+            //if (updateHealth || updateMana || updateStamina || consumeStamina) {
+                this.syncClient();
+                this.timestamps.put("SyncClient", System.currentTimeMillis());
+            //}
         }
     }
 
@@ -5830,12 +5920,14 @@ public class PlayerCharacter extends AbstractCharacter {
         float onePercent = this.healthMax * 0.01f;
         float rate = 1.0f / RecoveryType.getRecoveryType(this).healthRate;
         rate *= this.getRegenModifier(ModType.HealthRecoverRate);
+        rate *= this.combatStats.healthRegen;
 
         if(this.isMoving() && !this.walkMode)
             rate = 0.0f;
 
         float healthRegenerated = onePercent * rate * secondsPassed;
         //ChatManager.chatSystemInfo(this,"HEALTH REGENERATED: " + healthRegenerated + " SECONDS PASSED: " + secondsPassed);
+        ChatManager.chatSystemInfo(this,"HEALTH : " + Math.round(this.health.get()) + " / " + this.healthMax);
         boolean workedHealth = false;
         float old = this.health.get();
         float mod = old + healthRegenerated;
@@ -5860,7 +5952,7 @@ public class PlayerCharacter extends AbstractCharacter {
         float secondsPassed = (currentTime - regenTime) / 1000f;
         float onePercent = this.manaMax * 0.01f;
         float rate = 1.0f / RecoveryType.getRecoveryType(this).manaRate;
-        rate *= this.getRegenModifier(ModType.ManaRecoverRate);
+        rate *= this.combatStats.manaRegen;
 
         if(this.isMoving() && !this.walkMode)
             rate = 0.0f;
@@ -5897,6 +5989,7 @@ public class PlayerCharacter extends AbstractCharacter {
         float secondsPassed = (currentTime - regenTime) / 1000f;
 
         float secondsToRecover1 = RecoveryType.getRecoveryType(this).staminaRate;
+        secondsToRecover1 *= this.combatStats.staminaRegen;
 
         float ratio = secondsPassed / secondsToRecover1;
         //rate *= this.getRegenModifier(ModType.StaminaRecoverRate); // Adjust rate with modifiers
@@ -5935,7 +6028,7 @@ public class PlayerCharacter extends AbstractCharacter {
         }else{
             consumption = 0.65f * secondsPassed;
         }
-        if(this.movementState.equals(MovementState.SWIMMING))
+        if(!this.canBreathe)
             consumption = 1.5f * secondsPassed;
         else if(this.isFlying())
             consumption = 2.0f * secondsPassed;

src/engine/objects/PlayerCombatStats.java

@@ -1,12 +1,20 @@
 package engine.objects;
 
 import engine.Enum;
+import engine.gameManager.ChatManager;
+import engine.math.Vector2f;
+import engine.math.Vector3fImmutable;
+import engine.powers.EffectsBase;
 import engine.powers.effectmodifiers.AbstractEffectModifier;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
+import javax.swing.*;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
 public class PlayerCombatStats {
@@ -30,6 +38,233 @@ public class PlayerCombatStats {
     public float healthRegen;
     public float manaRegen;
     public float staminaRegen;
+    public static final Map<Float, Float> HIT_VALUE_MAP = new HashMap<>();
+
+    static {
+        HIT_VALUE_MAP.put(0.40f, 0f);
+        HIT_VALUE_MAP.put(0.41f, 1f);
+        HIT_VALUE_MAP.put(0.42f, 1f);
+        HIT_VALUE_MAP.put(0.43f, 1f);
+        HIT_VALUE_MAP.put(0.44f, 2f);
+        HIT_VALUE_MAP.put(0.45f, 2f);
+        HIT_VALUE_MAP.put(0.46f, 2f);
+        HIT_VALUE_MAP.put(0.47f, 3f);
+        HIT_VALUE_MAP.put(0.48f, 3f);
+        HIT_VALUE_MAP.put(0.49f, 4f);
+        HIT_VALUE_MAP.put(0.50f, 4f);
+        HIT_VALUE_MAP.put(0.51f, 5f);
+        HIT_VALUE_MAP.put(0.52f, 5f);
+        HIT_VALUE_MAP.put(0.53f, 6f);
+        HIT_VALUE_MAP.put(0.54f, 7f);
+        HIT_VALUE_MAP.put(0.55f, 7f);
+        HIT_VALUE_MAP.put(0.56f, 8f);
+        HIT_VALUE_MAP.put(0.57f, 9f);
+        HIT_VALUE_MAP.put(0.58f, 9f);
+        HIT_VALUE_MAP.put(0.59f, 10f);
+        HIT_VALUE_MAP.put(0.60f, 11f);
+        HIT_VALUE_MAP.put(0.61f, 11f);
+        HIT_VALUE_MAP.put(0.62f, 12f);
+        HIT_VALUE_MAP.put(0.63f, 13f);
+        HIT_VALUE_MAP.put(0.64f, 13f);
+        HIT_VALUE_MAP.put(0.65f, 14f);
+        HIT_VALUE_MAP.put(0.66f, 15f);
+        HIT_VALUE_MAP.put(0.67f, 15f);
+        HIT_VALUE_MAP.put(0.68f, 16f);
+        HIT_VALUE_MAP.put(0.69f, 17f);
+        HIT_VALUE_MAP.put(0.70f, 17f);
+        HIT_VALUE_MAP.put(0.71f, 18f);
+        HIT_VALUE_MAP.put(0.72f, 19f);
+        HIT_VALUE_MAP.put(0.73f, 20f);
+        HIT_VALUE_MAP.put(0.74f, 20f);
+        HIT_VALUE_MAP.put(0.75f, 21f);
+        HIT_VALUE_MAP.put(0.76f, 22f);
+        HIT_VALUE_MAP.put(0.77f, 23f);
+        HIT_VALUE_MAP.put(0.78f, 24f);
+        HIT_VALUE_MAP.put(0.79f, 24f);
+        HIT_VALUE_MAP.put(0.80f, 25f);
+        HIT_VALUE_MAP.put(0.81f, 26f);
+        HIT_VALUE_MAP.put(0.82f, 27f);
+        HIT_VALUE_MAP.put(0.83f, 28f);
+        HIT_VALUE_MAP.put(0.84f, 29f);
+        HIT_VALUE_MAP.put(0.85f, 30f);
+        HIT_VALUE_MAP.put(0.86f, 31f);
+        HIT_VALUE_MAP.put(0.87f, 32f);
+        HIT_VALUE_MAP.put(0.88f, 33f);
+        HIT_VALUE_MAP.put(0.89f, 34f);
+        HIT_VALUE_MAP.put(0.90f, 35f);
+        HIT_VALUE_MAP.put(0.91f, 36f);
+        HIT_VALUE_MAP.put(0.92f, 37f);
+        HIT_VALUE_MAP.put(0.93f, 38f);
+        HIT_VALUE_MAP.put(0.94f, 39f);
+        HIT_VALUE_MAP.put(0.95f, 40f);
+        HIT_VALUE_MAP.put(0.96f, 42f);
+        HIT_VALUE_MAP.put(0.97f, 44f);
+        HIT_VALUE_MAP.put(0.98f, 46f);
+        HIT_VALUE_MAP.put(0.99f, 48f);
+        HIT_VALUE_MAP.put(1.00f, 50f);
+        HIT_VALUE_MAP.put(1.01f, 52f);
+        HIT_VALUE_MAP.put(1.02f, 54f);
+        HIT_VALUE_MAP.put(1.03f, 56f);
+        HIT_VALUE_MAP.put(1.04f, 58f);
+        HIT_VALUE_MAP.put(1.05f, 60f);
+        HIT_VALUE_MAP.put(1.06f, 61f);
+        HIT_VALUE_MAP.put(1.07f, 62f);
+        HIT_VALUE_MAP.put(1.08f, 63f);
+        HIT_VALUE_MAP.put(1.09f, 64f);
+        HIT_VALUE_MAP.put(1.10f, 65f);
+        HIT_VALUE_MAP.put(1.11f, 66f);
+        HIT_VALUE_MAP.put(1.12f, 67f);
+        HIT_VALUE_MAP.put(1.13f, 68f);
+        HIT_VALUE_MAP.put(1.14f, 69f);
+        HIT_VALUE_MAP.put(1.15f, 70f);
+        HIT_VALUE_MAP.put(1.16f, 70f);
+        HIT_VALUE_MAP.put(1.17f, 71f);
+        HIT_VALUE_MAP.put(1.18f, 71f);
+        HIT_VALUE_MAP.put(1.19f, 72f);
+        HIT_VALUE_MAP.put(1.20f, 72f);
+        HIT_VALUE_MAP.put(1.21f, 73f);
+        HIT_VALUE_MAP.put(1.22f, 73f);
+        HIT_VALUE_MAP.put(1.23f, 74f);
+        HIT_VALUE_MAP.put(1.24f, 74f);
+        HIT_VALUE_MAP.put(1.25f, 75f);
+        HIT_VALUE_MAP.put(1.26f, 75f);
+        HIT_VALUE_MAP.put(1.27f, 76f);
+        HIT_VALUE_MAP.put(1.28f, 76f);
+        HIT_VALUE_MAP.put(1.29f, 77f);
+        HIT_VALUE_MAP.put(1.30f, 77f);
+        HIT_VALUE_MAP.put(1.31f, 78f);
+        HIT_VALUE_MAP.put(1.32f, 78f);
+        HIT_VALUE_MAP.put(1.33f, 79f);
+        HIT_VALUE_MAP.put(1.34f, 79f);
+        HIT_VALUE_MAP.put(1.35f, 80f);
+        HIT_VALUE_MAP.put(1.36f, 80f);
+        HIT_VALUE_MAP.put(1.37f, 81f);
+        HIT_VALUE_MAP.put(1.38f, 81f);
+        HIT_VALUE_MAP.put(1.39f, 81f);
+        HIT_VALUE_MAP.put(1.40f, 82f);
+        HIT_VALUE_MAP.put(1.41f, 82f);
+        HIT_VALUE_MAP.put(1.42f, 82f);
+        HIT_VALUE_MAP.put(1.43f, 83f);
+        HIT_VALUE_MAP.put(1.44f, 83f);
+        HIT_VALUE_MAP.put(1.45f, 83f);
+        HIT_VALUE_MAP.put(1.46f, 84f);
+        HIT_VALUE_MAP.put(1.47f, 84f);
+        HIT_VALUE_MAP.put(1.48f, 84f);
+        HIT_VALUE_MAP.put(1.49f, 85f);
+        HIT_VALUE_MAP.put(1.50f, 85f);
+        HIT_VALUE_MAP.put(1.51f, 85f);
+        HIT_VALUE_MAP.put(1.52f, 86f);
+        HIT_VALUE_MAP.put(1.53f, 86f);
+        HIT_VALUE_MAP.put(1.54f, 86f);
+        HIT_VALUE_MAP.put(1.55f, 86f);
+        HIT_VALUE_MAP.put(1.56f, 87f);
+        HIT_VALUE_MAP.put(1.57f, 87f);
+        HIT_VALUE_MAP.put(1.58f, 87f);
+        HIT_VALUE_MAP.put(1.59f, 87f);
+        HIT_VALUE_MAP.put(1.60f, 88f);
+        HIT_VALUE_MAP.put(1.61f, 88f);
+        HIT_VALUE_MAP.put(1.62f, 88f);
+        HIT_VALUE_MAP.put(1.63f, 88f);
+        HIT_VALUE_MAP.put(1.64f, 89f);
+        HIT_VALUE_MAP.put(1.65f, 89f);
+        HIT_VALUE_MAP.put(1.66f, 89f);
+        HIT_VALUE_MAP.put(1.67f, 89f);
+        HIT_VALUE_MAP.put(1.68f, 90f);
+        HIT_VALUE_MAP.put(1.69f, 90f);
+        HIT_VALUE_MAP.put(1.70f, 90f);
+        HIT_VALUE_MAP.put(1.71f, 90f);
+        HIT_VALUE_MAP.put(1.72f, 91f);
+        HIT_VALUE_MAP.put(1.73f, 91f);
+        HIT_VALUE_MAP.put(1.74f, 91f);
+        HIT_VALUE_MAP.put(1.75f, 91f);
+        HIT_VALUE_MAP.put(1.76f, 91f);
+        HIT_VALUE_MAP.put(1.77f, 92f);
+        HIT_VALUE_MAP.put(1.78f, 92f);
+        HIT_VALUE_MAP.put(1.79f, 92f);
+        HIT_VALUE_MAP.put(1.80f, 92f);
+        HIT_VALUE_MAP.put(1.81f, 92f);
+        HIT_VALUE_MAP.put(1.82f, 93f);
+        HIT_VALUE_MAP.put(1.83f, 93f);
+        HIT_VALUE_MAP.put(1.84f, 93f);
+        HIT_VALUE_MAP.put(1.85f, 93f);
+        HIT_VALUE_MAP.put(1.86f, 93f);
+        HIT_VALUE_MAP.put(1.87f, 93f);
+        HIT_VALUE_MAP.put(1.88f, 94f);
+        HIT_VALUE_MAP.put(1.89f, 94f);
+        HIT_VALUE_MAP.put(1.90f, 94f);
+        HIT_VALUE_MAP.put(1.91f, 94f);
+        HIT_VALUE_MAP.put(1.92f, 94f);
+        HIT_VALUE_MAP.put(1.93f, 94f);
+        HIT_VALUE_MAP.put(1.94f, 95f);
+        HIT_VALUE_MAP.put(1.95f, 95f);
+        HIT_VALUE_MAP.put(1.96f, 95f);
+        HIT_VALUE_MAP.put(1.97f, 95f);
+        HIT_VALUE_MAP.put(1.98f, 95f);
+        HIT_VALUE_MAP.put(1.99f, 95f);
+        HIT_VALUE_MAP.put(2.00f, 96f);
+        HIT_VALUE_MAP.put(2.01f, 96f);
+        HIT_VALUE_MAP.put(2.02f, 96f);
+        HIT_VALUE_MAP.put(2.03f, 96f);
+        HIT_VALUE_MAP.put(2.04f, 96f);
+        HIT_VALUE_MAP.put(2.05f, 96f);
+        HIT_VALUE_MAP.put(2.06f, 96f);
+        HIT_VALUE_MAP.put(2.07f, 96f);
+        HIT_VALUE_MAP.put(2.08f, 97f);
+        HIT_VALUE_MAP.put(2.09f, 97f);
+        HIT_VALUE_MAP.put(2.10f, 97f);
+        HIT_VALUE_MAP.put(2.11f, 97f);
+        HIT_VALUE_MAP.put(2.12f, 97f);
+        HIT_VALUE_MAP.put(2.13f, 97f);
+        HIT_VALUE_MAP.put(2.14f, 97f);
+        HIT_VALUE_MAP.put(2.15f, 97f);
+        HIT_VALUE_MAP.put(2.16f, 97f);
+        HIT_VALUE_MAP.put(2.17f, 97f);
+        HIT_VALUE_MAP.put(2.18f, 98f);
+        HIT_VALUE_MAP.put(2.19f, 98f);
+        HIT_VALUE_MAP.put(2.20f, 98f);
+        HIT_VALUE_MAP.put(2.21f, 98f);
+        HIT_VALUE_MAP.put(2.22f, 98f);
+        HIT_VALUE_MAP.put(2.23f, 98f);
+        HIT_VALUE_MAP.put(2.24f, 98f);
+        HIT_VALUE_MAP.put(2.25f, 98f);
+        HIT_VALUE_MAP.put(2.26f, 98f);
+        HIT_VALUE_MAP.put(2.27f, 98f);
+        HIT_VALUE_MAP.put(2.28f, 98f);
+        HIT_VALUE_MAP.put(2.29f, 98f);
+        HIT_VALUE_MAP.put(2.30f, 98f);
+        HIT_VALUE_MAP.put(2.31f, 98f);
+        HIT_VALUE_MAP.put(2.32f, 99f);
+        HIT_VALUE_MAP.put(2.33f, 99f);
+        HIT_VALUE_MAP.put(2.34f, 99f);
+        HIT_VALUE_MAP.put(2.35f, 99f);
+        HIT_VALUE_MAP.put(2.36f, 99f);
+        HIT_VALUE_MAP.put(2.37f, 99f);
+        HIT_VALUE_MAP.put(2.38f, 99f);
+        HIT_VALUE_MAP.put(2.39f, 99f);
+        HIT_VALUE_MAP.put(2.40f, 99f);
+        HIT_VALUE_MAP.put(2.41f, 99f);
+        HIT_VALUE_MAP.put(2.42f, 99f);
+        HIT_VALUE_MAP.put(2.43f, 99f);
+        HIT_VALUE_MAP.put(2.44f, 99f);
+        HIT_VALUE_MAP.put(2.45f, 99f);
+        HIT_VALUE_MAP.put(2.46f, 99f);
+        HIT_VALUE_MAP.put(2.47f, 99f);
+        HIT_VALUE_MAP.put(2.48f, 99f);
+        HIT_VALUE_MAP.put(2.49f, 99f);
+        HIT_VALUE_MAP.put(2.50f, 100f);
+    }
+
+    //Values for health and mana are in terms of the number of seconds it takes to recover 1%
+    //Values for stamina are in terms of the number of seconds it takes to recover 1 point
+    //HEALTH//MANA//STAMINA
+    private static Vector3fImmutable resting = new Vector3fImmutable(3.0f,1.2f,0.5f);
+    private static Vector3fImmutable idling = new Vector3fImmutable(15.0f,6.0f,5.0f);
+    private static Vector3fImmutable walking = new Vector3fImmutable(20.0f,8.0f,0.0f);
+    private static Vector3fImmutable running = new Vector3fImmutable(0.0f,0.0f,0.0f);
+
+    //#Values for how fast mana is consumed.  The first is how fast when player is not in combat
+    //#mode, the second is when he IS in combat mode.  This is in Stamina reduction per second.
+    private static Vector2f consumption = new Vector2f(0.4f,0.65f);
 
     public PlayerCombatStats(PlayerCharacter pc) {
         this.owner = pc;
@@ -39,64 +274,71 @@ public class PlayerCombatStats {
     public void update() {
         try {
             this.calculateATR(true);
+            this.owner.atrHandOne = (int) this.atrHandOne;
         } catch (Exception e) {
-            Logger.error("FAILED TO CALCULATE ATR FOR: " + this.owner.getObjectUUID());
+            //Logger.error("FAILED TO CALCULATE ATR FOR: " + this.owner.getObjectUUID());
         }
         try {
             this.calculateATR(false);
+            this.owner.atrHandTwo = (int) this.atrHandTwo;
         } catch (Exception e) {
-            Logger.error("FAILED TO CALCULATE ATR FOR: " + this.owner.getObjectUUID());
+            //Logger.error("FAILED TO CALCULATE ATR FOR: " + this.owner.getObjectUUID());
         }
         try {
             this.calculateMin(true);
+            this.owner.minDamageHandOne = this.minDamageHandOne;
         } catch (Exception e) {
-            Logger.error("FAILED TO CALCULATE Min FOR: " + this.owner.getObjectUUID());
+            //Logger.error("FAILED TO CALCULATE Min FOR: " + this.owner.getObjectUUID());
         }
         try {
             this.calculateMin(false);
+            this.owner.minDamageHandTwo = this.minDamageHandTwo;
         } catch (Exception e) {
-            Logger.error("FAILED TO CALCULATE Min FOR: " + this.owner.getObjectUUID());
+            //Logger.error("FAILED TO CALCULATE Min FOR: " + this.owner.getObjectUUID());
         }
         try {
             this.calculateMax(true);
+            this.owner.maxDamageHandOne = this.maxDamageHandOne;
         } catch (Exception e) {
-            Logger.error("FAILED TO CALCULATE Max FOR: " + this.owner.getObjectUUID());
+            //Logger.error("FAILED TO CALCULATE Max FOR: " + this.owner.getObjectUUID());
         }
         try {
             this.calculateMax(false);
+            this.owner.maxDamageHandTwo = this.maxDamageHandTwo;
         } catch (Exception e) {
-            Logger.error("FAILED TO CALCULATE Max FOR: " + this.owner.getObjectUUID());
+            //Logger.error("FAILED TO CALCULATE Max FOR: " + this.owner.getObjectUUID());
         }
         try {
             this.calculateAttackSpeed(true);
+            this.owner.speedHandOne = this.attackSpeedHandOne;
         } catch (Exception e) {
-            Logger.error("FAILED TO CALCULATE Attack Speed FOR: " + this.owner.getObjectUUID());
+            //Logger.error("FAILED TO CALCULATE Attack Speed FOR: " + this.owner.getObjectUUID());
         }
         try {
             this.calculateAttackSpeed(false);
+            this.owner.speedHandTwo = this.attackSpeedHandTwo;
         } catch (Exception e) {
-            Logger.error("FAILED TO CALCULATE Attack Speed FOR: " + this.owner.getObjectUUID());
+            //Logger.error("FAILED TO CALCULATE Attack Speed FOR: " + this.owner.getObjectUUID());
         }
         try {
             this.calculateAttackRange(true);
+            this.owner.rangeHandOne = this.rangeHandOne;
         } catch (Exception e) {
-            Logger.error("FAILED TO CALCULATE Attack Range FOR: " + this.owner.getObjectUUID());
+            //Logger.error("FAILED TO CALCULATE Attack Range FOR: " + this.owner.getObjectUUID());
         }
         try {
             this.calculateAttackRange(false);
+            this.owner.rangeHandTwo = this.rangeHandTwo;
         } catch (Exception e) {
-            Logger.error("FAILED TO CALCULATE Attack Range FOR: " + this.owner.getObjectUUID());
-        }
-        try {
-            this.calculateRegen();
-        } catch (Exception e) {
-            Logger.error("FAILED TO CALCULATE Regen FOR: " + this.owner.getObjectUUID());
+            //Logger.error("FAILED TO CALCULATE Attack Range FOR: " + this.owner.getObjectUUID());
         }
         try {
             this.calculateDefense();
+            this.owner.defenseRating = this.defense;
         } catch (Exception e) {
-            Logger.error("FAILED TO CALCULATE Defense FOR: " + this.owner.getObjectUUID());
+            //Logger.error("FAILED TO CALCULATE Defense FOR: " + this.owner.getObjectUUID());
         }
+
     }
 
     public void calculateATR(boolean mainHand) {
@@ -111,7 +353,7 @@ public class PlayerCombatStats {
 
         String skill = "Unarmed Combat";
         String mastery = "Unarmed Combat Mastery";
-        int primaryStat = getDexAfterPenalty(this.owner);
+        int primaryStat = this.owner.statDexCurrent;
         if(weapon != null) {
             skill= weapon.getItemBase().getSkillRequired();
             mastery = weapon.getItemBase().getMastery();
@@ -119,20 +361,27 @@ public class PlayerCombatStats {
                 primaryStat = this.owner.statStrCurrent;
         }
 
+        if(weapon == null)
+            primaryStat = this.owner.statStrCurrent;
+
         float skillLevel = 0;
         float masteryLevel = 0;
 
         if(this.owner.skills.containsKey(skill)) {
-            skillLevel = this.owner.skills.get(skill).getModifiedAmount();
+            skillLevel = this.owner.skills.get(skill).getModifiedAmount();//calculateBuffedSkillLevel(skill,this.owner);//this.owner.skills.get(skill).getTotalSkillPercet();
         }
         if(this.owner.skills.containsKey(mastery))
-            masteryLevel = this.owner.skills.get(mastery).getModifiedAmount();
+            masteryLevel = this.owner.skills.get(mastery).getModifiedAmount();//calculateBuffedSkillLevel(mastery,this.owner);//this.owner.skills.get(mastery).getTotalSkillPercet();
 
         float stanceValue = 0.0f;
         float atrEnchants = 0;
 
         for(String effID : this.owner.effects.keySet()) {
             if (effID.contains("Stance")) {
+                Effect effect = this.owner.effects.get(effID);
+                EffectsBase eb = effect.getEffectsBase();
+                if(eb.getIDString().equals("STC-H-DA"))
+                    continue;
                 for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) {
                     if (mod.modType.equals(Enum.ModType.OCV)) {
                         float percent = mod.getPercentMod();
@@ -144,10 +393,12 @@ public class PlayerCombatStats {
             } else {
                 for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) {
                     if (mod.modType.equals(Enum.ModType.OCV)) {
-                        float value = mod.getMinMod();
-                        int trains = this.owner.effects.get(effID).getTrains();
-                        float modValue = value + (trains * mod.getRamp());
-                        atrEnchants += modValue;
+                        if(mod.getPercentMod() == 0) {
+                            float value = mod.getMinMod();
+                            int trains = this.owner.effects.get(effID).getTrains();
+                            float modValue = value + (trains * mod.getRamp());
+                            atrEnchants += modValue;
+                        }
                     }
                 }
             }
@@ -181,22 +432,26 @@ public class PlayerCombatStats {
                 preciseRune += 0.05f;
         }
 
-        if(weapon != null && weapon.getItemBase().isStrBased()){
-            atr = (((primaryStat / 2) + (skillLevel * 4 + masteryLevel * 3) + prefixValues) * preciseRune + atrEnchants) * (1.0f + stanceValue);
-            atr = (float) Math.round(atr);
-        }else {
-            float dexterity = getDexAfterPenalty(this.owner);
-            atr = dexterity / 2;
+            atr = primaryStat / 2;
             atr += skillLevel * 4;
             atr += masteryLevel * 3;
             atr += prefixValues;
             atr *= preciseRune;
             atr += atrEnchants;
+
             atr *= 1.0f + stanceValue;
-            atr = (float) Math.round(atr);
+        if(this.owner.bonuses != null) {
+            float positivePercentBonuses = this.owner.bonuses.getFloatPercentPositive(Enum.ModType.OCV, Enum.SourceType.None);
+            float negativePercentBonuses = this.owner.bonuses.getFloatPercentNegative(Enum.ModType.OCV, Enum.SourceType.None);
+            float modifier = 1 + (positivePercentBonuses + negativePercentBonuses);
+            if(preciseRune > 1.0f)
+                modifier -= 0.05f;
+            if(stanceValue > 1.0f){
+                modifier -= (stanceValue - 1.0f);
+            }
+            atr *= modifier;
         }
-
-
+            atr = (float) Math.round(atr);
 
         if(mainHand){
             this.atrHandOne = atr;
@@ -209,14 +464,14 @@ public class PlayerCombatStats {
                 this.atrHandTwo = 0.0f;
             }
         }
-    } //perfect DO NOT TOUCH
+    } //PERFECT DO NOT TOUCH
 
     public void calculateMin(boolean mainHand) {
         Item weapon;
         float specialDex = this.owner.statDexBase;
         specialDex += this.owner.bonuses.getFloat(Enum.ModType.Attr, Enum.SourceType.Dexterity);
         float baseDMG = 1;
-        float primaryStat = specialDex;//getDexAfterPenalty(this.owner);
+        float primaryStat = specialDex;
         float secondaryStat = this.owner.statStrCurrent;
         double weaponSkill = 5;
         double weaponMastery = 5;
@@ -235,8 +490,10 @@ public class PlayerCombatStats {
             skill = weapon.getItemBase().getSkillRequired();
             mastery = weapon.getItemBase().getMastery();
             if (weapon.getItemBase().isStrBased()) {
+                //primaryStat = this.owner.statStrCurrent;
+                //secondaryStat = specialDex;//getDexAfterPenalty(this.owner);
                 primaryStat = this.owner.statStrCurrent;
-                secondaryStat = specialDex;//getDexAfterPenalty(this.owner);
+                secondaryStat = this.owner.statDexCurrent;
             }
             for(Effect eff : weapon.effects.values()){
                 for(AbstractEffectModifier mod : eff.getEffectModifiers()){
@@ -248,11 +505,11 @@ public class PlayerCombatStats {
         }
 
         if (this.owner.skills.containsKey(skill)) {
-            weaponSkill = this.owner.skills.get(skill).getTotalSkillPercet();
+            weaponSkill = this.owner.skills.get(skill).getModifiedAmount();
         }
 
         if (this.owner.skills.containsKey(mastery)) {
-            weaponMastery = this.owner.skills.get(mastery).getTotalSkillPercet();
+            weaponMastery = this.owner.skills.get(mastery).getModifiedAmount();
         }
 
         double minDMG = baseDMG * (
@@ -289,13 +546,9 @@ public class PlayerCombatStats {
     }
 
     public void calculateMax(boolean mainHand) {
-        //Weapon Max DMG = BaseDMG * (0.0124*Primary Stat + 0.118*(Primary Stat -0.75)^0.5
-        // + 0.0022*Secondary Stat + 0.028*(Secondary Stat-0.75)^0.5 + 0.0075*(Weapon Skill + Weapon Mastery))
         Item weapon;
-        float specialDex = this.owner.statDexBase;
-        specialDex += this.owner.bonuses.getFloat(Enum.ModType.Attr, Enum.SourceType.Dexterity);
         double baseDMG = 5;
-        float primaryStat = specialDex;//getDexAfterPenalty(this.owner);
+        float primaryStat = this.owner.statDexCurrent;
         float secondaryStat = this.owner.statStrCurrent;
         double weaponSkill = 5;
         double weaponMastery = 5;
@@ -307,6 +560,7 @@ public class PlayerCombatStats {
             weapon = this.owner.charItemManager.getEquipped(2);
         }
 
+        int extraDamage = 3;
         String skill = "Unarmed Combat";
         String mastery = "Unarmed Combat Mastery";
         if (weapon != null) {
@@ -315,7 +569,8 @@ public class PlayerCombatStats {
             mastery = weapon.getItemBase().getMastery();
             if (weapon.getItemBase().isStrBased()) {
                 primaryStat = this.owner.statStrCurrent;
-                secondaryStat = specialDex;//getDexAfterPenalty(this.owner);
+                secondaryStat = this.owner.statDexCurrent;
+                //extraDamage = 3;
             }
             for(Effect eff : weapon.effects.values()){
                 for(AbstractEffectModifier mod : eff.getEffectModifiers()){
@@ -353,7 +608,7 @@ public class PlayerCombatStats {
             }
         }
 
-        int roundedMax = (int)(maxDMG);
+        int roundedMax = (int) (Math.round(maxDMG) + extraDamage);
 
         if(mainHand){
             this.maxDamageHandOne = roundedMax;
@@ -388,9 +643,30 @@ public class PlayerCombatStats {
                         int trains = eff.getTrains();
                         float modValue = percent + (trains * mod.getRamp());
                         speed *= 1 + (modValue * 0.01f);
-                        if(mod.modType.equals(Enum.ModType.AttackDelay)){
-                            delayExtra += modValue * 0.01f;
-                        }
+                    }
+                }
+            }
+        }
+        if(this.owner.charItemManager.getEquipped(1) != null){
+            for(Effect eff : this.owner.charItemManager.getEquipped(1).effects.values()){
+                for(AbstractEffectModifier mod : eff.getEffectModifiers()){
+                    if(mod.modType.equals(Enum.ModType.AttackDelay)){
+                        float percent = mod.getPercentMod();
+                        int trains = eff.getTrains();
+                        float modValue = percent + (trains * mod.getRamp());
+                        delayExtra += modValue * 0.01f;
+                    }
+                }
+            }
+        }
+        if(this.owner.charItemManager.getEquipped(2) != null){
+            for(Effect eff : this.owner.charItemManager.getEquipped(2).effects.values()){
+                for(AbstractEffectModifier mod : eff.getEffectModifiers()){
+                    if(mod.modType.equals(Enum.ModType.AttackDelay)){
+                        float percent = mod.getPercentMod();
+                        int trains = eff.getTrains();
+                        float modValue = percent + (trains * mod.getRamp());
+                        delayExtra += modValue * 0.01f;
                     }
                 }
             }
@@ -463,44 +739,34 @@ public class PlayerCombatStats {
         }
     }
 
-    public void calculateRegen(){
-        if(owner.bonuses != null){
-            this.healthRegen = 1.0f + this.owner.bonuses.getFloatPercentAll(Enum.ModType.HealthRecoverRate, Enum.SourceType.None);
-            this.manaRegen = 1.0f + this.owner.bonuses.getFloatPercentAll(Enum.ModType.ManaRecoverRate, Enum.SourceType.None);
-            this.staminaRegen = 1.0f + this.owner.bonuses.getFloatPercentAll(Enum.ModType.StaminaRecoverRate, Enum.SourceType.None);
-
-        }else{
-            this.healthRegen = 1.0f;
-            this.manaRegen = 1.0f;
-            this.staminaRegen = 1.0f;
-        }
-    }
-
     public void calculateDefense() {
         //Defense = (1+Armor skill / 50) * Armor defense + (1 + Block skill / 100) * Shield defense + (Primary weapon skill / 2)
         // + (Weapon mastery skill/ 2) + Dexterity * 2 + Flat bonuses from rings or cloth
         float armorSkill = 0.0f;
         float armorDefense = 0.0f;
         ArrayList<String> armorsUsed = new ArrayList<>();
+        int itemdef = 0;
         for(Item equipped : this.owner.charItemManager.getEquipped().values()){
             ItemBase ib = equipped.getItemBase();
             if(ib.isHeavyArmor() || ib.isMediumArmor() || ib.isLightArmor() || ib.isClothArmor()){
-                armorDefense += ib.getDefense();
+                itemdef = ib.getDefense();
+
                 for(Effect eff : equipped.effects.values()){
                     for(AbstractEffectModifier mod : eff.getEffectModifiers()){
                         if(mod.modType.equals(Enum.ModType.DR)){
-                            armorDefense += mod.minMod + (mod.getRamp() * eff.getTrains());
+                            itemdef += mod.minMod + (mod.getRamp() * eff.getTrains());
                         }
                     }
                 }
                 if(!ib.isClothArmor() && !armorsUsed.contains(ib.getSkillRequired())) {
                     armorsUsed.add(ib.getSkillRequired());
                 }
+                armorDefense += itemdef;
             }
         }
         for(String armorUsed : armorsUsed){
             if(this.owner.skills.containsKey(armorUsed)) {
-                armorSkill += calculateModifiedSkill(armorUsed,this.owner);
+                armorSkill += this.owner.skills.get(armorUsed).getModifiedAmount();//calculateBuffedSkillLevel(armorUsed,this.owner);
             }
         }
         if(armorsUsed.size() > 0)
@@ -508,7 +774,7 @@ public class PlayerCombatStats {
 
         float blockSkill = 0.0f;
         if(this.owner.skills.containsKey("Block"))
-            blockSkill = calculateModifiedSkill("Block",this.owner);
+            blockSkill = this.owner.skills.get("Block").getModifiedAmount();
 
         float shieldDefense = 0.0f;
         if(this.owner.charItemManager.getEquipped(2) != null && this.owner.charItemManager.getEquipped(2).getItemBase().isShield()){
@@ -540,17 +806,19 @@ public class PlayerCombatStats {
             masteryName = weapon.getItemBase().getMastery();
         }
         if(this.owner.skills.containsKey(skillName))
-            weaponSkill = this.owner.skills.get(skillName).getModifiedAmount();//calculateModifiedSkill(skillName,this.owner);//this.owner.skills.get(skillName).getModifiedAmount();
+            weaponSkill = this.owner.skills.get(skillName).getModifiedAmount();//calculateBuffedSkillLevel(skillName,this.owner);//this.owner.skills.get(skillName).getModifiedAmount();//calculateModifiedSkill(skillName,this.owner);//this.owner.skills.get(skillName).getModifiedAmount();
 
         if(this.owner.skills.containsKey(masteryName))
-            masterySkill = this.owner.skills.get(masteryName).getModifiedAmount();//calculateModifiedSkill(masteryName,this.owner);//this.owner.skills.get(masteryName).getModifiedAmount();
+            masterySkill = this.owner.skills.get(masteryName).getModifiedAmount();//calculateBuffedSkillLevel(masteryName,this.owner);//this.owner.skills.get(masteryName).getModifiedAmount();//calculateModifiedSkill(masteryName,this.owner);//this.owner.skills.get(masteryName).getModifiedAmount();
 
-        float dexterity = getDexAfterPenalty(this.owner);
+        float dexterity = this.owner.statDexCurrent;//getDexAfterPenalty(this.owner);
 
         float luckyRune = 1.0f;
         for(CharacterRune rune : this.owner.runes){
-            if(rune.getRuneBase().getName().equals("Lucky"))
+            if(rune.getRuneBase().getName().equals("Lucky")) {
                 luckyRune += 0.05f;
+                break;
+            }
         }
 
         float flatBonuses = 0.0f;
@@ -568,10 +836,12 @@ public class PlayerCombatStats {
             } else {
                 for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) {
                     if (mod.modType.equals(Enum.ModType.DCV)) {
-                        float value = mod.getMinMod();
-                        int trains = this.owner.effects.get(effID).getTrains();
-                        float modValue = value + (trains * mod.getRamp());
-                        flatBonuses += modValue;
+                        if(mod.getPercentMod() == 0) {
+                            float value = mod.getMinMod();
+                            int trains = this.owner.effects.get(effID).getTrains();
+                            float modValue = value + (trains * mod.getRamp());
+                            flatBonuses += modValue;
+                        }
                     }
                 }
             }
@@ -581,16 +851,7 @@ public class PlayerCombatStats {
         else if(this.owner.charItemManager != null && this.owner.charItemManager.getEquipped(2) != null && !this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
             blockSkill = 0;
 
-        //Defense = (1+Armor skill / 50) * Armor defense + (1 + Block skill / 100) * Shield defense
-        // + (Primary weapon skill / 2) + (Weapon mastery skill/ 2) + ROUND((Dexterity-Dex penalty),0) * 2 + Flat bonuses from rings or cloth
-        float defense = 0;
-        for(Item equipped : this.owner.charItemManager.getEquippedList()){
-            ItemBase ib = equipped.getItemBase();
-            if(ib.getType().equals(Enum.ItemType.ARMOR) && !ib.isShield()){
-                defense += getArmorDefense(equipped,this.owner);
-            }
-        }
-        //float defense = (1 + armorSkill / 50) * armorDefense;
+        float defense = (1 + armorSkill / 50) * armorDefense;
         defense += (1 + blockSkill / 100) * shieldDefense;
         defense += (weaponSkill / 2);
         defense += (masterySkill / 2);
@@ -599,154 +860,31 @@ public class PlayerCombatStats {
         defense *= luckyRune;
         defense *= stanceMod;
 
+        if(this.owner.bonuses != null) {
+            float positivePercentBonuses = this.owner.bonuses.getFloatPercentPositive(Enum.ModType.DCV, Enum.SourceType.None);
+            float negativePercentBonuses = this.owner.bonuses.getFloatPercentNegative(Enum.ModType.DCV, Enum.SourceType.None);
+            float modifier = 1 + (positivePercentBonuses + negativePercentBonuses - (luckyRune - 1.0f) - (stanceMod - 1.0f));
+            defense *= modifier;
+        }
         defense = Math.round(defense);
 
         this.defense = (int) defense;
+    } // PERFECT DO NOT TOUCH
+
+    public static float getHitChance(int atr,int def){
+        if(atr == 0)
+            return 0.0f;
+        if(def == 0)
+            return 100.0f;
+
+        float key = (float)((float)atr / def);
+        BigDecimal bd = new BigDecimal(key).setScale(2, RoundingMode.HALF_UP);
+        key = bd.floatValue(); // handles rounding for mandatory 2 decimal places
+        if(key < 0.40f)
+            return 0.0f;
+        if(key > 2.50f)
+            return 100.0f;
+        return HIT_VALUE_MAP.get(key);
     }
 
-    public static float calculateModifiedSkill(String skillName, PlayerCharacter pc) {
-
-        CharacterSkill skill = null;
-        if (pc.skills.containsKey(skillName)) {
-            skill = pc.skills.get(skillName);
-        }
-        SkillsBase skillBase = skill.getSkillsBase();
-        if(skillBase == null)
-            return 0;
-
-        //Get any rune bonus
-        float bonus = 0f;
-        if (pc.getBonuses() != null) {
-            //Get bonuses from runes
-            bonus = pc.getBonuses().getSkillBonus(skillBase.sourceType);
-        }
-
-        //Get Base skill for modified stats
-        float base = 7f;
-        if(skillBase.getToken() == -660435875){
-            base = 0;
-        }
-        float statMod = 0.5f;
-        if (skillBase.getStrMod() > 0)
-            statMod += (float) skillBase.getStrMod() * (float) pc.getStatStrCurrent() / 100f;
-        if (skillBase.getDexMod() > 0)
-            statMod += (float) skillBase.getDexMod() * (float) getDexAfterPenalty(pc) / 100f;
-        if (skillBase.getConMod() > 0)
-            statMod += (float) skillBase.getConMod() * (float) pc.getStatConCurrent() / 100f;
-        if (skillBase.getIntMod() > 0)
-            statMod += (float) skillBase.getIntMod() * (float) pc.getStatIntCurrent() / 100f;
-        if (skillBase.getSpiMod() > 0)
-            statMod += (float) skillBase.getSpiMod() * (float) pc.getStatSpiCurrent() / 100f;
-
-        if (statMod < 1)
-            statMod = 1f;
-
-        if(skillBase.getToken() == -660435875){
-            statMod = 0;
-        }
-        base += CharacterSkill.baseSkillValues[(int) statMod];
-        Enum.SourceType sourceType = Enum.SourceType.GetSourceType(skillBase.getNameNoSpace());
-
-        //Get any rune, effect and item bonus
-
-        if (pc.getBonuses() != null) {
-            //add bonuses from effects/items and runes
-            base += bonus + pc.getBonuses().getFloat(Enum.ModType.Skill, sourceType);
-        }
-        float baseAmount;
-        if (base < 1f && skillBase.getToken() != -660435875)
-            baseAmount = 1f;
-        else
-            baseAmount = base;
-
-        int amount;
-
-        int trains = skill.getNumTrains();
-        if (trains < 10)
-            amount = (trains * 2);
-        else if (trains < 90)
-            amount = 10 + trains;
-        else if (trains < 134)
-            amount = 100 + ((trains - 90) / 2);
-        else
-            amount = 122 + ((trains - 134) / 3);
-
-        float modAmount = baseAmount + amount;
-
-        if (pc.getBonuses() != null) {
-            //Multiply any percent bonuses
-            modAmount *= (1 + pc.getBonuses().getFloatPercentAll(Enum.ModType.Skill, sourceType));
-        }
-
-        float modifiedAmount = (float) Math.round(modAmount);
-
-        return modifiedAmount;
-    }
-
-    public static int getDexAfterPenalty(PlayerCharacter pc){
-        if(pc.charItemManager == null)
-            return pc.statDexCurrent;
-
-        float dex = pc.statDexBase;
-        if(pc.bonuses != null)
-            dex += pc.bonuses.getFloat(Enum.ModType.Attr, Enum.SourceType.Dexterity);
-
-        float penaltyFactor = 0.0f;
-        for(Item equipped : pc.charItemManager.getEquipped().values()){
-            ItemBase ib = equipped.getItemBase();
-            if(ib.isHeavyArmor() || ib.isLightArmor() || ib.isMediumArmor()){
-                penaltyFactor += ib.dexReduction;
-            }
-        }
-
-        if(penaltyFactor > 0)
-            penaltyFactor *= 0.01f;
-
-        float totalPenalty = dex *  penaltyFactor;
-        float returnedDex = Math.round(dex - totalPenalty);
-        return (int) returnedDex;
-
-    }
-
-    private static float getArmorDefense(Item armor, PlayerCharacter pc) {
-
-        if (armor == null)
-            return 0;
-
-        ItemBase ib = armor.getItemBase();
-
-        if (ib == null)
-            return 0;
-
-        if (!ib.getType().equals(Enum.ItemType.ARMOR))
-            return 0;
-
-        if (ib.getSkillRequired().isEmpty())
-            return ib.getDefense();
-
-        CharacterSkill armorSkill = pc.skills.get(ib.getSkillRequired());
-        if (armorSkill == null) {
-            Logger.error("Player " + pc.getObjectUUID()
-                    + " has armor equipped without the nescessary skill to equip it");
-            return ib.getDefense();
-        }
-
-        float def = ib.getDefense();
-        //apply item defense bonuses
-        if (armor != null) {
-
-            for(Effect eff : armor.effects.values()){
-                for(AbstractEffectModifier mod : eff.getEffectModifiers()){
-                    if(mod.modType.equals(Enum.ModType.DR)){
-                        def += mod.minMod * (1+(eff.getTrains() * mod.getRamp()));
-                    }
-                }
-            }
-
-
-            //def += armor.getBonus(ModType.DR, SourceType.None);
-            //def *= (1 + armor.getBonusPercent(ModType.DR, SourceType.None));
-        }
-        return (def * (1 + ((int) armorSkill.getModifiedAmount() / 50f)));
-    }
 }

src/engine/objects/Resists.java

@@ -125,7 +125,7 @@ public class Resists {
     }
 
     //Handle Fortitudes
-    private static float handleFortitude(AbstractCharacter target, DamageType type, float damage) {
+    public static float handleFortitude(AbstractCharacter target, DamageType type, float damage) {
         if (target == null || !(target.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)))
             return damage;
         PlayerBonuses bonus = target.getBonuses();
@@ -456,10 +456,11 @@ public class Resists {
         //handle fortitudes
         //damage = handleFortitude(target, type, damage);
         //calculate armor piercing
-        float ap = source.getBonuses().getFloatPercentAll(ModType.ArmorPiercing, SourceType.None);
-        float damageAfterResists = damage;
-        if(type.equals(DamageType.Pierce) || type.equals(DamageType.Crush) || type.equals(DamageType.Slash))
-            damageAfterResists = damage * (1 - (this.getResist(type, trains) * 0.01f) + ap);
+        //float ap = 0;
+        //if(type.equals(DamageType.Pierce) || type.equals(DamageType.Crush) || type.equals(DamageType.Slash))
+            //source.getBonuses().getFloatPercentAll(ModType.ArmorPiercing, SourceType.None);
+
+        float damageAfterResists = damage * (1 - (this.getResist(type, trains) * 0.01f));
         //check to see if any damage absorbers should cancel
         if (target != null) {
             //debug damage shields if any found

src/engine/powers/effectmodifiers/HealthEffectModifier.java

@@ -303,9 +303,9 @@ public class HealthEffectModifier extends AbstractEffectModifier {
 
         // calculate resists in if any
         if (resists != null) {
-            if (AbstractWorldObject.IsAbstractCharacter(awo))
+            if (AbstractWorldObject.IsAbstractCharacter(awo)) {
                 damage = resists.getResistedDamage(source, (AbstractCharacter) awo, damageType, damage * -1, trains) * -1;
-            else
+            }else
                 damage = resists.getResistedDamage(source, null, damageType, damage * -1, trains) * -1;
         }
 

src/engine/server/world/WorldServer.java

@@ -164,7 +164,17 @@ public class WorldServer {
 			long uptimeSeconds = Math.abs(uptimeDuration.getSeconds());
 			String uptime = String.format("%d hours %02d minutes %02d seconds", uptimeSeconds / 3600, (uptimeSeconds % 3600) / 60, (uptimeSeconds % 60));
 			outString += "uptime: " + uptime;
-			outString += " pop: " + SessionManager.getActivePlayerCharacterCount() + " max pop: " + SessionManager._maxPopulation;
+			int activePop = 0;
+			int boxedPop = 0;
+			for(PlayerCharacter pc : SessionManager.getAllActivePlayerCharacters()){
+				if(pc.isBoxed){
+					boxedPop ++;
+				}else{
+					activePop ++;
+				}
+			}
+			//outString += " pop: " + SessionManager.getActivePlayerCharacterCount() + " max pop: " + SessionManager._maxPopulation;
+			outString += "Active Players: " + activePop + " Boxed Players: " + boxedPop;
 		} catch (Exception e) {
 			Logger.error("Failed to build string");
 		}
@@ -517,7 +527,7 @@ public class WorldServer {
 		Logger.info("Starting Bane Thread");
 		BaneThread.startBaneThread();
 
-		Logger.info("Starting Player Regen Thread");
+		Logger.info("Starting Player Update Thread");
 		UpdateThread.startUpdateThread();
 
 

src/engine/util/KeyCloneAudit.java

@@ -2,13 +2,39 @@ package engine.util;
 
 import engine.gameManager.ConfigManager;
 import engine.gameManager.DbManager;
+import engine.gameManager.GroupManager;
+import engine.gameManager.SessionManager;
+import engine.net.client.ClientConnection;
+import engine.net.client.Protocol;
+import engine.net.client.msg.ClientNetMsg;
+import engine.net.client.msg.TargetObjectMsg;
 import engine.objects.Group;
 import engine.objects.PlayerCharacter;
+import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
 public enum KeyCloneAudit {
     KEYCLONEAUDIT;
 
+    public static boolean auditChatMsg(PlayerCharacter pc, String message) {
+
+        if(pc.combatTarget != null && message.contains(String.valueOf(pc.combatTarget.getObjectUUID()))) {
+            //targeting software detected
+
+            Group g = GroupManager.getGroup(pc);
+
+            if (g == null)
+                pc.getClientConnection().forceDisconnect();
+             else
+                for (PlayerCharacter member : g.members)
+                    member.getClientConnection().forceDisconnect();
+
+            return true;
+        }
+
+        return false;
+    }
+
     public void audit(PlayerCharacter player, Group group) {
 
         int machineCount = 0;
@@ -27,4 +53,38 @@ public enum KeyCloneAudit {
         }
 
     }
+
+    public static void auditTargetMsg(ClientNetMsg msg) {
+        try {
+            TargetObjectMsg tarMsg = (TargetObjectMsg) msg;
+            ClientConnection origin = (ClientConnection) msg.getOrigin();
+            long now = System.currentTimeMillis();
+
+            if (tarMsg.getTargetType() != MBServerStatics.MASK_PLAYER)
+                return;
+
+            if (System.currentTimeMillis() > origin.finalStrikeRefresh) {
+                origin.lastStrike = System.currentTimeMillis();
+                origin.strikes = 0;
+                origin.finalStrikes = 0;
+                origin.finalStrikeRefresh = System.currentTimeMillis();
+            }
+            // Calculate time since last target switch
+            long timeSinceLastTarget = now - origin.lastTargetSwitchTime;
+            origin.lastTargetSwitchTime = now;
+            if (timeSinceLastTarget < 150) {
+                origin.strikes++;
+                origin.finalStrikeRefresh = System.currentTimeMillis() + 1000L;
+            }
+            if (origin.strikes > 20) {
+                origin.finalStrikes++;
+            }
+            if (origin.finalStrikes > 3) {origin.forceDisconnect();
+                DbManager.AccountQueries.SET_TRASH(origin.machineID);
+            }
+        } catch (Exception e) {
+
+        }
+    }
+
 }

src/engine/workthreads/UpdateThread.java

@@ -32,18 +32,7 @@ public class UpdateThread implements Runnable {
         try {
             for(PlayerCharacter player : SessionManager.getAllActivePlayerCharacters()){
                 if (player != null) {
-                    player.doRegen();
-                    try {
-                        if (player.isAlive() && player.isActive() && player.isEnteredWorld()) {
-                            if (player.combatStats == null) {
-                                player.combatStats = new PlayerCombatStats(player);
-                            }
-                            PlayerCombatStats cStats = player.combatStats;
-                            cStats.update();
-                        }
-                    }catch(Exception e){
-
-                    }
+                    player.update(true);
                 }
             }
         } catch (Exception e) {
@@ -56,16 +45,11 @@ public class UpdateThread implements Runnable {
     public void run() {
         lastRun = System.currentTimeMillis();
         while (true) {
-            if (System.currentTimeMillis() >= lastRun + instancedelay) { // Correct condition
+            try {
                 this.processPlayerUpdate();
-                lastRun = System.currentTimeMillis(); // Update lastRun after processing
-            }else {
-                try {
-                    Thread.sleep(100); // Pause for 10ms to reduce CPU usage
-                } catch (InterruptedException e) {
-                    Logger.error("Thread interrupted", e);
-                    Thread.currentThread().interrupt();
-                }
+                Thread.sleep(100); // Pause for 100ms to reduce CPU usage
+            } catch (InterruptedException e) {
+                Logger.error("Thread interrupted", e);
             }
         }
     }