AI branches initial commit

src/engine/Dungeons/Dungeon.java

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

src/engine/Dungeons/DungeonManager.java

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

src/engine/Enum.java

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

src/engine/InterestManagement/InterestManager.java

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

src/engine/ZergMehcanics/MineAntiZerg.java

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

src/engine/db/handlers/dbAccountHandler.java

@@ -13,13 +13,14 @@ import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.gameManager.ConfigManager;
 import engine.gameManager.DbManager;
-import engine.net.DispatchMessage;
-import engine.net.client.msg.chat.ChatSystemMsg;
 import engine.objects.Account;
 import engine.objects.PlayerCharacter;
 import org.pmw.tinylog.Logger;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.ArrayList;
 
 public class dbAccountHandler extends dbHandlerBase {
@@ -76,24 +77,18 @@ public class dbAccountHandler extends dbHandlerBase {
         }
     }
 
-    public void SET_TRASH(String machineID, String type) {
+    public void SET_TRASH(String machineID) {
+
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement(
-                     "INSERT INTO dyn_trash(`machineID`, `count`, `type`)"
-                             + " VALUES (?, 1, ?) ON DUPLICATE KEY UPDATE `count` = `count` + 1;")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO dyn_trash(`machineID`, `count`)"
+                     + " VALUES (?, 1) ON DUPLICATE KEY UPDATE `count` = `count` + 1;")) {
 
             preparedStatement.setString(1, machineID);
-            preparedStatement.setString(2, type);
             preparedStatement.execute();
 
         } catch (SQLException e) {
             Logger.error(e);
         }
-
-        ChatSystemMsg chatMsg = new ChatSystemMsg(null, "Account: " + machineID + " has been kicked from game for cheating");
-        chatMsg.setMessageType(10);
-        chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
-        DispatchMessage.dispatchMsgToAll(chatMsg);
     }
 
     public ArrayList<String> GET_TRASH_LIST() {
@@ -275,21 +270,4 @@ public class dbAccountHandler extends dbHandlerBase {
         }
     }
 
-    public void TRASH_CHEATERS() {
-        try (Connection connection = DbManager.getConnection();
-             CallableStatement callableStatement = connection.prepareCall("{CALL BanAccountsWithMachineID()}")) {
-
-            boolean hasResultSet = callableStatement.execute();
-
-            if (!hasResultSet && callableStatement.getUpdateCount() > 0) {
-                Logger.info("TRASHED CHEATERS");
-            } else {
-                Logger.warn("No cheaters to trash.");
-            }
-
-        } catch (SQLException e) {
-            Logger.error("Error trashing cheaters: ", e);
-        }
-    }
-
 }

src/engine/devcmd/cmds/DungenonCmd.java

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

src/engine/devcmd/cmds/InfoCmd.java

@@ -335,18 +335,15 @@ public class InfoCmd extends AbstractDevCmd {
                 output += "Movement State: " + targetPC.getMovementState().name();
                 output += newline;
                 output += "Movement Speed: " + targetPC.getSpeed();
-                output += newline;
+
                 output += "Altitude : " + targetPC.getLoc().y;
-                output += newline;
+
                 output += "Swimming : " + targetPC.isSwimming();
                 output += newline;
                 output += "isMoving : " + targetPC.isMoving();
                 output += newline;
-                output += "Zerg Multiplier : " + targetPC.ZergMultiplier + newline;
-                output += "Hidden : " + targetPC.getHidden() + newline;
-                output += "Target Loc: " + targetPC.loc + newline;
-                output += "Player Loc: " + pc.loc + newline;
-                output += "Distance Squared: " + pc.loc.distanceSquared(targetPC.loc);
+                output += "Zerg Multiplier : " + targetPC.ZergMultiplier+ newline;
+                output += "Hidden : " + targetPC.getHidden();
                 break;
 
             case NPC:

src/engine/devcmd/cmds/PrintStatsCmd.java

@@ -11,7 +11,6 @@ package engine.devcmd.cmds;
 
 import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.PowersManager;
 import engine.objects.*;
 
 import java.util.HashMap;
@@ -87,12 +86,6 @@ public class PrintStatsCmd extends AbstractDevCmd {
         newOut += "MAX: " + tar.combatStats.maxDamageHandTwo + newline;
         newOut += "RANGE: " + tar.combatStats.rangeHandTwo + newline;
         newOut += "ATTACK SPEED: " + tar.combatStats.attackSpeedHandTwo + newline;
-        newOut += "=== POWERS ===" + newline;
-        for(CharacterPower power : pc.getPowers().values()){
-            if(power.getPower().requiresHitRoll) {
-                newOut += power.getPower().name + " ATR: " + Math.round(PlayerCombatStats.getSpellAtr(pc,power.getPower())) + newline;
-            }
-        }
         throwbackInfo(pc, newOut);
     }
 

src/engine/gameManager/ChatManager.java

@@ -27,7 +27,6 @@ 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;
@@ -85,10 +84,6 @@ public enum ChatManager {
         if ((checkTime > 0L) && (curMsgTime - checkTime < FLOOD_TIME_THRESHOLD))
             isFlood = true;
 
-        if(KeyCloneAudit.auditChatMsg(pc,msg.getMessage())){
-            return;
-        }
-
         switch (protocolMsg) {
             case CHATSAY:
                 ChatManager.chatSay(pc, msg.getMessage(), isFlood);

src/engine/gameManager/CombatManager.java

@@ -26,6 +26,7 @@ import engine.powers.effectmodifiers.WeaponProcEffectModifier;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
+import java.util.HashSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
 
@@ -300,20 +301,6 @@ public enum CombatManager {
             if (target == null)
                 return 0;
 
-            //pet to assist in attacking target
-            if(abstractCharacter.getObjectType().equals(GameObjectType.PlayerCharacter)){
-                PlayerCharacter attacker = (PlayerCharacter)abstractCharacter;
-                if(attacker.combatStats == null){
-                    attacker.combatStats = new PlayerCombatStats(attacker);
-                }
-                if(attacker.getPet() != null){
-                    Mob pet = attacker.getPet();
-                    if(pet.combatTarget == null && pet.assist)
-                        pet.setCombatTarget(attacker.combatTarget);
-                }
-            }
-
-
             //target must be valid type
 
             if (AbstractWorldObject.IsAbstractCharacter(target)) {
@@ -329,13 +316,10 @@ public enum CombatManager {
                 else if (!tar.isActive())
                     return 0;
 
-                if (target.getObjectType().equals(GameObjectType.PlayerCharacter) && abstractCharacter.getObjectType().equals(GameObjectType.PlayerCharacter) && abstractCharacter.getTimers().get("Attack" + slot) == null) {
-                    if(((PlayerCharacter)target).combatStats == null){
-                        ((PlayerCharacter)target).combatStats = new PlayerCombatStats(((PlayerCharacter)target));
-                    }
+                if (target.getObjectType().equals(GameObjectType.PlayerCharacter) && abstractCharacter.getObjectType().equals(GameObjectType.PlayerCharacter) && abstractCharacter.getTimers().get("Attack" + slot) == null)
                     if (!((PlayerCharacter) abstractCharacter).canSee((PlayerCharacter) target))
                         return 0;
-                }
+
                 //must not be immune to all or immune to attack
 
                 Resists res = tar.getResists();
@@ -468,17 +452,6 @@ public enum CombatManager {
 
             //Range check.
 
-            if(abstractCharacter.isMoving()){
-                range += (abstractCharacter.getSpeed() * 0.1f);
-            }
-
-            if(AbstractWorldObject.IsAbstractCharacter(target)) {
-                AbstractCharacter tarAc = (AbstractCharacter) target;
-                if(tarAc != null && tarAc.isMoving()){
-                    range += (tarAc.getSpeed() * 0.1f);
-                }
-            }
-
             if (NotInRange(abstractCharacter, target, range)) {
 
                 //target is in stealth and can't be seen by source
@@ -571,12 +544,8 @@ public enum CombatManager {
 
             if (target == null)
                 return;
-
             if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
                 PlayerCharacter pc = (PlayerCharacter) ac;
-                if( pc.combatStats == null){
-                    pc.combatStats = new PlayerCombatStats(pc);
-                }
                 pc.combatStats.calculateATR(true);
                 pc.combatStats.calculateATR(false);
                 if (mainHand) {
@@ -692,9 +661,6 @@ public enum CombatManager {
             } else {
                 AbstractCharacter tar = (AbstractCharacter) target;
                 if(tar.getObjectType().equals(GameObjectType.PlayerCharacter)){
-                    if(((PlayerCharacter)tar).combatStats == null){
-                        ((PlayerCharacter)tar).combatStats = new PlayerCombatStats((PlayerCharacter)tar);
-                    }
                     ((PlayerCharacter)tar).combatStats.calculateDefense();
                     defense = ((PlayerCharacter)tar).combatStats.defense;
                 }else {
@@ -753,18 +719,6 @@ public enum CombatManager {
 
                         PlayerBonuses bonus = ac.getBonuses();
                         float attackRange = getWeaponRange(wb, bonus);
-
-                        if(ac.isMoving()){
-                            attackRange += (ac.getSpeed() * 0.1f);
-                        }
-
-                        if(AbstractWorldObject.IsAbstractCharacter(target)) {
-                            //AbstractCharacter tarAc = (AbstractCharacter) target;
-                            if(tarAc != null && tarAc.isMoving()){
-                                attackRange += (tarAc.getSpeed() * 0.1f);
-                            }
-                        }
-
                         if(specialCaseHitRoll(dpj.getPowerToken())) {
                             if(hitLanded) {
                                 dpj.attack(target, attackRange);
@@ -786,18 +740,6 @@ public enum CombatManager {
 
                     if (dpj != null && dpj.getPower() != null && (dpj.getPowerToken() == -1851459567 || dpj.getPowerToken() == -1851489518)) {
                         float attackRange = getWeaponRange(wb, bonuses);
-
-                        if(ac.isMoving()){
-                            attackRange += (ac.getSpeed() * 0.1f);
-                        }
-
-                        if(AbstractWorldObject.IsAbstractCharacter(target)) {
-                            //AbstractCharacter tarAc = (AbstractCharacter) target;
-                            if(tarAc != null && tarAc.isMoving()){
-                                attackRange += (tarAc.getSpeed() * 0.1f);
-                            }
-                        }
-
                         if(specialCaseHitRoll(dpj.getPowerToken())) {
                             if(hitLanded) {
                                 dpj.attack(target, attackRange);
@@ -916,12 +858,12 @@ public enum CombatManager {
                     for(Effect eff : weapon.effects.values()){
                         for(AbstractEffectModifier mod : eff.getEffectModifiers()){
                             if(mod.modType.equals(ModType.ArmorPiercing)){
-                                armorPierce += mod.getPercentMod() + (mod.getRamp() * eff.getTrains());
+                                armorPierce += mod.minMod * (mod.getRamp() * eff.getTrains());
                             }
                         }
                     }
                     if(armorPierce > 0){
-                        damage *= 1 + (armorPierce * 0.01f);
+                        damage *= 1 - armorPierce;
                     }
                 }
 
@@ -946,8 +888,6 @@ public enum CombatManager {
                     if (tarAc.getHealth() > 0)
                         d = tarAc.modifyHealth(-damage, ac, false);
 
-                    tarAc.cancelOnTakeDamage();
-
                 } else if (target.getObjectType().equals(GameObjectType.Building)) {
 
                     if (BuildingManager.getBuildingFromCache(target.getObjectUUID()) == null) {
@@ -1006,16 +946,6 @@ public enum CombatManager {
                 if (ac.isAlive() && tarAc != null && tarAc.isAlive())
                     handleDamageShields(ac, tarAc, damage);
 
-                //handle mob hate values
-                if(target.getObjectType().equals(GameObjectType.Mob) && ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
-                    Mob mobTarget = (Mob)target;
-                    if(mobTarget.hate_values.containsKey((PlayerCharacter) ac)){
-                        mobTarget.hate_values.put((PlayerCharacter) ac,mobTarget.hate_values.get((PlayerCharacter) ac) + damage);
-                    }else{
-                        mobTarget.hate_values.put((PlayerCharacter) ac, damage);
-                    }
-                }
-
             } else {
 
                 // Apply Weapon power effect if any.
@@ -1031,19 +961,6 @@ public enum CombatManager {
                         if (wp.requiresHitRoll() == false) {
                             PlayerBonuses bonus = ac.getBonuses();
                             float attackRange = getWeaponRange(wb, bonus);
-
-                            if(ac.isMoving()){
-                                attackRange += (ac.getSpeed() * 0.1f);
-                            }
-
-                            if(AbstractWorldObject.IsAbstractCharacter(target)) {
-                                AbstractCharacter tarAc = (AbstractCharacter) target;
-                                if(tarAc != null && tarAc.isMoving()){
-                                    attackRange += (tarAc.getSpeed() * 0.1f);
-                                }
-                            }
-
-
                             if(specialCaseHitRoll(dpj.getPowerToken())) {
                                 if(hitLanded) {
                                     dpj.attack(target, attackRange);
@@ -1099,12 +1016,6 @@ public enum CombatManager {
         Item tarMain = tarItem.getItemFromEquipped(1);
         Item tarOff = tarItem.getItemFromEquipped(2);
 
-        if(target.getObjectType().equals(GameObjectType.PlayerCharacter)){
-            PlayerCharacter pc = (PlayerCharacter) target;
-            if(pc.getRaceID() == 1999 && !isRanged(acMain) && !isRanged(acOff))
-                return true;
-        }
-
         return !isRanged(acMain) && !isRanged(acOff) && !isRanged(tarMain) && !isRanged(tarOff);
     }
 

src/engine/gameManager/CombatSystem.java

@@ -1,430 +0,0 @@
-package engine.gameManager;
-
-import engine.Enum;
-import engine.exception.MsgSendException;
-import engine.job.JobContainer;
-import engine.job.JobScheduler;
-import engine.jobs.AttackJob;
-import engine.jobs.DeferredPowerJob;
-import engine.net.DispatchMessage;
-import engine.net.client.ClientConnection;
-import engine.net.client.msg.AttackCmdMsg;
-import engine.net.client.msg.TargetedActionMsg;
-import engine.objects.*;
-import engine.powers.DamageShield;
-import engine.powers.effectmodifiers.AbstractEffectModifier;
-import engine.powers.effectmodifiers.WeaponProcEffectModifier;
-import engine.server.MBServerStatics;
-import org.pmw.tinylog.Logger;
-
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ThreadLocalRandom;
-
-public class CombatSystem {
-
-    public static void attemptCombat(AbstractCharacter source, AbstractWorldObject target, boolean mainhand){
-
-        //1. source or target doesn't exist, early exit
-        if(source == null || target == null)
-            return;
-
-        //2. source or target is dead, early exit
-        if(!source.isAlive() || !target.isAlive())
-            return;
-
-        //3. make sure if target is a building to ensure that it is damageable
-        if(target.getObjectType().equals(Enum.GameObjectType.Building)){
-            Building building = (Building)target;
-            if(building.assetIsProtected() || building.getProtectionState().equals(Enum.ProtectionState.NPC))
-                return;
-        }
-
-        //after thought: make sure target is in range of source
-        if(!inRange(source,target,mainhand))
-            return;
-
-        //4. apply any weapon powers and then clear the weapon power memory for the player
-        if (source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
-            PlayerCharacter pc = (PlayerCharacter)source;
-            if(pc.getWeaponPower() != null){
-                pc.getWeaponPower().attack(target,pc.getRange());
-                pc.setWeaponPower(null);
-            }
-        }
-
-        //5. make sure if target is AbstractCharacter to check for defense trigger and passive trigger
-        if(AbstractCharacter.IsAbstractCharacter(target)) {
-            int atr;
-            int def;
-            if (source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
-                PlayerCharacter pc = (PlayerCharacter)source;
-                if(pc.combatStats == null)
-                    pc.combatStats = new PlayerCombatStats(pc);
-                atr = (int) pc.combatStats.atrHandOne;
-                if(!mainhand)
-                    atr =(int) pc.combatStats.atrHandTwo;
-
-                def = pc.combatStats.defense;
-            } else {
-                atr = (int) ((source.getAtrHandOne() + source.getAtrHandTwo()) * 0.5f);
-                def = source.defenseRating;
-            }
-
-            if(!LandHit(atr,def)) {
-                createTimer(source,mainhand);
-                return;
-            }
-
-            if(source.getBonuses() != null)
-                if(!source.getBonuses().getBool(Enum.ModType.IgnorePassiveDefense, Enum.SourceType.None))
-                    if(triggerPassive(source,target)) {
-                        createTimer(source,mainhand);
-                        return;
-                    }
-        }
-
-        //commence actual combat management
-
-        //6. check for any procs
-        if (source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
-            PlayerCharacter pc = (PlayerCharacter)source;
-            if(pc.getCharItemManager() != null && pc.getCharItemManager().getEquipped() != null){
-                Item weapon = pc.getCharItemManager().getEquipped(1);
-                if(!mainhand)
-                    weapon = pc.getCharItemManager().getEquipped(2);
-                if(weapon != null){
-                    if(weapon.effects != null){
-                        for (Effect eff : weapon.effects.values()){
-                            for(AbstractEffectModifier mod : eff.getEffectModifiers()){
-                                if(mod.modType.equals(Enum.ModType.WeaponProc)){
-                                    int procChance = ThreadLocalRandom.current().nextInt(0,101);
-                                    if (procChance <= MBServerStatics.PROC_CHANCE) {
-                                        try {
-                                            ((WeaponProcEffectModifier) mod).applyProc(source, target);
-                                        }catch(Exception e){
-                                            Logger.error(eff.getName() + " Failed To Cast Proc");
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        //7. configure damage amounts and type
-        Enum.DamageType damageType = Enum.DamageType.Crush;
-        int min = 0;
-        int max = 0;
-        if (source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
-            PlayerCharacter pc = (PlayerCharacter) source;
-            if(mainhand){
-                min = pc.combatStats.minDamageHandOne;
-                max = pc.combatStats.maxDamageHandOne;
-            }else{
-                min = pc.combatStats.minDamageHandTwo;
-                max = pc.combatStats.maxDamageHandTwo;
-            }
-        }else if (source.getObjectType().equals(Enum.GameObjectType.Mob)) {
-            Mob mob = (Mob) source;
-            min = (int) mob.mobBase.getDamageMin();
-            max = (int) mob.mobBase.getDamageMax();
-        }
-
-        int damage = ThreadLocalRandom.current().nextInt(min,max + 1);
-
-        if(source.getBonuses() != null){
-            damage *= 1 + source.getBonuses().getFloatPercentAll(Enum.ModType.MeleeDamageModifier, Enum.SourceType.None);
-        }
-        if (source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
-            PlayerCharacter pc = (PlayerCharacter) source;
-            damage *= pc.ZergMultiplier;
-        }
-
-        //8. configure the attack message to be sent to the clients
-        int animation = 0;
-        ItemBase wb = null;
-        if(source.getCharItemManager() != null && source.getCharItemManager().getEquipped() != null) {
-            Item weapon = source.getCharItemManager().getEquipped(1);
-            if (!mainhand)
-                weapon = source.getCharItemManager().getEquipped(2);
-
-            if(weapon != null && weapon.getItemBase().getAnimations() != null && !weapon.getItemBase().getAnimations().isEmpty()){
-                animation = weapon.getItemBase().getAnimations().get(0);
-                wb = weapon.getItemBase();
-                damageType = wb.getDamageType();
-            }
-        }
-
-        //9. reduce damage from resists and apply damage shields
-        if(AbstractCharacter.IsAbstractCharacter(target)){
-            AbstractCharacter abs = (AbstractCharacter) target;
-            damage = (int) abs.getResists().getResistedDamage(source, abs,damageType,damage,1);
-            handleDamageShields(source,abs,damage);
-        }
-
-
-
-        sendCombatMessage(source, target, 0f, wb, null, mainhand, animation);
-
-        //if attacker is player, set last attack timestamp
-        if (source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
-            updateAttackTimers((PlayerCharacter) source, target);
-
-        //10. cancel all effects that cancel on attack
-        source.cancelOnAttack();
-    }
-
-    public static boolean LandHit(int ATR, int DEF){
-
-        int roll = ThreadLocalRandom.current().nextInt(101);
-
-        float chance = PlayerCombatStats.getHitChance(ATR,DEF);
-        return chance >= roll;
-    }
-
-    private static void sendCombatMessage(AbstractCharacter source, AbstractWorldObject target, float damage, ItemBase wb, DeferredPowerJob dpj, boolean mainHand, int swingAnimation) {
-
-        if (dpj != null)
-            if (PowersManager.AnimationOverrides.containsKey(dpj.getAction().getEffectID()))
-                swingAnimation = PowersManager.AnimationOverrides.get(dpj.getAction().getEffectID());
-
-        if (source.getObjectType() == Enum.GameObjectType.PlayerCharacter)
-            for (Effect eff : source.getEffects().values())
-                if (eff.getPower() != null && (eff.getPower().getToken() == 429506943 || eff.getPower().getToken() == 429408639 || eff.getPower().getToken() == 429513599 || eff.getPower().getToken() == 429415295))
-                    swingAnimation = 0;
-
-        TargetedActionMsg cmm = new TargetedActionMsg(source, target, damage, swingAnimation);
-        DispatchMessage.sendToAllInRange(target, cmm);
-    }
-
-    private static void updateAttackTimers(PlayerCharacter pc, AbstractWorldObject target) {
-
-        //Set Attack Timers
-
-        if (target.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
-            pc.setLastPlayerAttackTime();
-    }
-
-    public static void handleDamageShields(AbstractCharacter ac, AbstractCharacter target, float damage) {
-
-        if (ac == null || target == null)
-            return;
-
-        PlayerBonuses bonuses = target.getBonuses();
-
-        if (bonuses != null) {
-
-            ConcurrentHashMap<AbstractEffectModifier, DamageShield> damageShields = bonuses.getDamageShields();
-            float total = 0;
-
-            for (DamageShield ds : damageShields.values()) {
-
-                //get amount to damage back
-
-                float amount;
-
-                if (ds.usePercent())
-                    amount = damage * ds.getAmount() / 100;
-                else
-                    amount = ds.getAmount();
-
-                //get resisted damage for damagetype
-
-                Resists resists = ac.getResists();
-
-                if (resists != null) {
-                    amount = resists.getResistedDamage(target, ac, ds.getDamageType(), amount, 0);
-                }
-                total += amount;
-            }
-
-            if (total > 0) {
-
-                //apply Damage back
-
-                ac.modifyHealth(-total, target, true);
-
-                TargetedActionMsg cmm = new TargetedActionMsg(ac, ac, total, 0);
-                DispatchMessage.sendToAllInRange(target, cmm);
-
-            }
-        }
-    }
-
-    public static boolean inRange(AbstractCharacter source, AbstractWorldObject target, boolean mainhand){
-
-        if(source == null || target == null)
-            return false;
-
-        float distanceSquared = source.loc.distanceSquared(target.loc);
-
-        float rangeSquared = 16.0f;
-
-        if(source.getCharItemManager() != null && source.getCharItemManager().getEquipped() != null){
-            Item weapon = source.getCharItemManager().getEquipped(1);
-            if(!mainhand)
-                weapon = source.getCharItemManager().getEquipped(2);
-            if(weapon != null)
-                rangeSquared = weapon.getItemBase().getRange() * weapon.getItemBase().getRange();
-        }
-
-        if(source.getBonuses() != null){
-            rangeSquared *= 1 + source.getBonuses().getFloatPercentAll(Enum.ModType.WeaponRange, Enum.SourceType.None);
-        }
-
-        return distanceSquared <= rangeSquared;
-    }
-
-    public static boolean triggerPassive(AbstractCharacter source, AbstractWorldObject target) {
-        boolean passiveFired = false;
-
-        if (!AbstractCharacter.IsAbstractCharacter(target))
-            return false;
-
-        AbstractCharacter tarAc = (AbstractCharacter) target;
-        //Handle Block passive
-        if (testPassive(source, tarAc, "Block")) {
-            sendPassiveDefenseMessage(source, null, target, MBServerStatics.COMBAT_SEND_DODGE, null, true);
-            return true;
-        }
-
-        //Handle Parry passive
-        if (testPassive(source, tarAc, "Parry")) {
-            sendPassiveDefenseMessage(source, null, target, MBServerStatics.COMBAT_SEND_DODGE, null, true);
-            return true;
-        }
-
-        //Handle Dodge passive
-        if (testPassive(source, tarAc, "Dodge")) {
-            sendPassiveDefenseMessage(source, null, target, MBServerStatics.COMBAT_SEND_DODGE, null, true);
-            return true;
-        }
-        return false;
-    }
-
-    private static void sendPassiveDefenseMessage(AbstractCharacter source, ItemBase wb, AbstractWorldObject target, int passiveType, DeferredPowerJob dpj, boolean mainHand) {
-
-        int swingAnimation = 75;
-
-        if (dpj != null)
-            if (PowersManager.AnimationOverrides.containsKey(dpj.getAction().getEffectID()))
-                swingAnimation = PowersManager.AnimationOverrides.get(dpj.getAction().getEffectID());
-
-        TargetedActionMsg cmm = new TargetedActionMsg(source, swingAnimation, target, passiveType);
-        DispatchMessage.sendToAllInRange(target, cmm);
-    }
-
-    private static boolean testPassive(AbstractCharacter source, AbstractCharacter target, String type) {
-
-        if(target.getBonuses() != null)
-            if(target.getBonuses().getBool(Enum.ModType.Stunned, Enum.SourceType.None))
-                return false;
-
-        float chance = target.getPassiveChance(type, source.getLevel(), true);
-
-        if (chance == 0f)
-            return false;
-
-        //max 75% chance of passive to fire
-
-        if (chance > 75f)
-            chance = 75f;
-
-        int roll = ThreadLocalRandom.current().nextInt(1,100);
-
-        return roll < chance;
-
-    }
-
-    private static void createTimer(AbstractCharacter source, boolean mainhand) {
-
-        ConcurrentHashMap<String, JobContainer> timers = source.getTimers();
-        int slot = 1;
-        if(!mainhand)
-            slot = 2;
-
-        int time = 3000;
-        if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
-            PlayerCharacter pc = (PlayerCharacter)source;
-            if(mainhand){
-                time = (int) pc.combatStats.attackSpeedHandOne;
-            }else{
-                time = (int) pc.combatStats.attackSpeedHandTwo;
-            }
-        }
-
-        if (timers != null) {
-            AttackJob aj = new AttackJob(source, slot, true);
-            JobContainer job;
-            job = JobScheduler.getInstance().scheduleJob(aj, (time * 100));
-            timers.put("Attack" + slot, job);
-        } else {
-            Logger.error("Unable to find Timers for Character " + source.getObjectUUID());
-        }
-    }
-
-    public static void setAttackTarget(AttackCmdMsg msg, ClientConnection origin) throws MsgSendException {
-
-        PlayerCharacter player;
-        int targetType;
-        AbstractWorldObject target;
-
-        if (TargetedActionMsg.un2cnt == 60 || TargetedActionMsg.un2cnt == 70)
-            return;
-
-        player = SessionManager.getPlayerCharacter(origin);
-
-        if (player == null)
-            return;
-
-        //source must match player this account belongs to
-
-        if (player.getObjectUUID() != msg.getSourceID() || player.getObjectType().ordinal() != msg.getSourceType()) {
-            Logger.error("Msg Source ID " + msg.getSourceID() + " Does not Match Player ID " + player.getObjectUUID());
-            return;
-        }
-
-        targetType = msg.getTargetType();
-
-        if (targetType == Enum.GameObjectType.PlayerCharacter.ordinal()) {
-            target = PlayerCharacter.getFromCache(msg.getTargetID());
-        } else if (targetType == Enum.GameObjectType.Building.ordinal()) {
-            target = BuildingManager.getBuildingFromCache(msg.getTargetID());
-        } else if (targetType == Enum.GameObjectType.Mob.ordinal()) {
-            target = Mob.getFromCache(msg.getTargetID());
-        } else {
-            player.setCombatTarget(null);
-            return; //not valid type to attack
-        }
-
-        // quit of the combat target is already the current combat target
-        // or there is no combat target
-
-        if (target == null)
-            return;
-
-        //set sources target
-
-        player.setCombatTarget(target);
-
-        boolean hasMain = false;
-        boolean hasOff = false;
-        if(player.getCharItemManager() != null && player.getCharItemManager().getEquipped() != null){
-            if(player.getCharItemManager().getEquipped(1) != null)
-                hasMain = true;
-            if(player.getCharItemManager().getEquipped(2) != null && !player.getCharItemManager().getEquipped(2).getItemBase().isShield())
-                hasOff = true;
-        }
-
-        if(hasMain){
-            createTimer(player,true);
-        }
-
-        if(hasOff){
-            createTimer(player,false);
-        }
-
-    }
-}

src/engine/gameManager/DevCmdManager.java

@@ -85,7 +85,6 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new AddBuildingCmd());
         DevCmdManager.registerDevCmd(new AddNPCCmd());
         DevCmdManager.registerDevCmd(new AddMobCmd());
-        DevCmdManager.registerDevCmd(new DungenonCmd());
         DevCmdManager.registerDevCmd(new RemoveObjectCmd());
         DevCmdManager.registerDevCmd(new RotateCmd());
         DevCmdManager.registerDevCmd(new FlashMsgCmd());

src/engine/gameManager/LootManager.java

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

src/engine/gameManager/PowersManager.java

@@ -174,27 +174,9 @@ public enum PowersManager {
 
         if(pc.isMoving())
             pc.stopMovement(pc.getMovementLoc());
-        if(msg.getPowerUsedID() != 421084024 && origin.getPlayerCharacter().getPromotionClassID() != 2513) {
-            if (!origin.getPlayerCharacter().getPowers().containsKey(msg.getPowerUsedID())) {
-                Logger.error(origin.getPlayerCharacter().getFirstName() + " attempted to cast a power they do not have");
-                return;
-            }
-        }
-        //crusader sacrifice
-        if((msg.getPowerUsedID() == 428695403 && msg.getTargetID() == pc.getObjectUUID())){
-            RecyclePowerMsg recyclePowerMsg = new RecyclePowerMsg(msg.getPowerUsedID());
-            Dispatch dispatch = Dispatch.borrow(origin.getPlayerCharacter(), recyclePowerMsg);
-            DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
 
-            // Send Fail to cast message
-            if (pc != null) {
-                sendPowerMsg(pc, 2, msg);
-                if (pc.isCasting()) {
-                    pc.update(false);
-                }
-
-                pc.setIsCasting(false);
-            }
+        if(msg.getPowerUsedID() == 429429978){
+            applyPower(origin.getPlayerCharacter(),origin.getPlayerCharacter(),origin.getPlayerCharacter().getLoc(),429429978,msg.getNumTrains(),false);
             return;
         }
 
@@ -216,10 +198,6 @@ public enum PowersManager {
             }
 
         }
-
-        if(msg.getPowerUsedID() == 429429978){
-            origin.getPlayerCharacter().getRecycleTimers().remove(429429978);
-        }
     }
 
     public static void useMobPower(Mob caster, AbstractCharacter target, PowersBase pb, int rank) {
@@ -847,6 +825,7 @@ public enum PowersManager {
         if (playerCharacter == null || msg == null)
             return;
 
+
         //handle sprint for bard sprint
         if(msg.getPowerUsedID() == 429005674){
             msg.setPowerUsedID(429611355);
@@ -872,7 +851,7 @@ public enum PowersManager {
         if(msg.getTargetType() == GameObjectType.PlayerCharacter.ordinal()) {
             PlayerCharacter target = PlayerCharacter.getPlayerCharacter(msg.getTargetID());
             if (msg.getPowerUsedID() == 429601664)
-                if(target.getPromotionClassID() != 2516)//templar
+                if(target.getPromotionClassID() != 2516)
                     PlayerCharacter.getPlayerCharacter(msg.getTargetID()).removeEffectBySource(EffectSourceType.Transform, msg.getNumTrains(), true);
         }
 
@@ -917,9 +896,6 @@ public enum PowersManager {
             return;
         }
 
-        if(pb.targetSelf)
-            msg.setTargetID(playerCharacter.getObjectUUID());
-
         int trains = msg.getNumTrains();
 
         // verify player is not stunned or power type is blocked
@@ -1176,18 +1152,7 @@ public enum PowersManager {
 
 
         //DispatchMessage.dispatchMsgToInterestArea(playerCharacter, msg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
-//handle mob hate values
-        HashSet<AbstractWorldObject> mobs = WorldGrid.getObjectsInRangePartial(playerCharacter.loc,60.0f,MBServerStatics.MASK_MOB);
-        for(AbstractWorldObject awo : mobs){
-            Mob mobTarget = (Mob)awo;
-            if(mobTarget.hate_values != null) {
-                if (mobTarget.hate_values.containsKey(playerCharacter)) {
-                    mobTarget.hate_values.put(playerCharacter, mobTarget.hate_values.get(playerCharacter) + pb.getHateValue(trains));
-                } else {
-                    mobTarget.hate_values.put(playerCharacter, pb.getHateValue(trains));
-                }
-            }
-        }
+
 
     }
 
@@ -1658,28 +1623,17 @@ public enum PowersManager {
 
         // create list of characters
         HashSet<AbstractCharacter> trackChars;
-
-        PowersBase trackPower = PowersManager.getPowerByToken(msg.getPowerToken());
-        if(trackPower != null && trackPower.category.equals("TRACK")){
-            trackChars = getTrackList(playerCharacter);
-        }else{
-            trackChars = RangeBasedAwo.getTrackList(allTargets, playerCharacter, maxTargets);
+        switch(msg.getPowerToken()){
+            case 431511776:
+            case 429578587:
+            case 429503360:
+                trackChars = getTrackList(playerCharacter);
+                break;
+            default:
+                trackChars = RangeBasedAwo.getTrackList(allTargets, playerCharacter, maxTargets);
+                break;
         }
 
-
-
-        //switch(msg.getPowerToken()){
-        //    case 431511776: // Hunt Foe Huntress
-        //    case 429578587: // Hunt Foe Scout
-        //    case 429503360: // Track Huntsman
-        //    case 44106356: //
-        //        trackChars = getTrackList(playerCharacter);
-        //        break;
-        //    default:
-        //        trackChars = RangeBasedAwo.getTrackList(allTargets, playerCharacter, maxTargets);
-        //        break;
-        //}
-
         TrackWindowMsg trackWindowMsg = new TrackWindowMsg(msg);
 
         // send track window
@@ -2470,8 +2424,7 @@ public enum PowersManager {
     public static boolean testAttack(PlayerCharacter pc, AbstractWorldObject awo,
                                      PowersBase pb, PerformActionMsg msg) {
         // Get defense for target
-        //float atr = CharacterSkill.getATR(pc, pb.getSkillName());
-        float atr = PlayerCombatStats.getSpellAtr(pc, pb);
+        float atr = CharacterSkill.getATR(pc, pb.getSkillName());
         float defense;
 
         if (AbstractWorldObject.IsAbstractCharacter(awo)) {
@@ -3076,7 +3029,6 @@ public enum PowersManager {
             case 429502507:
             case 428398816:
             case 429446315:
-            case 429441979:
                 return false;
         }
         return true;

src/engine/mobileAI/MobAI.java

@@ -9,7 +9,6 @@
 package engine.mobileAI;
 
 import engine.Enum;
-import engine.InterestManagement.InterestManager;
 import engine.InterestManagement.WorldGrid;
 import engine.gameManager.*;
 import engine.math.Vector3f;
@@ -27,7 +26,6 @@ import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map.Entry;
 import java.util.concurrent.ConcurrentHashMap;
@@ -95,7 +93,7 @@ public class MobAI {
             }
 
         } catch (Exception e) {
-            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackTarget" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackTarget" + " " + e.getMessage());
         }
     }
 
@@ -108,12 +106,6 @@ 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);
 
@@ -134,9 +126,6 @@ public class MobAI {
                 if (mob.isMoving() && mob.getRange() > 20)
                     return;
 
-                if(target.combatStats == null)
-                    target.combatStats = new PlayerCombatStats(target);
-
                 // add timer for last attack.
 
                 ItemBase mainHand = mob.getWeaponItemBase(true);
@@ -167,14 +156,8 @@ 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) {
-            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackPlayer" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackPlayer" + " " + e.getMessage());
         }
 
     }
@@ -232,7 +215,7 @@ public class MobAI {
             //}
 
         } catch (Exception e) {
-            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackBuilding" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackBuilding" + " " + e.getMessage());
         }
     }
 
@@ -271,7 +254,7 @@ public class MobAI {
                 }
             }
         } catch (Exception e) {
-            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackMob" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackMob" + " " + e.getMessage());
         }
     }
 
@@ -324,7 +307,7 @@ public class MobAI {
                         }
                     }
         } catch (Exception e) {
-            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackTarget" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackTarget" + " " + e.getMessage());
         }
     }
 
@@ -368,7 +351,7 @@ public class MobAI {
             return mob.nextCastTime <= System.currentTimeMillis();
 
         } catch (Exception e) {
-            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: canCast" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: canCast" + " " + e.getMessage());
         }
         return false;
     }
@@ -454,7 +437,7 @@ public class MobAI {
                 return true;
             }
         } catch (Exception e) {
-            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: MobCast" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: MobCast" + " " + e.getMessage());
         }
         return false;
     }
@@ -576,7 +559,7 @@ public class MobAI {
                 return true;
             }
         } catch (Exception e) {
-            ////(mob.getObjectUUID() + " " + mob.getName() + " Failed At: MobCast" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: MobCast" + " " + e.getMessage());
         }
         return false;
     }
@@ -612,7 +595,7 @@ public class MobAI {
                 mob.nextCallForHelp = System.currentTimeMillis() + 60000;
 
         } catch (Exception e) {
-            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: MobCallForHelp" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: MobCallForHelp" + " " + e.getMessage());
         }
     }
 
@@ -624,6 +607,9 @@ public class MobAI {
 
             if (mob == null)
                 return;
+            if(mob.isAlive())
+                if(!mob.getMovementLoc().equals(Vector3fImmutable.ZERO))
+                    mob.setLoc(mob.getMovementLoc());
 
             if (mob.getTimestamps().containsKey("lastExecution") == false)
                 mob.getTimestamps().put("lastExecution", System.currentTimeMillis());
@@ -679,10 +665,6 @@ public class MobAI {
                 return;
             }
 
-            if(mob.isAlive())
-                if(!mob.getMovementLoc().equals(Vector3fImmutable.ZERO))
-                    mob.setLoc(mob.getMovementLoc());
-
             if(mob.isPet() == false && mob.isPlayerGuard == false)
                 CheckToSendMobHome(mob);
 
@@ -733,14 +715,12 @@ public class MobAI {
             if(mob.isAlive())
                 RecoverHealth(mob);
         } catch (Exception e) {
-            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: DetermineAction" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: DetermineAction" + " " + e.getMessage());
         }
     }
 
     private static void CheckForAggro(Mob aiAgent) {
 
-
-        //old system
         try {
 
             //looks for and sets mobs combatTarget
@@ -775,11 +755,13 @@ public class MobAI {
                     continue;
 
                 // No aggro for this race type
-                if (aiAgent.notEnemy.size() > 0 && aiAgent.notEnemy.contains(loadedPlayer.getRace().getRaceType().getMonsterType()))
+
+                if (aiAgent.notEnemy.size() > 0 && aiAgent.notEnemy.contains(loadedPlayer.getRace().getRaceType().getMonsterType()) == true)
                     continue;
 
                 //mob has enemies and this player race is not it
-                if (aiAgent.enemy.size() > 0 && !aiAgent.enemy.contains(loadedPlayer.getRace().getRaceType().getMonsterType()))
+
+                if (aiAgent.enemy.size() > 0 && aiAgent.enemy.contains(loadedPlayer.getRace().getRaceType().getMonsterType()) == false)
                     continue;
 
                 if (MovementUtilities.inRangeToAggro(aiAgent, loadedPlayer)) {
@@ -808,7 +790,7 @@ public class MobAI {
                 }
             }
         } catch (Exception e) {
-            //(aiAgent.getObjectUUID() + " " + aiAgent.getName() + " Failed At: CheckForAggro" + " " + e.getMessage());
+            Logger.info(aiAgent.getObjectUUID() + " " + aiAgent.getName() + " Failed At: CheckForAggro" + " " + e.getMessage());
         }
     }
 
@@ -869,7 +851,7 @@ public class MobAI {
 
             }
         } catch (Exception e) {
-            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckMobMovement" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckMobMovement" + " " + e.getMessage());
         }
     }
 
@@ -923,7 +905,7 @@ public class MobAI {
                 }
             }
         } catch (Exception e) {
-            //(aiAgent.getObjectUUID() + " " + aiAgent.getName() + " Failed At: CheckForRespawn" + " " + e.getMessage());
+            Logger.info(aiAgent.getObjectUUID() + " " + aiAgent.getName() + " Failed At: CheckForRespawn" + " " + e.getMessage());
         }
     }
 
@@ -949,7 +931,7 @@ public class MobAI {
                 AttackTarget(mob, mob.getCombatTarget());
 
         } catch (Exception e) {
-            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckForAttack" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckForAttack" + " " + e.getMessage());
         }
     }
 
@@ -976,8 +958,7 @@ public class MobAI {
                     if (mob.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardCaptain.ordinal())
                         CheckForPlayerGuardAggro(mob);
                 } else {
-                    if(mob.combatTarget == null)
-                        NewAggroMechanic(mob);
+                    CheckForAggro(mob);
                 }
             }
 
@@ -1011,7 +992,7 @@ public class MobAI {
                 mob.setCombatTarget(null);
             }
         } catch (Exception e) {
-            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckToSendMobHome" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckToSendMobHome" + " " + e.getMessage());
         }
     }
 
@@ -1054,7 +1035,7 @@ public class MobAI {
             mob.updateMovementState();
             mob.updateLocation();
         } catch (Exception e) {
-            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: chaseTarget" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: chaseTarget" + " " + e.getMessage());
         }
     }
 
@@ -1086,7 +1067,7 @@ public class MobAI {
                 mob.setCombatTarget(aggroMob);
             }
         } catch (Exception e) {
-            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: SafeGuardAggro" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: SafeGuardAggro" + " " + e.getMessage());
         }
     }
 
@@ -1109,10 +1090,21 @@ public class MobAI {
             if (mob.getCombatTarget() == null)
                 CheckForPlayerGuardAggro(mob);
 
+            AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);
+
+            if (newTarget != null) {
+
+                if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
+                    if (GuardCanAggro(mob, (PlayerCharacter) newTarget))
+                        mob.setCombatTarget(newTarget);
+                } else
+                    mob.setCombatTarget(newTarget);
+
+            }
             CheckMobMovement(mob);
             CheckForAttack(mob);
         } catch (Exception e) {
-            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardCaptainLogic" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardCaptainLogic" + " " + e.getMessage());
         }
     }
 
@@ -1134,7 +1126,7 @@ public class MobAI {
             CheckMobMovement(mob);
             CheckForAttack(mob);
         } catch (Exception e) {
-            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardMinionLogic" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardMinionLogic" + " " + e.getMessage());
         }
     }
 
@@ -1148,7 +1140,7 @@ public class MobAI {
             else
                 CheckForAttack(mob);
         } catch (Exception e) {
-            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardWallArcherLogic" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardWallArcherLogic" + " " + e.getMessage());
         }
     }
 
@@ -1169,7 +1161,7 @@ public class MobAI {
 
             CheckForAttack(mob);
         } catch (Exception e) {
-            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: PetLogic" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: PetLogic" + " " + e.getMessage());
         }
     }
 
@@ -1185,7 +1177,7 @@ public class MobAI {
 
             CheckForAttack(mob);
         } catch (Exception e) {
-            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: HamletGuardLogic" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: HamletGuardLogic" + " " + e.getMessage());
         }
     }
 
@@ -1200,11 +1192,17 @@ public class MobAI {
 
             if (mob.BehaviourType.isAgressive) {
 
-                if (mob.getCombatTarget() == null) {
-                    if (mob.BehaviourType == Enum.MobBehaviourType.HamletGuard)
-                        SafeGuardAggro(mob);  //safehold guard
-                    else
-                        NewAggroMechanic(mob);//CheckForAggro(mob);   //normal aggro
+                AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);
+
+                if (newTarget != null)
+                    mob.setCombatTarget(newTarget);
+                else {
+                    if (mob.getCombatTarget() == null) {
+                        if (mob.BehaviourType == Enum.MobBehaviourType.HamletGuard)
+                            SafeGuardAggro(mob);  //safehold guard
+                        else
+                            CheckForAggro(mob);   //normal aggro
+                    }
                 }
             }
 
@@ -1218,9 +1216,8 @@ public class MobAI {
             if (!mob.BehaviourType.isWimpy && mob.getCombatTarget() != null)
                 CheckForAttack(mob);
 
-
         } catch (Exception e) {
-            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: DefaultLogic" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: DefaultLogic" + " " + e.getMessage());
         }
     }
 
@@ -1270,7 +1267,7 @@ public class MobAI {
                 }
             }
         } catch (Exception e) {
-            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckForPlayerGuardAggro" + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckForPlayerGuardAggro" + e.getMessage());
         }
     }
 
@@ -1333,7 +1330,7 @@ public class MobAI {
                 }
             }
         } catch (Exception e) {
-            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardCanAggro" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardCanAggro" + " " + e.getMessage());
         }
         return false;
     }
@@ -1382,10 +1379,41 @@ public class MobAI {
                 }
             }
         } catch (Exception e) {
-            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: randomGuardPatrolPoints" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: randomGuardPatrolPoints" + " " + e.getMessage());
         }
     }
 
+    public static AbstractWorldObject ChangeTargetFromHateValue(Mob mob) {
+
+        try {
+
+            float CurrentHateValue = 0;
+
+            if (mob.getCombatTarget() != null && mob.getCombatTarget().getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
+                CurrentHateValue = ((PlayerCharacter) mob.getCombatTarget()).getHateValue();
+
+            AbstractWorldObject mostHatedTarget = null;
+
+            for (Entry playerEntry : mob.playerAgroMap.entrySet()) {
+
+                PlayerCharacter potentialTarget = PlayerCharacter.getFromCache((int) playerEntry.getKey());
+
+                if (potentialTarget.equals(mob.getCombatTarget()))
+                    continue;
+
+                if (potentialTarget != null && potentialTarget.getHateValue() > CurrentHateValue && MovementUtilities.inRangeToAggro(mob, potentialTarget)) {
+                    CurrentHateValue = potentialTarget.getHateValue();
+                    mostHatedTarget = potentialTarget;
+                }
+
+            }
+            return mostHatedTarget;
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: ChangeTargetFromMostHated" + " " + e.getMessage());
+        }
+        return null;
+    }
+
     public static void RecoverHealth(Mob mob) {
         //recover health
         try {
@@ -1403,7 +1431,7 @@ public class MobAI {
                         mob.setHealth(mob.getHealthMax());
                 }
         } catch (Exception e) {
-            //(mob.getObjectUUID() + " " + mob.getName() + " Failed At: RecoverHealth" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: RecoverHealth" + " " + e.getMessage());
         }
     }
 
@@ -1413,69 +1441,4 @@ public class MobAI {
         rwss.setPlayer(mob);
         DispatchMessage.sendToAllInRange(mob, rwss);
     }
-
-    public static void NewAggroMechanic(Mob mob){
-
-        if(mob == null || !mob.isAlive() || mob.playerAgroMap.isEmpty()){
-            return;
-        }
-
-        if(mob.BehaviourType.equals(Enum.MobBehaviourType.HamletGuard)){
-            return;
-        }
-
-        if(mob.hate_values == null)
-            mob.hate_values = new HashMap<>();
-
-        if(mob.combatTarget != null)
-            return;
-
-        HashSet<AbstractWorldObject> inRange = WorldGrid.getObjectsInRangePartial(mob.loc,60.0f,MBServerStatics.MASK_PLAYER);
-
-        if(inRange.isEmpty()){
-            mob.setCombatTarget(null);
-            return;
-        }
-
-        //clear out any players who are not in hated range anymore
-        ArrayList<PlayerCharacter> toRemove = new ArrayList<>();
-        for(PlayerCharacter pc : mob.hate_values.keySet()){
-            if(!inRange.contains(pc))
-                toRemove.add(pc);
-        }
-        for(PlayerCharacter pc : toRemove){
-            mob.hate_values.remove(pc);
-        }
-
-        //find most hated target
-        PlayerCharacter mostHated = (PlayerCharacter)inRange.iterator().next();
-        for(AbstractWorldObject awo : inRange){
-            PlayerCharacter loadedPlayer = (PlayerCharacter)awo;
-            if (loadedPlayer == null)
-                continue;
-
-            //Player is Dead, Mob no longer needs to attempt to aggro. Remove them from aggro map.
-            if (!loadedPlayer.isAlive())
-                continue;
-
-            //Can't see target, skip aggro.
-            if (!mob.canSee(loadedPlayer))
-                continue;
-
-            // No aggro for this race type
-            if (mob.notEnemy != null && mob.notEnemy.size() > 0 && mob.notEnemy.contains(loadedPlayer.getRace().getRaceType().getMonsterType()))
-                continue;
-
-            //mob has enemies and this player race is not it
-            if (mob.enemy != null && mob.enemy.size() > 0 && !mob.enemy.contains(loadedPlayer.getRace().getRaceType().getMonsterType()))
-                continue;
-
-            if(mob.hate_values.containsKey(loadedPlayer))
-                if(mob.hate_values.get(loadedPlayer) > mob.hate_values.get(mostHated))
-                    mostHated = loadedPlayer;
-        }
-
-        if(mostHated != null)
-            mob.setCombatTarget(mostHated);
-    }
 }

src/engine/mobileAI/Threads/MobAIThread.java

@@ -3,6 +3,8 @@ package engine.mobileAI.Threads;
 import engine.gameManager.ConfigManager;
 import engine.mobileAI.MobAI;
 import engine.gameManager.ZoneManager;
+import engine.mobileAI.behaviours.GuardAI;
+import engine.mobileAI.behaviours.SiegeEngineAI;
 import engine.objects.Mob;
 import engine.objects.Zone;
 import engine.server.MBServerStatics;
@@ -33,6 +35,13 @@ public class MobAIThread implements Runnable{
                         for (Mob mob : zone.zoneMobSet) {
                             try {
                                 if (mob != null) {
+                                    if(mob.isSiege()){
+                                        SiegeEngineAI.run(mob);
+                                        continue;
+                                    }else if(mob.isPlayerGuard){
+                                        GuardAI.run(mob);
+                                        continue;
+                                    }
                                     MobAI.DetermineAction(mob);
                                 }
                             } catch (Exception e) {

src/engine/mobileAI/Threads/MobRespawnThread.java

@@ -43,13 +43,14 @@ 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/behaviours/GuardAI.java

@@ -0,0 +1,259 @@
+package engine.mobileAI.behaviours;
+
+import engine.Enum;
+import engine.gameManager.MovementManager;
+import engine.gameManager.PowersManager;
+import engine.gameManager.ZoneManager;
+import engine.math.Vector3f;
+import engine.math.Vector3fImmutable;
+import engine.mobileAI.utilities.CombatUtilities;
+import engine.mobileAI.utilities.MovementUtilities;
+import engine.objects.*;
+import engine.powers.MobPowerEntry;
+import engine.powers.PowersBase;
+import org.pmw.tinylog.Logger;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ThreadLocalRandom;
+
+public class GuardAI {
+
+    public static HashMap<Mob,PowersBase> quedPowerCasts = new HashMap<>();
+
+    public static void run(Mob guard){
+
+        //1. check for players nearby to aggro to
+        if(guard.combatTarget == null)
+            CheckForPlayerGuardAggro(guard);
+
+        //2. patrol if no target acquired
+        if(guard.combatTarget == null) {
+            patrol(guard);
+            return;
+        }
+
+        //3. attack based on whether spellcaster, archer or mele
+        if(guard.mobPowers.isEmpty()){
+            if(guard.getEquip().get(2) != null && guard.getEquip().get(2).getItemBase().getRange() > 20) {
+                runArcher(guard);
+            }else {
+                runMele(guard);
+            }
+        }else{
+            runCaster(guard);
+        }
+    }
+
+    public static void runCaster(Mob guard){
+
+    }
+
+    public static void runMele(Mob guard){
+
+    }
+
+    public static void runArcher(Mob guard){
+
+    }
+
+    public static void CheckForPlayerGuardAggro(Mob mob) {
+
+        try {
+
+            //looks for and sets mobs combatTarget
+
+            if (!mob.isAlive())
+                return;
+
+            ConcurrentHashMap<Integer, Boolean> loadedPlayers = mob.playerAgroMap;
+
+            for (Map.Entry playerEntry : loadedPlayers.entrySet()) {
+
+                int playerID = (int) playerEntry.getKey();
+                PlayerCharacter loadedPlayer = PlayerCharacter.getFromCache(playerID);
+
+                //Player is null, let's remove them from the list.
+
+                if (loadedPlayer == null) {
+                    loadedPlayers.remove(playerID);
+                    continue;
+                }
+
+                //Player is Dead, Mob no longer needs to attempt to aggro. Remove them from aggro map.
+
+                if (!loadedPlayer.isAlive()) {
+                    loadedPlayers.remove(playerID);
+                    continue;
+                }
+
+                //Can't see target, skip aggro.
+
+                if (!mob.canSee(loadedPlayer))
+                    continue;
+
+                // No aggro for this player
+
+                if (GuardCanAggro(mob, loadedPlayer) == false)
+                    continue;
+
+                if (MovementUtilities.inRangeToAggro(mob, loadedPlayer) && mob.getCombatTarget() == null) {
+                    mob.setCombatTarget(loadedPlayer);
+                    return;
+                }
+            }
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckForPlayerGuardAggro" + e.getMessage());
+        }
+    }
+
+    public static Boolean GuardCanAggro(Mob mob, PlayerCharacter target) {
+
+        try {
+
+            if (mob.getGuild().getNation().equals(target.getGuild().getNation()))
+                return false;
+
+            if (mob.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardMinion.ordinal()) {
+                if (((Mob) mob.npcOwner).building.getCity().cityOutlaws.contains(target.getObjectUUID()) == true) {
+                    return true;
+                }
+            } else if (mob.building.getCity().cityOutlaws.contains(target.getObjectUUID()) == true) {
+                return true;
+            }
+
+            //first check condemn list for aggro allowed (allies button is checked)
+
+            if (ZoneManager.getCityAtLocation(mob.getLoc()).getTOL().reverseKOS) {
+                for (Map.Entry<Integer, Condemned> entry : ZoneManager.getCityAtLocation(mob.getLoc()).getTOL().getCondemned().entrySet()) {
+
+                    //target is listed individually
+
+                    if (entry.getValue().getPlayerUID() == target.getObjectUUID() && entry.getValue().isActive())
+                        return false;
+
+                    //target's guild is listed
+
+                    if (Guild.getGuild(entry.getValue().getGuildUID()) == target.getGuild())
+                        return false;
+
+                    //target's nation is listed
+
+                    if (Guild.getGuild(entry.getValue().getGuildUID()) == target.getGuild().getNation())
+                        return false;
+                }
+                return true;
+            } else {
+
+                //allies button is not checked
+
+                for (Map.Entry<Integer, Condemned> entry : ZoneManager.getCityAtLocation(mob.getLoc()).getTOL().getCondemned().entrySet()) {
+
+                    //target is listed individually
+
+                    if (entry.getValue().getPlayerUID() == target.getObjectUUID() && entry.getValue().isActive())
+                        return true;
+
+                    //target's guild is listed
+
+                    if (Guild.getGuild(entry.getValue().getGuildUID()) == target.getGuild())
+                        return true;
+
+                    //target's nation is listed
+
+                    if (Guild.getGuild(entry.getValue().getGuildUID()) == target.getGuild().getNation())
+                        return true;
+                }
+            }
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardCanAggro" + " " + e.getMessage());
+        }
+        return false;
+    }
+
+    public static void randomGuardPatrolPoint(Mob mob) {
+
+        try {
+
+            //early exit for a mob who is already moving to a patrol point
+            //while mob moving, update lastPatrolTime so that when they stop moving the 10 second timer can begin
+
+            if (mob.isMoving() == true) {
+                mob.stopPatrolTime = System.currentTimeMillis();
+                return;
+            }
+
+            //wait between 10 and 15 seconds after reaching patrol point before moving
+
+            int patrolDelay = ThreadLocalRandom.current().nextInt(10000) + 5000;
+
+            //early exit while waiting to patrol again
+
+            if (mob.stopPatrolTime + patrolDelay > System.currentTimeMillis())
+                return;
+
+            float xPoint = ThreadLocalRandom.current().nextInt(400) - 200;
+            float zPoint = ThreadLocalRandom.current().nextInt(400) - 200;
+            Vector3fImmutable TreePos = mob.getGuild().getOwnedCity().getLoc();
+            mob.destination = new Vector3fImmutable(TreePos.x + xPoint, TreePos.y, TreePos.z + zPoint);
+
+            MovementUtilities.aiMove(mob, mob.destination, true);
+
+            if (mob.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardCaptain.ordinal()) {
+                for (Map.Entry<Mob, Integer> minion : mob.siegeMinionMap.entrySet()) {
+
+                    //make sure mob is out of combat stance
+
+                    if (minion.getKey().despawned == false) {
+                        if (MovementUtilities.canMove(minion.getKey())) {
+                            Vector3f minionOffset = Formation.getOffset(2, minion.getValue() + 3);
+                            minion.getKey().updateLocation();
+                            Vector3fImmutable formationPatrolPoint = new Vector3fImmutable(mob.destination.x + minionOffset.x, mob.destination.y, mob.destination.z + minionOffset.z);
+                            MovementUtilities.aiMove(minion.getKey(), formationPatrolPoint, true);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: randomGuardPatrolPoints" + " " + e.getMessage());
+        }
+    }
+
+    public static void patrol(Mob guard){
+        if (!guard.BehaviourType.equals(Enum.MobBehaviourType.GuardCaptain) && guard.npcOwner.isAlive())
+            return;
+
+        //patrol
+        Building barracks = guard.building;
+
+        if (barracks != null && barracks.patrolPoints != null && !barracks.getPatrolPoints().isEmpty()) {
+            guard.patrolPoints = barracks.patrolPoints;
+        } else {
+            randomGuardPatrolPoint(guard);
+            return;
+        }
+        if (guard.lastPatrolPointIndex > guard.patrolPoints.size() - 1)
+            guard.lastPatrolPointIndex = 0;
+
+        guard.destination = guard.patrolPoints.get(guard.lastPatrolPointIndex);
+        guard.lastPatrolPointIndex += 1;
+
+        MovementUtilities.aiMove(guard, guard.destination, true);
+
+        if (guard.BehaviourType.equals(Enum.MobBehaviourType.GuardCaptain)) {
+            for (Map.Entry<Mob, Integer> minion : guard.siegeMinionMap.entrySet())
+
+                //make sure mob is out of combat stance
+
+                if (!minion.getKey().despawned) {
+                    if (MovementUtilities.canMove(minion.getKey())) {
+                        Vector3f minionOffset = Formation.getOffset(2, minion.getValue() + 3);
+                        minion.getKey().updateLocation();
+                        Vector3fImmutable formationPatrolPoint = new Vector3fImmutable(guard.destination.x + minionOffset.x, guard.destination.y, guard.destination.z + minionOffset.z);
+                        MovementUtilities.aiMove(minion.getKey(), formationPatrolPoint, true);
+                    }
+                }
+        }
+    }
+}

src/engine/mobileAI/behaviours/PetAI.java

@@ -0,0 +1,17 @@
+package engine.mobileAI.behaviours;
+
+import engine.objects.Mob;
+
+public class PetAI {
+
+    public static void run(Mob pet){
+
+        //1. check for combat
+
+        //2. check for distance from player
+
+        //3. follow player
+
+        //4. chase combat target
+    }
+}

src/engine/mobileAI/behaviours/SiegeEngineAI.java

@@ -0,0 +1,89 @@
+package engine.mobileAI.behaviours;
+
+import engine.Enum;
+import engine.gameManager.BuildingManager;
+import engine.gameManager.CombatManager;
+import engine.gameManager.MovementManager;
+import engine.gameManager.ZoneManager;
+import engine.mobileAI.utilities.CombatUtilities;
+import engine.objects.Building;
+import engine.objects.City;
+import engine.objects.Mob;
+import engine.server.MBServerStatics;
+import org.pmw.tinylog.Logger;
+
+public class SiegeEngineAI {
+
+    public static void run(Mob engine) {
+
+        //1. check to respawn if engine is dead or initially spawning
+        if (!engine.isAlive() || engine.despawned) {
+            if (System.currentTimeMillis() - engine.deathTime > MBServerStatics.FIFTEEN_MINUTES) {
+                engine.respawn();
+                return;
+            }
+        }
+
+        //2. early exit if owner is null, siege engines cannot act with player intervention
+        if (engine.getOwner() == null)
+            return;
+
+        //3. early exit if target is null, siege engines have no purpose without a target
+        if (engine.combatTarget == null)
+            return;
+
+        //4. early exit if target is not a building, siege engines can only attack buildings
+        if (!engine.combatTarget.getObjectType().equals(Enum.GameObjectType.Building)) {
+            engine.setCombatTarget(null);
+            return;
+        }
+
+        //5. early exit if target is out of range, engines don't move and neither do buildings, avoid infinite loop
+        if(CombatManager.NotInRange(engine,engine.combatTarget,engine.getRange())) {
+            engine.setCombatTarget(null);
+            return;
+        }
+
+        //6. attack target, sanity checks passed, attack target
+        AttackBuilding(engine,(Building) engine.combatTarget);
+    }
+
+    public static void AttackBuilding(Mob engine, Building target) {
+
+        try {
+
+            if (engine == null || target == null)
+                return;
+
+            if (target.getRank() == -1 || !target.isVulnerable() || BuildingManager.getBuildingFromCache(target.getObjectUUID()) == null) {
+                engine.setCombatTarget(null);
+                return;
+            }
+
+            City playercity = ZoneManager.getCityAtLocation(engine.getLoc());
+
+            if (playercity != null)
+                for (Mob guard : playercity.getParent().zoneMobSet)
+                    if (guard.BehaviourType != null && guard.BehaviourType.equals(Enum.MobBehaviourType.GuardCaptain))
+                        if (guard.getCombatTarget() == null && guard.getGuild() != null && engine.getGuild() != null && !guard.getGuild().equals(engine.getGuild()))
+                            guard.setCombatTarget(engine);
+
+
+            MovementManager.sendRWSSMsg(engine);
+
+            CombatUtilities.combatCycle(engine, target, true, null);
+            int delay = 15000;
+            engine.setLastAttackTime(System.currentTimeMillis() + delay);
+
+
+            //if (mob.isSiege()) {
+            //    PowerProjectileMsg ppm = new PowerProjectileMsg(mob, target);
+            //    ppm.setRange(50);
+            //    DispatchMessage.dispatchMsgToInterestArea(mob, ppm, DispatchChannel.SECONDARY, MBServerStatics.CHARACTER_LOAD_RANGE, false, false);
+            //}
+
+        } catch (Exception e) {
+            Logger.info(engine.getObjectUUID() + " " + engine.getName() + " Failed At: AttackBuilding" + " " + e.getMessage());
+        }
+    }
+}

src/engine/mobileAI/behaviours/StandardAI.java

@@ -0,0 +1,10 @@
+package engine.mobileAI.behaviours;
+
+import engine.objects.Mob;
+
+public class StandardAI {
+    public static void run(Mob mob){
+
+    }
+
+}

src/engine/mobileAI/utilities/CombatUtilities.java

@@ -22,6 +22,7 @@ import org.pmw.tinylog.Logger;
 import java.util.concurrent.ThreadLocalRandom;
 
 import static engine.math.FastMath.sqr;
+import static java.lang.Math.pow;
 
 public class CombatUtilities {
 
@@ -100,14 +101,6 @@ public class CombatUtilities {
         if (!target.isAlive())
             return;
 
-        if(agent.isPet()){
-            try{
-                damage *= agent.getOwner().ZergMultiplier;
-            }catch(Exception ignored){
-
-            }
-        }
-
         if (AbstractWorldObject.IsAbstractCharacter(target)) {
             //damage = Resists.handleFortitude((AbstractCharacter) target,DamageType.Crush,damage);
             trueDamage = ((AbstractCharacter) target).modifyHealth(-damage, agent, false);
@@ -156,8 +149,6 @@ public class CombatUtilities {
         switch (target.getObjectType()) {
             case PlayerCharacter:
                 PlayerCharacter pc = (PlayerCharacter)target;
-                if(pc.combatStats == null)
-                    pc.combatStats = new PlayerCombatStats(pc);
                 pc.combatStats.calculateDefense();
                 defense = pc.combatStats.defense;
                 break;
@@ -210,10 +201,12 @@ public class CombatUtilities {
                 return;
 
         int anim = 75;
+        float speed;
 
-        //handle the retaliate here because even if the mob misses you can still retaliate
-        if (AbstractWorldObject.IsAbstractCharacter(target))
-            CombatManager.handleRetaliate((AbstractCharacter) target, agent);
+        if (mainHand)
+            speed = agent.getSpeedHandOne();
+        else
+            speed = agent.getSpeedHandTwo();
 
         DamageType dt = DamageType.Crush;
 
@@ -295,6 +288,11 @@ 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())

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

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

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

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

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

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

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

@@ -424,9 +424,9 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                             }
                             break;
                         case 31:
-                            //LootManager.peddleFate(player,item);
-                            LootManager.newFatePeddler(player,item);
+                            LootManager.peddleFate(player,item);
                             break;
+
                         case 30: //water bucket
                         case 8: //potions, tears of saedron
                         case 5: //runes, petition, warrant, scrolls

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

@@ -1027,10 +1027,6 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
     private boolean placeCityWalls(PlayerCharacter player, ClientConnection origin, PlaceAssetMsg msg) {
 
-        if(player.getAccount().status.equals(AccountStatus.ADMIN)){
-            adminCreateBuildings(player,msg);
-            return false;
-        }
         // Member variables
 
         Zone serverZone;
@@ -1169,7 +1165,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
         return true;
     }
 
-    private static Building createStructure(PlayerCharacter playerCharacter, PlacementInfo buildingInfo, Zone currentZone) {
+    private Building createStructure(PlayerCharacter playerCharacter, PlacementInfo buildingInfo, Zone currentZone) {
 
         Blueprint blueprint;
         Building newMesh;
@@ -1391,16 +1387,4 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         return true;
     }
-
-    public static void adminCreateBuildings(PlayerCharacter pc, PlaceAssetMsg msg){
-        //handled for building dungeon layouts
-        Zone zone = ZoneManager.getZoneByZoneID(993);
-        for(PlacementInfo placement : msg.getPlacementInfo()){
-            Building building = createStructure(pc,placement,zone);
-            if(building != null) {
-                building.setProtectionState(ProtectionState.NPC);
-                building.setRank(1);
-            }
-        }
-    }
 }

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

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

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

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

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

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

src/engine/objects/AbstractCharacter.java

@@ -1187,13 +1187,13 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
 
     public final float modifyHealth(float value, final AbstractCharacter attacker, final boolean fromCost) {
 
-        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
-        //    value *= ((PlayerCharacter)attacker).ZergMultiplier;
-        //} // Health modifications are modified by the ZergMechanic
+        if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
+            value *= ((PlayerCharacter)attacker).ZergMultiplier;
+        } // Health modifications are modified by the ZergMechanic
 
-        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
-        //    value *= ((Mob)attacker).getOwner().ZergMultiplier;
-        //}// Health modifications from pets are modified by the owner's ZergMechanic
+        if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
+            value *= ((Mob)attacker).getOwner().ZergMultiplier;
+        }// Health modifications from pets are modified by the owner's ZergMechanic
 
         try {
 
@@ -1262,13 +1262,13 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
             final boolean fromCost
     ) {
 
-        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
-        //    value *= ((PlayerCharacter)attacker).ZergMultiplier;
-        //} // Health modifications are modified by the ZergMechanic
+        if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
+            value *= ((PlayerCharacter)attacker).ZergMultiplier;
+        } // Health modifications are modified by the ZergMechanic
 
-        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
-        //    value *= ((Mob)attacker).getOwner().ZergMultiplier;
-        //}// Health modifications from pets are modified by the owner's ZergMechanic
+        if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
+            value *= ((Mob)attacker).getOwner().ZergMultiplier;
+        }// Health modifications from pets are modified by the owner's ZergMechanic
 
         if (!this.isAlive()) {
             return 0f;
@@ -1309,13 +1309,13 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
             final boolean fromCost
     ) {
 
-        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
-        //    value *= ((PlayerCharacter)attacker).ZergMultiplier;
-        //} // Health modifications are modified by the ZergMechanic
+        if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
+            value *= ((PlayerCharacter)attacker).ZergMultiplier;
+        } // Health modifications are modified by the ZergMechanic
 
-        //if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
-       //     value *= ((Mob)attacker).getOwner().ZergMultiplier;
-        //}// Health modifications from pets are modified by the owner's ZergMechanic
+        if(attacker != null && attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob)attacker).getOwner() != null){
+            value *= ((Mob)attacker).getOwner().ZergMultiplier;
+        }// Health modifications from pets are modified by the owner's ZergMechanic
 
         if (!this.isAlive()) {
             return 0f;

src/engine/objects/AbstractWorldObject.java

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

src/engine/objects/CharacterItemManager.java

@@ -2448,9 +2448,6 @@ public class CharacterItemManager {
     public void damageItem(Item item, int amount) {
         if (item == null || amount < 1 || amount > 5)
             return;
-        if(item.getItemBase().isGlass()){
-            amount = 1;
-        }
 
         //verify the item is equipped by this player
         int slot = item.getEquipSlot();

src/engine/objects/City.java

@@ -455,7 +455,7 @@ public class City extends AbstractWorldObject {
 
                         if (!BuildingManager.IsPlayerHostile(city.getTOL(), pc))
                             cities.add(city); //verify nation or guild is same
-                    } else if (city.open && Guild.sameNationExcludeErrant(city.getGuild(), pcG))
+                    } else if (Guild.sameNationExcludeErrant(city.getGuild(), pcG))
                         cities.add(city);
 
                 } else if (city.isNpc == 1) {

src/engine/objects/Contract.java

@@ -16,7 +16,6 @@ import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.msg.CityDataMsg;
 import engine.net.client.msg.ErrorPopupMsg;
-import engine.net.client.msg.VendorDialogMsg;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;
 
@@ -324,12 +323,6 @@ public class Contract extends AbstractGameObject {
         pc.charItemManager.updateInventory();
 
     }
-
-    public static boolean isClassTrainer(int id){
-        if(id >= 5 && id <= 30)
-            return true;
-        return false;
-    }
     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();
@@ -587,19 +580,6 @@ public class Contract extends AbstractGameObject {
             }
         }
 
-        if(this.getObjectUUID() == 1502050){
-            for(MobEquipment me : this.sellInventory){
-                switch(me.getItemBase().getUUID()) {
-                    case 971070:
-                        me.magicValue = 3000000;
-                        break;
-                    case 971012:
-                        me.magicValue = 1000000;
-                        break;
-                }
-            }
-        }
-
         if(this.getObjectUUID() == 1202){ //rune merchant
             for(MobEquipment me : this.sellInventory){
                 switch(me.getItemBase().getUUID()){
@@ -608,62 +588,52 @@ public class Contract extends AbstractGameObject {
                     case 250019:
                     case 250028:
                     case 250037:
-                        me.magicValue = 1000000;
+                        me.magicValue = 3000000;
                         break;
                     case 250002: //10 stats
                     case 250011:
                     case 250020:
                     case 250029:
                     case 250038:
-                        me.magicValue = 2000000;
+                        me.magicValue = 4000000;
                         break;
                     case 250003: //15 stats
                     case 250012:
                     case 250021:
                     case 250030:
                     case 250039:
-                        me.magicValue = 3000000;
+                        me.magicValue = 5000000;
                         break;
                     case 250004: //20 stats
                     case 250013:
                     case 250022:
                     case 250031:
                     case 250040:
-                        me.magicValue = 4000000;
+                        me.magicValue = 6000000;
                         break;
                     case 250005: //25 stats
                     case 250014:
                     case 250023:
                     case 250032:
                     case 250041:
-                        me.magicValue = 5000000;
+                        me.magicValue = 7000000;
                         break;
                     case 250006: //30 stats
                     case 250015:
                     case 250024:
                     case 250033:
                     case 250042:
-                        me.magicValue = 6000000;
+                        me.magicValue = 8000000;
                         break;
                     case 250007: //35 stats
                     case 250016:
                     case 250025:
                     case 250034:
                     case 250043:
-                        me.magicValue = 7000000;
-                        break;
-                    case 250008: //40 stats
-                    case 250017:
-                    case 250026:
-                    case 250035:
-                    case 250044:
-                        me.magicValue = 10000000;
-                        break;
-                    case 252127:
-                        me.magicValue = 5000000;
+                        me.magicValue = 9000000;
                         break;
                     default:
-                        me.magicValue = 1000000;
+                        me.magicValue = 10000000;
                         break;
                 }
             }

src/engine/objects/Experience.java

@@ -23,7 +23,7 @@ import static engine.gameManager.LootManager.LOOTMANAGER;
 public class Experience {
 
     private static final TreeMap<Integer, Integer> ExpToLevel;
-    public static final int[] LevelToExp = {Integer.MIN_VALUE, // Pad
+    private static final int[] LevelToExp = {Integer.MIN_VALUE, // Pad
             // everything
             // over 1
 
@@ -121,8 +121,6 @@ public class Experience {
             190585732,  // Level 77
             201714185,  // Level 78
             213319687,  // Level 79
-
-            // R8
             225415457,   // Level 80
             238014819   // Level 81
 
@@ -304,7 +302,7 @@ public class Experience {
             case Cyan:
                 return 0.9;
             case Green:
-                return 0.8;
+                return 0.7;
             default:
                 return 0;
         }
@@ -354,14 +352,6 @@ public class Experience {
         if(killer.pvpKills.contains(mob.getObjectUUID()))
             return;
 
-        if(true){
-            if(killer.combatStats == null)
-                killer.combatStats = new PlayerCombatStats(killer);
-
-            killer.combatStats.grantExperience(mob,g);
-            return;
-        }
-
         double grantedExperience = 0.0;
 
         if (g != null) { // Do group EXP stuff

src/engine/objects/Item.java

@@ -818,19 +818,15 @@ public class Item extends AbstractWorldObject {
     }
 
     public void stripCastableEnchants(){
-        try {
-            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);
-                }
+        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);
-        }catch(Exception ignored){
-
         }
+        this.effects.values().removeAll(ToRemove);
     }
     //Only to be used for trading
     public void setOwnerID(int ownerID) {

src/engine/objects/ItemBase.java

@@ -259,53 +259,51 @@ public class ItemBase {
             case 250019:
             case 250028:
             case 250037:
-                return 1000000;
+                return 3000000;
             case 250002: //10 stats
             case 250011:
             case 250020:
             case 250029:
             case 250038:
-                return 2000000;
+                return 4000000;
             case 250003: //15 stats
             case 250012:
             case 250021:
             case 250030:
             case 250039:
-                return 3000000;
+                return 5000000;
             case 250004: //20 stats
             case 250013:
             case 250022:
             case 250031:
             case 250040:
-                return 4000000;
+                return 6000000;
             case 250005: //25 stats
             case 250014:
             case 250023:
             case 250032:
             case 250041:
-                return 5000000;
+                return 7000000;
             case 250006: //30 stats
             case 250015:
             case 250024:
             case 250033:
             case 250042:
-                return 6000000;
+                return 8000000;
             case 250007: //35 stats
             case 250016:
             case 250025:
             case 250034:
             case 250043:
-                return 7000000;
+                return 9000000;
             case 250008: //40 stats
             case 250017:
             case 250026:
             case 250035:
             case 250044:
                 return 10000000;
-            case 252127:
-                return 5000000;
         }
-        return 1000000;
+        return 10000000;
     }
 
     /*

src/engine/objects/ItemFactory.java

@@ -705,13 +705,9 @@ public class ItemFactory {
 
         int rollPrefix = ThreadLocalRandom.current().nextInt(1, 100 + 1);
 
-        if (rollPrefix < vendor.getLevel() + 30) {
+        if (rollPrefix < 80) {
 
             int randomPrefix = TableRoll(vendor.getLevel());
-            if(vendor.contract.getName().contains("Heavy") || vendor.contract.getName().contains("Medium") || vendor.contract.getName().contains("Leather"))
-                randomPrefix += vendor.level * 0.5f;
-            if(randomPrefix > 320)
-                randomPrefix = 320;
             prefixEntry = ModTableEntry.rollTable(prefixTypeTable.modTableID, randomPrefix);
 
             if (prefixEntry != null)
@@ -724,13 +720,9 @@ public class ItemFactory {
         // Always have at least one mod on a magic rolled item.
         // Suffix will be our backup plan.
 
-        if (rollSuffix < vendor.getLevel() + 30) {
+        if (rollSuffix < 80 || prefixEntry == null) {
 
             int randomSuffix = TableRoll(vendor.getLevel());
-            if(vendor.contract.getName().contains("Heavy") || vendor.contract.getName().contains("Medium") || vendor.contract.getName().contains("Leather"))
-                randomSuffix += vendor.level * 0.25f;
-            if(randomSuffix > 320)
-                randomSuffix = 320;
             suffixEntry = ModTableEntry.rollTable(suffixTypeTable.modTableID, randomSuffix);
 
             if (suffixEntry != null)
@@ -784,31 +776,31 @@ public class ItemFactory {
 
     public static int TableRoll(int vendorLevel) {
         // Calculate min and max based on mobLevel
-        int min = 100;
-        int max = 160;
+        int min = 60;
+        int max = 120;
         switch(vendorLevel){
             case 20:
-                min = 120;
-                max = 180;
+                min = 70;
+                max = 140;
                 break;
             case 30:
-                min = 140;
-                max = 200;
+                min = 80;
+                max = 160;
                 break;
             case 40:
-                min = 160;
-                max = 220;
+                min = 90;
+                max = 180;
                 break;
             case 50:
-                min = 180;
-                max = 240;
+                min = 100;
+                max = 200;
                 break;
             case 60:
-                min = 200;
+                min = 175;
                 max = 260;
                 break;
             case 70:
-                min = 240;
+                min = 220;
                 max = 320;
                 break;
         }

src/engine/objects/Mine.java

@@ -65,7 +65,6 @@ public class Mine extends AbstractGameObject {
     public boolean isStronghold = false;
     public ArrayList<Mob> strongholdMobs;
     public HashMap<Integer,Integer> oldBuildings;
-    public HashMap<Integer, Long> mineAttendees = new HashMap<>();
 
     /**
      * ResultSet Constructor
@@ -623,7 +622,7 @@ public class Mine extends AbstractGameObject {
 
         // Gather current list of players within the zone bounds
 
-        HashSet<AbstractWorldObject> currentPlayers = WorldGrid.getObjectsInRangePartial(tower.loc, MBServerStatics.CHARACTER_LOAD_RANGE * 3, MBServerStatics.MASK_PLAYER);
+        HashSet<AbstractWorldObject> currentPlayers = WorldGrid.getObjectsInRangePartial(tower.loc, Enum.CityBoundsType.GRID.extents, MBServerStatics.MASK_PLAYER);
         HashMap<Guild,ArrayList<PlayerCharacter>> charactersByNation = new HashMap<>();
         ArrayList<Guild> updatedNations = new ArrayList<>();
         for (AbstractWorldObject playerObject : currentPlayers) {
@@ -638,7 +637,6 @@ public class Mine extends AbstractGameObject {
 
             if(!this._playerMemory.contains(player.getObjectUUID())){
                 this._playerMemory.add(player.getObjectUUID());
-                ChatManager.chatSystemInfo(player,"You Have Entered an Active Mine Area");
             }
             Guild nation = player.guild.getNation();
             if(charactersByNation.containsKey(nation)){
@@ -657,19 +655,6 @@ public class Mine extends AbstractGameObject {
                 }
             }
         }
-
-        for(Integer id : this.mineAttendees.keySet()){
-            PlayerCharacter attendee = PlayerCharacter.getPlayerCharacter(id);
-            if(attendee == null)
-                continue;
-
-            if(charactersByNation.containsKey(attendee.guild.getNation())){
-                if(!charactersByNation.get(attendee.guild.getNation()).contains(attendee)){
-                    charactersByNation.get(attendee.guild.getNation()).add(attendee);
-                }
-            }
-
-        }
         for(Guild nation : updatedNations){
             float multiplier = ZergManager.getCurrentMultiplier(charactersByNation.get(nation).size(),this.capSize);
             for(PlayerCharacter player : charactersByNation.get(nation)){
@@ -691,28 +676,18 @@ public class Mine extends AbstractGameObject {
         if(tower == null)
             return;
         ArrayList<Integer>toRemove = new ArrayList<>();
-        HashSet<AbstractWorldObject> currentPlayers = WorldGrid.getObjectsInRangePartial(tower.loc, MBServerStatics.CHARACTER_LOAD_RANGE * 3, MBServerStatics.MASK_PLAYER);
+        HashSet<AbstractWorldObject> currentPlayers = WorldGrid.getObjectsInRangePartial(tower.loc, Enum.CityBoundsType.GRID.extents, MBServerStatics.MASK_PLAYER);
         for(Integer id : currentMemory){
             PlayerCharacter pc = PlayerCharacter.getPlayerCharacter(id);
-            if(!currentPlayers.contains(pc)){
-                if(this.mineAttendees.containsKey(id)){
-                    long timeGone = System.currentTimeMillis() - this.mineAttendees.get(id).longValue();
-                    if (timeGone > 180000L) { // 3 minutes
-                        toRemove.add(id); // Mark for removal
-                    }
-                }
+            if(currentPlayers.contains(pc) == false){
+                toRemove.add(id);
                 pc.ZergMultiplier = 1.0f;
-            } else {
-                this.mineAttendees.put(id,System.currentTimeMillis());
             }
         }
 
         // Remove players from city memory
 
         _playerMemory.removeAll(toRemove);
-        for(int id : toRemove){
-            this.mineAttendees.remove(id);
-        }
     }
     public static Building getTower(Mine mine){
         Building tower = BuildingManager.getBuildingFromCache(mine.buildingID);

src/engine/objects/Mob.java

@@ -111,8 +111,6 @@ public class Mob extends AbstractIntelligenceAgent {
     public boolean StrongholdEpic = false;
     public boolean isDropper = false;
 
-    public HashMap<PlayerCharacter,Float> hate_values;
-
 
     /**
      * No Id Constructor
@@ -622,7 +620,6 @@ public class Mob extends AbstractIntelligenceAgent {
             DbManager.addToCache(mob);
             mob.setPet(owner, true);
             mob.setWalkMode(false);
-            mob.level = level;
             mob.runAfterLoad();
 
         } catch (Exception e) {
@@ -631,12 +628,8 @@ public class Mob extends AbstractIntelligenceAgent {
             createLock.writeLock().unlock();
         }
         parent.zoneMobSet.add(mob);
-       // mob.level = level;
-        float healthMax = mob.getMobBase().getHealthMax();
-        if(mob.bonuses != null){
-            healthMax += mob.bonuses.getFloat(ModType.HealthFull,SourceType.None);
-        }
-        mob.healthMax = healthMax;
+        mob.level = level;
+        mob.healthMax = mob.getMobBase().getHealthMax() * (mob.level * 0.5f);
         mob.health.set(mob.healthMax);
         return mob;
     }
@@ -1452,7 +1445,6 @@ public class Mob extends AbstractIntelligenceAgent {
         this.stopPatrolTime = 0;
         this.lastPatrolPointIndex = 0;
         InterestManager.setObjectDirty(this);
-        this.hate_values = new HashMap<>();
     }
 
     public void despawn() {

src/engine/objects/MobBase.java

@@ -308,10 +308,6 @@ 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/MobEquipment.java

@@ -274,14 +274,14 @@ public class MobEquipment extends AbstractGameObject {
                 EffectsBase effect = PowersManager.getEffectByToken(token);
 
                 AbstractPowerAction apa = PowersManager.getPowerActionByIDString(effect.getIDString());
-                if (apa != null && apa.getEffectsBase() != null)
+                if (apa.getEffectsBase() != null)
                     if (apa.getEffectsBase().getValue() > 0) {
                         //System.out.println(apa.getEffectsBase().getValue());
                         value += apa.getEffectsBase().getValue();
                     }
 
 
-                if (apa != null && apa.getEffectsBase2() != null)
+                if (apa.getEffectsBase2() != null)
                     value += apa.getEffectsBase2().getValue();
             }
 

src/engine/objects/NPC.java

@@ -876,11 +876,6 @@ public class NPC extends AbstractCharacter {
         // zone collection
 
         this.parentZone = ZoneManager.getZoneByUUID(this.parentZoneUUID);
-        if(this.parentZone == null) {
-            Logger.error("PARENT ZONE NOT IDENTIFIED FOR NPC : " + this.getObjectUUID());
-            return;
-        }
-
         this.parentZone.zoneNPCSet.remove(this);
         this.parentZone.zoneNPCSet.add(this);
 

src/engine/objects/PlayerCharacter.java

@@ -41,11 +41,11 @@ import engine.server.MBServerStatics;
 import engine.server.login.LoginServer;
 import engine.server.login.LoginServerMsgHandler;
 import engine.server.world.WorldServer;
-import engine.util.KeyCloneAudit;
 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.*;
@@ -183,8 +183,6 @@ public class PlayerCharacter extends AbstractCharacter {
 
     public PlayerCombatStats combatStats;
 
-    public Integer selectedUUID = 0;
-
     /**
      * No Id Constructor
      */
@@ -1536,48 +1534,25 @@ public class PlayerCharacter extends AbstractCharacter {
                 return true;
             Zone zone = ZoneManager.findSmallestZone(breather.getLoc());
 
-            if(zone == null)
-                return true;
-
-            if(zone.isPlayerCity())
-                return true;
-
-            float seaLevel = zone.getSeaLevel();
-
             if (zone.getSeaLevel() != 0) {
-                Zone parent = zone.getParent();
-                if(parent != null && parent.isMacroZone()){
-                    float parentLevel = parent.getSeaLevel();
-                    seaLevel -= parentLevel;
-                }
-
-                if(seaLevel == 0)
-                    return true;
 
                 float localAltitude = breather.getLoc().y;
-                float characterHeight = breather.characterHeight;
 
-                if (localAltitude + characterHeight < seaLevel - 2) {
-                    //ChatManager.chatSystemInfo(breather, "YOU CANNOT BREATHE!");
+
+                if (localAltitude + breather.characterHeight < zone.getSeaLevel() - 2)
                     return false;
-                }
+
                 if (breather.isMoving()) {
-                    if (localAltitude + breather.characterHeight < zone.getSeaLevel()) {
-                        //ChatManager.chatSystemInfo(breather, "YOU CANNOT BREATHE!");
+                    if (localAltitude + breather.characterHeight < zone.getSeaLevel())
                         return false;
-                    }
                 }
             } else {
-                if (breather.getLoc().y + breather.characterHeight < -2) {
-                    //ChatManager.chatSystemInfo(breather, "YOU CANNOT BREATHE!");
+                if (breather.getLoc().y + breather.characterHeight < -2)
                     return false;
-                }
 
                 if (breather.isMoving()) {
-                    if (breather.getLoc().y + breather.characterHeight < 0) {
-                        //ChatManager.chatSystemInfo(breather, "YOU CANNOT BREATHE!");
+                    if (breather.getLoc().y + breather.characterHeight < 0)
                         return false;
-                    }
                 }
             }
 
@@ -1870,11 +1845,6 @@ public class PlayerCharacter extends AbstractCharacter {
         message += " was killed by " + att.getFirstName();
         if (att.guild != null && (!(att.guild.getName().equals("Errant"))))
             message += " of " + att.guild.getName();
-
-        Zone killZone = ZoneManager.findSmallestZone(this.loc);
-        if(killZone != null){
-            message += " in " + killZone.getName();
-        }
         message += "!";
 
 
@@ -1994,7 +1964,8 @@ public class PlayerCharacter extends AbstractCharacter {
         this.altitude = (float) 0;
 
         // Release Mine Claims
-        //Mine.releaseMineClaims(this);
+
+        Mine.releaseMineClaims(this);
 
         this.getCharItemManager().closeTradeWindow();
 
@@ -2958,7 +2929,6 @@ public class PlayerCharacter extends AbstractCharacter {
     }
 
     public synchronized void grantXP(int xp) {
-        xp *= LootManager.NORMAL_EXP_RATE;
         int groupSize = 1;
         if(GroupManager.getGroup(this)!= null)
             groupSize = GroupManager.getGroup(this).members.size();
@@ -4735,7 +4705,7 @@ 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
@@ -4784,13 +4754,13 @@ public class PlayerCharacter extends AbstractCharacter {
                 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())
@@ -5108,12 +5078,6 @@ public class PlayerCharacter extends AbstractCharacter {
 
             Zone zone = ZoneManager.findSmallestZone(this.getLoc());
 
-            if(zone == null)
-                return false;
-
-            if(zone.isPlayerCity())
-                return false;
-
             if (zone.getSeaLevel() != 0) {
 
                 float localAltitude = this.getLoc().y + this.centerHeight;
@@ -5151,21 +5115,67 @@ public class PlayerCharacter extends AbstractCharacter {
         if(!newSystem)
             return;
 
+        this.updateLocation();
+        this.updateMovementState();
+
         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;
+                    }
+                    if(!this.timestamps.containsKey("stamTick")){
+                        this.timestamps.put("stamTick", System.currentTimeMillis());
+                    }else{
+                        if(this.containsEffect(441156479) || this.containsEffect(441156455)) {
+                            if(System.currentTimeMillis() - this.timestamps.get("stamTick") > 5000){
+                                boolean worked = false;
+                                while(!worked) {
+                                    float old = this.stamina.get();
+                                    float mod = old + 4;
+                                    if (mod > this.staminaMax)
+                                        mod = this.staminaMax;
+
+                                    worked = this.stamina.compareAndSet(old, mod);
+                                }
+                                this.timestamps.put("stamTick", System.currentTimeMillis());
+                            }
+                        }else{
+                            this.timestamps.put("stamTick", System.currentTimeMillis());
+                        }
+                    }
 
                     if (this.isAlive() && this.isActive && this.enteredWorld) {
 
+                        this.updateMovementState();
+
                         if (this.combatStats == null) {
                             this.combatStats = new PlayerCombatStats(this);
                         } else {
-                            try {
-                                this.combatStats.update();
-                            }catch(Exception ignored){
-
-                            }
+                            this.combatStats.update();
                         }
                         this.doRegen();
                     }
@@ -5180,26 +5190,24 @@ public class PlayerCharacter extends AbstractCharacter {
                     this.updateBlessingMessage();
 
                     this.safeZone = this.isInSafeZone();
+                    if (!this.timestamps.containsKey("nextBoxCheck"))
+                        this.timestamps.put("nextBoxCheck", System.currentTimeMillis() + 10000);
 
-                    if(this.isActive && this.enteredWorld) {
-                        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.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(1672601862)) {
-                            PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false);
+                    if (this.level < 10 && this.enteredWorld) {
+                        while (this.level < 10) {
+                            grantXP(Experience.getBaseExperience(this.level + 1) - this.exp);
                         }
                     }
+
+                    if (this.isBoxed && !this.containsEffect(1672601862)) {
+                        PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false);
+                    }
+
                     if (this.isFlying()) {
                         if (this.effects.containsKey("MoveBuff")) {
                             GroundPlayer(this);
@@ -5221,11 +5229,6 @@ public class PlayerCharacter extends AbstractCharacter {
                         }
 
                     }
-                    try {
-                        this.clearClientEffects();
-                    }catch(Exception ignored){
-
-                    }
 
                 } catch (Exception e) {
                     Logger.error(e);
@@ -5237,17 +5240,6 @@ public class PlayerCharacter extends AbstractCharacter {
             Logger.error("UPDATE ISSUE: " + e);
         }
     }
-
-    public void clearClientEffects(){
-        if(this.bonuses != null) {
-            if (!bonuses.getBool(ModType.Stunned, SourceType.None)) {
-                this.removeEffectBySource(EffectSourceType.Stun, 40, true);
-            }
-            if(!this.bonuses.getBool(Enum.ModType.CannotMove,Enum.SourceType.None)){
-                this.removeEffectBySource(EffectSourceType.Root,40,true);
-            }
-        }
-    }
     public static void unboxPlayer(PlayerCharacter player){
         String machineID = player.getClientConnection().machineID;
         ArrayList<PlayerCharacter> sameMachine = new ArrayList<>();
@@ -5257,22 +5249,14 @@ public class PlayerCharacter extends AbstractCharacter {
             }
         }
 
-        boolean valid = true;
-        for(PlayerCharacter pc : sameMachine){
-            if(!pc.safeZone)
-                valid = false;
-        }
-        if(valid) {
-            for (PlayerCharacter pc : sameMachine)
-                pc.isBoxed = true;
+        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");
+        player.isBoxed = false;
+        if(player.containsEffect(1672601862)) {
+            player.removeEffectBySource(EffectSourceType.DeathShroud,41,false);
         }
+
     }
     public static boolean checkIfBoxed(PlayerCharacter player){
         if(ConfigManager.MB_WORLD_BOXLIMIT.getValue().equals("false")) {
@@ -5383,10 +5367,8 @@ public class PlayerCharacter extends AbstractCharacter {
             return;
         }
 
-
-        this.region = AbstractWorldObject.GetRegionByWorldObject(this);
-
         setLoc(newLoc);
+        this.region = AbstractWorldObject.GetRegionByWorldObject(this);
 
         if (this.getDebug(1))
             ChatManager.chatSystemInfo(this,
@@ -5684,8 +5666,6 @@ public class PlayerCharacter extends AbstractCharacter {
     }
 
     public void setEnteredWorld(boolean enteredWorld) {
-        if(enteredWorld)
-            this.timestamps.put("nextBoxCheck", System.currentTimeMillis() + 10000);
         this.enteredWorld = enteredWorld;
     }
 
@@ -5791,15 +5771,10 @@ public class PlayerCharacter extends AbstractCharacter {
                     } else {
                         healthRegen = 0;
                         manaRegen = 0;
-
-                        if(this.containsEffect(441156479) || this.containsEffect(441156455)) {
-                            stamRegen = MBServerStatics.STAMINA_REGEN_WALK;
-                        }else {
-                            if (this.combat == true)
-                                stamRegen = MBServerStatics.STAMINA_REGEN_RUN_COMBAT;
-                            else
-                                stamRegen = MBServerStatics.STAMINA_REGEN_RUN_NONCOMBAT;
-                        }
+                        if (this.combat == true)
+                            stamRegen = MBServerStatics.STAMINA_REGEN_RUN_COMBAT;
+                        else
+                            stamRegen = MBServerStatics.STAMINA_REGEN_RUN_NONCOMBAT;
                     }
                     break;
                 case FLYING:
@@ -5930,16 +5905,10 @@ public class PlayerCharacter extends AbstractCharacter {
             // 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());
-            //}
+            this.syncClient();
+            this.timestamps.put("SyncClient", System.currentTimeMillis());
         }
     }
 

src/engine/objects/PlayerCombatStats.java

@@ -1,16 +1,21 @@
 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.PowersBase;
 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 {
 
@@ -21,7 +26,7 @@ public class PlayerCombatStats {
     public float attackSpeedHandOne;
     public float rangeHandOne;
     public float atrHandOne;
-    //offhand data
+    //off hand data
     public int minDamageHandTwo;
     public int maxDamageHandTwo;
     public float attackSpeedHandTwo;
@@ -249,6 +254,18 @@ public class PlayerCombatStats {
         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;
         this.update();
@@ -351,29 +368,20 @@ public class PlayerCombatStats {
         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;
-        float healerDefStance = 0.0f;
+
         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")){
-                    for (AbstractEffectModifier mod : this.owner.effects.get(effID).getEffectModifiers()) {
-                        if (mod.modType.equals(Enum.ModType.OCV)) {
-                            float percent = mod.getPercentMod();
-                            int trains = this.owner.effects.get(effID).getTrains();
-                            float modValue = percent + (trains * mod.getRamp());
-                            healerDefStance += modValue * 0.01f;
-                        }
-                    }
+                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();
@@ -424,7 +432,7 @@ public class PlayerCombatStats {
                 preciseRune += 0.05f;
         }
 
-            atr = primaryStat / 2.0f;
+            atr = primaryStat / 2;
             atr += skillLevel * 4;
             atr += masteryLevel * 3;
             atr += prefixValues;
@@ -438,17 +446,13 @@ public class PlayerCombatStats {
             float modifier = 1 + (positivePercentBonuses + negativePercentBonuses);
             if(preciseRune > 1.0f)
                 modifier -= 0.05f;
-            if(stanceValue > 0.0f){
-                modifier -= (stanceValue);
+            if(stanceValue > 1.0f){
+                modifier -= (stanceValue - 1.0f);
             }
-            modifier -= healerDefStance;
             atr *= modifier;
         }
             atr = (float) Math.round(atr);
 
-        if(atr < 0)
-            atr = 0;
-
         if(mainHand){
             this.atrHandOne = atr;
         }else{
@@ -486,6 +490,7 @@ 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 = this.owner.statDexCurrent;
@@ -531,13 +536,11 @@ public class PlayerCombatStats {
             this.minDamageHandOne = roundedMin;
         } else {
             this.minDamageHandTwo = roundedMin;
-            if(this.owner.charItemManager != null) {
-                if (this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null) {
-                    if (!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
-                        this.minDamageHandOne = 0;
-                } else if (this.owner.charItemManager.getEquipped(2) == null && this.owner.charItemManager.getEquipped(1) != null) {
-                    this.minDamageHandTwo = 0;
-                }
+            if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){
+                if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
+                    this.minDamageHandOne = 0;
+            }else if(this.owner.charItemManager.getEquipped(2) == null && this.owner.charItemManager.getEquipped(1) != null){
+                this.minDamageHandTwo = 0;
             }
         }
     }
@@ -609,15 +612,13 @@ public class PlayerCombatStats {
 
         if(mainHand){
             this.maxDamageHandOne = roundedMax;
-        }else {
-            if (this.owner.charItemManager != null) {
-                this.maxDamageHandTwo = roundedMax;
-                if (this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null) {
-                    if (!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
-                        this.maxDamageHandOne = 0;
-                } else if (this.owner.charItemManager.getEquipped(2) == null && this.owner.charItemManager.getEquipped(1) != null) {
-                    this.maxDamageHandTwo = 0;
-                }
+        }else{
+            this.maxDamageHandTwo = roundedMax;
+            if(this.owner.charItemManager.getEquipped(1) == null && this.owner.charItemManager.getEquipped(2) != null){
+                if(!this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
+                    this.maxDamageHandOne = 0;
+            }else if(this.owner.charItemManager.getEquipped(2) == null && this.owner.charItemManager.getEquipped(1) != null){
+                this.maxDamageHandTwo = 0;
             }
         }
     }
@@ -688,9 +689,9 @@ public class PlayerCombatStats {
         }
 
         float bonusValues = 1 + this.owner.bonuses.getFloatPercentAll(Enum.ModType.AttackDelay,Enum.SourceType.None);//1.0f;
-        bonusValues -= stanceValue + delayExtra; // take away stance modifier from alacrity bonus values
+        bonusValues -= stanceValue + delayExtra; // take away stance modifier from alac bonus values
         speed *= 1 + stanceValue; // apply stance bonus
-        speed *= bonusValues; // apply alacrity bonuses without stance mod
+        speed *= bonusValues; // apply alac bonuses without stance mod
 
         if(speed < 10.0f)
             speed = 10.0f;
@@ -744,23 +745,23 @@ public class PlayerCombatStats {
         float armorSkill = 0.0f;
         float armorDefense = 0.0f;
         ArrayList<String> armorsUsed = new ArrayList<>();
-        int itemDef;
+        int itemdef = 0;
         for(Item equipped : this.owner.charItemManager.getEquipped().values()){
             ItemBase ib = equipped.getItemBase();
             if(ib.isHeavyArmor() || ib.isMediumArmor() || ib.isLightArmor() || ib.isClothArmor()){
-                itemDef = ib.getDefense();
+                itemdef = ib.getDefense();
 
                 for(Effect eff : equipped.effects.values()){
                     for(AbstractEffectModifier mod : eff.getEffectModifiers()){
                         if(mod.modType.equals(Enum.ModType.DR)){
-                            itemDef += 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;
+                armorDefense += itemdef;
             }
         }
         for(String armorUsed : armorsUsed){
@@ -776,20 +777,16 @@ public class PlayerCombatStats {
             blockSkill = this.owner.skills.get("Block").getModifiedAmount();
 
         float shieldDefense = 0.0f;
-        try {
-            if (this.owner.charItemManager.getEquipped(2) != null && this.owner.charItemManager.getEquipped(2).getItemBase().isShield()) {
-                Item shield = this.owner.charItemManager.getEquipped(2);
-                shieldDefense += shield.getItemBase().getDefense();
-                for (Effect eff : shield.effects.values()) {
-                    for (AbstractEffectModifier mod : eff.getEffectModifiers()) {
-                        if (mod.modType.equals(Enum.ModType.DR)) {
-                            shieldDefense += mod.minMod + (mod.getRamp() * eff.getTrains());
-                        }
+        if(this.owner.charItemManager.getEquipped(2) != null && this.owner.charItemManager.getEquipped(2).getItemBase().isShield()){
+            Item shield = this.owner.charItemManager.getEquipped(2);
+            shieldDefense += shield.getItemBase().getDefense();
+            for(Effect eff : shield.effects.values()){
+                for(AbstractEffectModifier mod : eff.getEffectModifiers()){
+                    if(mod.modType.equals(Enum.ModType.DR)){
+                        shieldDefense += mod.minMod + (mod.getRamp() * eff.getTrains());
                     }
                 }
             }
-        }catch(Exception ignore){
-
         }
 
         float weaponSkill = 0.0f;
@@ -849,76 +846,10 @@ public class PlayerCombatStats {
                 }
             }
         }
-
-        //right ring
-        if(this.owner.charItemManager != null){
-            try{
-            if(this.owner.charItemManager.getEquipped(7) != null){
-                for(String effID : this.owner.charItemManager.getEquipped(7).effects.keySet()) {
-                    for (AbstractEffectModifier mod : this.owner.charItemManager.getEquipped(7).effects.get(effID).getEffectModifiers()) {
-                        if (mod.modType.equals(Enum.ModType.DCV)) {
-                            if (mod.getPercentMod() == 0) {
-                                float value = mod.getMinMod();
-                                int trains = this.owner.effects.get(effID).getTrains();
-                                float modValue = value + (trains * mod.getRamp());
-                                flatBonuses += modValue;
-                            }
-                        }
-                    }
-                }
-            }
-            }catch(Exception e){
-
-            }
-            //left ring
-            try {
-                if (this.owner.charItemManager.getEquipped(8) != null) {
-                    for (String effID : this.owner.charItemManager.getEquipped(8).effects.keySet()) {
-                        for (AbstractEffectModifier mod : this.owner.charItemManager.getEquipped(8).effects.get(effID).getEffectModifiers()) {
-                            if (mod.modType.equals(Enum.ModType.DCV)) {
-                                if (mod.getPercentMod() == 0) {
-                                    float value = mod.getMinMod();
-                                    int trains = this.owner.effects.get(effID).getTrains();
-                                    float modValue = value + (trains * mod.getRamp());
-                                    flatBonuses += modValue;
-                                }
-                            }
-                        }
-                    }
-                }
-            }catch(Exception e){
-
-            }
-            //necklace
-            try{
-            if(this.owner.charItemManager.getEquipped(9) != null){
-                for(String effID : this.owner.charItemManager.getEquipped(9).effects.keySet()) {
-                    for (AbstractEffectModifier mod : this.owner.charItemManager.getEquipped(9).effects.get(effID).getEffectModifiers()) {
-                        if (mod.modType.equals(Enum.ModType.DCV)) {
-                            if (mod.getPercentMod() == 0) {
-                                float value = mod.getMinMod();
-                                int trains = this.owner.effects.get(effID).getTrains();
-                                float modValue = value + (trains * mod.getRamp());
-                                flatBonuses += modValue;
-                            }
-                        }
-                    }
-                }
-            }
-            }catch(Exception e){
-
-            }
-            try{
-            if(this.owner.charItemManager.getEquipped(2) == null)
-                blockSkill = 0;
-            else if(this.owner.charItemManager != null && this.owner.charItemManager.getEquipped(2) != null && !this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
-                blockSkill = 0;
-            }catch(Exception e){
-
-            }
-        }
-
-
+        if(this.owner.charItemManager.getEquipped(2) == null)
+            blockSkill = 0;
+        else if(this.owner.charItemManager != null && this.owner.charItemManager.getEquipped(2) != null && !this.owner.charItemManager.getEquipped(2).getItemBase().isShield())
+            blockSkill = 0;
 
         float defense = (1 + armorSkill / 50) * armorDefense;
         defense += (1 + blockSkill / 100) * shieldDefense;
@@ -937,9 +868,6 @@ public class PlayerCombatStats {
         }
         defense = Math.round(defense);
 
-        if(defense < 0)
-            defense = 0;
-
         this.defense = (int) defense;
     } // PERFECT DO NOT TOUCH
 
@@ -949,7 +877,7 @@ public class PlayerCombatStats {
         if(def == 0)
             return 100.0f;
 
-        float key = ((float)atr / def);
+        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)
@@ -959,206 +887,4 @@ public class PlayerCombatStats {
         return HIT_VALUE_MAP.get(key);
     }
 
-    public static float getSpellAtr(PlayerCharacter pc, PowersBase pb) {
-
-        if (pc == null)
-            return 0f;
-
-        if(pb == null)
-            return 0.0f;
-
-        float modifiedFocusLine = 0.0f;
-        if(pc.skills.containsKey(pb.skillName)){
-            modifiedFocusLine = pc.skills.get(pb.skillName).getModifiedAmount();
-        }
-
-        float modifiedDexterity = pc.statDexCurrent;
-
-        float weaponATR1 = 0.0f;
-        if(pc.charItemManager != null && pc.charItemManager.getEquipped(1) != null){
-            for(Effect eff : pc.charItemManager.getEquipped(1).effects.values()){
-                for (AbstractEffectModifier mod : eff.getEffectModifiers()){
-                    if(mod.modType.equals(Enum.ModType.OCV)){
-                        float base = mod.minMod;
-                        float ramp = mod.getRamp();
-                        int trains = eff.getTrains();
-                        weaponATR1 = base + (ramp * trains);
-                    }
-                }
-            }
-        }
-
-        float weaponATR2 = 0.0f;
-        if(pc.charItemManager != null && pc.charItemManager.getEquipped(2) != null){
-            for(Effect eff : pc.charItemManager.getEquipped(2).effects.values()){
-                for (AbstractEffectModifier mod : eff.getEffectModifiers()){
-                    if(mod.modType.equals(Enum.ModType.OCV)){
-                        float base = mod.minMod;
-                        float ramp = mod.getRamp();
-                        int trains = eff.getTrains();
-                        weaponATR2 = base + (ramp * trains);
-                    }
-                }
-            }
-        }
-
-        float precise = 1.0f;
-        for(CharacterRune rune : pc.runes){
-            if(rune.getRuneBase().getName().equals("Precise"))
-                precise += 0.05f;
-        }
-
-        float stanceMod = 1.0f;
-        float atrBuffs = 0.0f;
-
-        float healerDefStance = 0.0f;
-        for(String effID : pc.effects.keySet()) {
-            if (effID.contains("Stance")) {
-                Effect effect = pc.effects.get(effID);
-                EffectsBase eb = effect.getEffectsBase();
-                if(eb.getIDString().equals("STC-H-DA")){
-                    for (AbstractEffectModifier mod : pc.effects.get(effID).getEffectModifiers()) {
-                        if (mod.modType.equals(Enum.ModType.OCV)) {
-                            float percent = mod.getPercentMod();
-                            int trains = pc.effects.get(effID).getTrains();
-                            float modValue = percent + (trains * mod.getRamp());
-                            healerDefStance += modValue * 0.01f;
-                        }
-                    }
-                    continue;
-                }
-                for (AbstractEffectModifier mod : pc.effects.get(effID).getEffectModifiers()) {
-                    if (mod.modType.equals(Enum.ModType.OCV)) {
-                        float percent = mod.getPercentMod();
-                        int trains = pc.effects.get(effID).getTrains();
-                        float modValue = percent + (trains * mod.getRamp());
-                        stanceMod += modValue * 0.01f;
-                    }
-                }
-            } else {
-                for (AbstractEffectModifier mod : pc.effects.get(effID).getEffectModifiers()) {
-                    if (mod.modType.equals(Enum.ModType.OCV)) {
-                        if(mod.getPercentMod() == 0) {
-                            float value = mod.getMinMod();
-                            int trains = pc.effects.get(effID).getTrains();
-                            float modValue = value + (trains * mod.getRamp());
-                            atrBuffs += modValue;
-                        }
-                    }
-                }
-            }
-        }
-
-        float atr = 7 * modifiedFocusLine;
-        atr += (modifiedDexterity * 0.5f) + weaponATR1 + weaponATR2;
-        atr *= precise;
-        atr += atrBuffs;
-        if(pc.bonuses != null)
-            atr *= 1 + (pc.bonuses.getFloatPercentAll(Enum.ModType.OCV, Enum.SourceType.None) - (stanceMod - 1) - (precise - 1) - healerDefStance);
-        atr *= stanceMod;
-        return atr;
-    }
-
-    public void grantExperience(AbstractCharacter killed, Group group){
-
-        if(killed == null)
-            return;
-        double grantedXP;
-
-        if(group != null){
-
-            for(PlayerCharacter member : group.members){
-                //white mob, early exit
-                if(Experience.getConMod(member,killed) <= 0)
-                    continue;
-
-                //can only get XP over level 75 for player kills
-                if(member.level >= 75 && !killed.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
-                    continue;
-
-                //cannot gain xp while dead
-                if(!member.isAlive())
-                    continue;
-
-                //out of XP range
-                if(member.loc.distanceSquared(killed.loc) > MBServerStatics.CHARACTER_LOAD_RANGE * MBServerStatics.CHARACTER_LOAD_RANGE)
-                    continue;
-
-                float mod;
-                switch(group.members.size()){
-                    default:
-                        mod = 1.0f;
-                        break;
-                    case 2:
-                        mod = 0.8f;
-                        break;
-                    case 3:
-                        mod = 0.73f;
-                        break;
-                    case 4:
-                        mod = 0.69f;
-                        break;
-                    case 5:
-                        mod = 0.65f;
-                        break;
-                    case 6:
-                        mod = 0.58f;
-                        break;
-                    case 7:
-                        mod = 0.54f;
-                        break;
-                    case 8:
-                        mod = 0.50f;
-                        break;
-                    case 9:
-                        mod = 0.47f;
-                        break;
-                    case 10:
-                        mod = 0.45f;
-                        break;
-                }
-                double xp = getXP(member) * mod;
-
-                member.grantXP((int) xp);
-            }
-
-        }else{
-            //Solo XP
-
-            //white mob, early exit
-            if(Experience.getConMod(this.owner,killed) <= 0)
-                return;
-
-            //can only get XP over level 75 for player kills
-            if(this.owner.level >= 75 && !killed.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
-                return;
-
-            //cannot gain xp while dead
-            if(!this.owner.isAlive())
-                return;
-
-            this.owner.grantXP(getXP(this.owner));
-        }
-    }
-
-    public static int getXP(PlayerCharacter pc){
-        double xp = 0;
-        float mod = 0.10f;
-
-        if (pc.level >= 26 && pc.level <= 75)
-        {
-            mod = 0.10f - (0.001f * (pc.level - 24));
-        }
-        else if (pc.level > 75)
-        {
-            mod = 0.05f;
-        }
-
-        float levelFull = Experience.LevelToExp[pc.level + 1] - Experience.LevelToExp[pc.level];
-
-        xp = levelFull * mod;
-
-        return (int) xp;
-    }
-
 }

src/engine/objects/VendorDialog.java

@@ -21,7 +21,7 @@ public class VendorDialog extends AbstractGameObject {
     private static VendorDialog vd;
     private final String dialogType;
     private final String intro;
-    ArrayList<MenuOption> options = new ArrayList<>();
+    private ArrayList<MenuOption> options = new ArrayList<>();
 
     public VendorDialog(String dialogType, String intro, int UUID) {
         super(UUID);

src/engine/powers/effectmodifiers/HealthEffectModifier.java

@@ -9,7 +9,6 @@
 
 package engine.powers.effectmodifiers;
 
-import engine.Enum;
 import engine.Enum.DamageType;
 import engine.Enum.GameObjectType;
 import engine.Enum.ModType;
@@ -123,13 +122,9 @@ public class HealthEffectModifier extends AbstractEffectModifier {
                 float spi = (pc.getStatSpiCurrent() >= 1) ? (float) pc.getStatSpiCurrent() : 1f;
                 //				min *= (intt * 0.0045 + 0.055 * (float)Math.sqrt(intt - 0.5) + spi * 0.006 + 0.07 * (float)Math.sqrt(spi - 0.5) + 0.02 * (int)focus);
                 //				max *= (intt * 0.0117 + 0.13 * (float)Math.sqrt(intt - 0.5) + spi * 0.0024 + (float)Math.sqrt(spi - 0.5) * 0.021 + 0.015 * (int)focus);
-
                 min = HealthEffectModifier.getMinDamage(min, intt, spi, focus);
                 max = HealthEffectModifier.getMaxDamage(max, intt, spi, focus);
 
-                //min *= pc.ZergMultiplier;
-                //max *= pc.ZergMultiplier;
-
                 //debug for spell damage and atr
                 if (pc.getDebug(16)) {
                     String smsg = "Damage: " + (int) Math.abs(min) + " - " + (int) Math.abs(max);
@@ -170,16 +165,9 @@ public class HealthEffectModifier extends AbstractEffectModifier {
             PlayerBonuses bonus = source.getBonuses();
 
             // Apply any power effect modifiers (such as stances)
-            if (bonus != null){
-                modAmount *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None));
-            }
+            if (bonus != null)
+                modAmount *= (1 + (bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None)));
         }
-
-        if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
-            float multiplier = ((PlayerCharacter)source).ZergMultiplier;
-            modAmount *= multiplier;
-        }
-
         if (modAmount == 0f)
             return;
         if (AbstractWorldObject.IsAbstractCharacter(awo)) {

src/engine/powers/effectmodifiers/ManaEffectModifier.java

@@ -129,16 +129,9 @@ public class ManaEffectModifier extends AbstractEffectModifier {
             PlayerBonuses bonus = source.getBonuses();
 
             // Apply any power effect modifiers (such as stances)
-            if (bonus != null){
+            if (bonus != null)
                 modAmount *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None));
-            }
-
         }
-
-        if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
-            modAmount *= ((PlayerCharacter)source).ZergMultiplier;
-        }
-
         if (modAmount == 0f)
             return;
         if (AbstractWorldObject.IsAbstractCharacter(awo)) {

src/engine/powers/effectmodifiers/StaminaEffectModifier.java

@@ -125,15 +125,9 @@ public class StaminaEffectModifier extends AbstractEffectModifier {
             PlayerBonuses bonus = source.getBonuses();
 
             // Apply any power effect modifiers (such as stances)
-            if (bonus != null){
-                modAmount *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None));
-            }
+            if (bonus != null)
+                modAmount *= (1 + (bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None)));
         }
-
-        if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
-            modAmount *= ((PlayerCharacter)source).ZergMultiplier;
-        }
-
         if (modAmount == 0f)
             return;
         if (AbstractWorldObject.IsAbstractCharacter(awo)) {

src/engine/powers/poweractions/TransferStatPowerAction.java

@@ -217,13 +217,8 @@ public class TransferStatPowerAction extends AbstractPowerAction {
 
             // Apply any power effect modifiers (such as stances)
             PlayerBonuses bonus = source.getBonuses();
-            if (bonus != null){
+            if (bonus != null)
                 damage *= (1 + bonus.getFloatPercentAll(ModType.PowerDamageModifier, SourceType.None));
-            }
-
-            if(source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
-                damage *= ((PlayerCharacter)source).ZergMultiplier;
-            }
 
             //get amount to transfer
             fromAmount = damage;

src/engine/server/login/LoginServer.java

@@ -281,9 +281,6 @@ public class LoginServer {
         Logger.info("Loading All Realms");
         Realm.loadAllRealms();
 
-        Logger.info("Trashing Multibox Cheaters");
-        DbManager.AccountQueries.TRASH_CHEATERS();
-
         Logger.info("***Boot Successful***");
         return true;
     }

src/engine/server/world/WorldServer.java

@@ -164,17 +164,7 @@ 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;
-			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;
+			outString += " pop: " + SessionManager.getActivePlayerCharacterCount() + " max pop: " + SessionManager._maxPopulation;
 		} catch (Exception e) {
 			Logger.error("Failed to build string");
 		}

src/engine/util/KeyCloneAudit.java

@@ -2,7 +2,6 @@ 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;
@@ -16,43 +15,6 @@ import org.pmw.tinylog.Logger;
 public enum KeyCloneAudit {
     KEYCLONEAUDIT;
 
-    public static boolean auditChatMsg(PlayerCharacter pc, String message) {
-
-        if(pc.selectedUUID == 0)
-            return false;
-
-        int id = pc.selectedUUID;
-        String value = String.valueOf(id);
-        if(message.contains(value)) {
-            //targeting software detected
-
-            Group g = GroupManager.getGroup(pc);
-
-            if (g == null) {
-                try {
-                    Logger.error("TARGET SOFTWARE DETECTED ON ACCOUNT: " + pc.getAccount().getUname());
-                    DbManager.AccountQueries.SET_TRASH(pc.getAccount().getUname(), "TARGET");
-                    pc.getClientConnection().forceDisconnect();
-                }catch(Exception e){
-
-                }
-            }else {
-                for (PlayerCharacter member : g.members) {
-                    try {
-                        Logger.error("TARGET SOFTWARE DETECTED ON ACCOUNT: " + member.getAccount().getUname());
-                        DbManager.AccountQueries.SET_TRASH(member.getAccount().getUname(), "TARGET");
-                        member.getClientConnection().forceDisconnect();
-                    } catch (Exception e) {
-
-                    }
-                }
-            }
-            return true;
-        }
-
-        return false;
-    }
-
     public void audit(PlayerCharacter player, Group group) {
 
         int machineCount = 0;
@@ -67,7 +29,7 @@ public enum KeyCloneAudit {
         if (machineCount > Integer.parseInt(ConfigManager.MB_WORLD_KEYCLONE_MAX.getValue())) {
             Logger.error("Keyclone detected from: " + player.getAccount().getUname() +
                     " with machine count of: " + machineCount);
-            DbManager.AccountQueries.SET_TRASH(machineID,"MEMBERLIMIT");
+            DbManager.AccountQueries.SET_TRASH(machineID);
         }
 
     }
@@ -76,18 +38,11 @@ public enum KeyCloneAudit {
         try {
             TargetObjectMsg tarMsg = (TargetObjectMsg) msg;
             ClientConnection origin = (ClientConnection) msg.getOrigin();
-
             long now = System.currentTimeMillis();
 
-            if (PlayerCharacter.getPlayerCharacter(tarMsg.getTargetID()) == null)
+            if (tarMsg.getTargetType() != MBServerStatics.MASK_PLAYER)
                 return;
 
-            PlayerCharacter pc = origin.getPlayerCharacter();
-            pc.selectedUUID = tarMsg.getTargetID();
-
-            if(pc.getObjectUUID() == tarMsg.getTargetID())
-                return; //dont trigger for targeting yourself
-
             if (System.currentTimeMillis() > origin.finalStrikeRefresh) {
                 origin.lastStrike = System.currentTimeMillis();
                 origin.strikes = 0;
@@ -104,10 +59,8 @@ public enum KeyCloneAudit {
             if (origin.strikes > 20) {
                 origin.finalStrikes++;
             }
-            if (origin.finalStrikes > 3) {
-                origin.forceDisconnect();
-                DbManager.AccountQueries.SET_TRASH(pc.getAccount().getUname(), "TABSPEED");
-                Logger.error("TAB SPEED DETECTED ON ACCOUNT: " + pc.getAccount().getUname());
+            if (origin.finalStrikes > 3) {origin.forceDisconnect();
+                DbManager.AccountQueries.SET_TRASH(origin.machineID);
             }
         } catch (Exception e) {
 

src/engine/workthreads/HourlyJobThread.java

@@ -53,8 +53,10 @@ public class HourlyJobThread implements Runnable {
             Logger.error("missing city map");
         }
 
-        //run mines every day at 1:00 am CST
-        if(LocalDateTime.now().getHour() == 1) {
+        //run maintenance every day at 2 am
+        if(LocalDateTime.now().getHour() == 2) {
+            MaintenanceManager.dailyMaintenance();
+
             //produce mine resources once a day
             for (Mine mine : Mine.getMines()) {
                 try {
@@ -66,11 +68,6 @@ public class HourlyJobThread implements Runnable {
             }
         }
 
-        //run maintenance every day at 2 am
-        if(LocalDateTime.now().getHour() == 2) {
-            MaintenanceManager.dailyMaintenance();
-        }
-
         switch(LocalDateTime.now().getHour()){
             case 3:
             case 6:
@@ -97,27 +94,5 @@ public class HourlyJobThread implements Runnable {
                 bane.setDefaultTime();
             }
         }
-
-        try{
-            Logger.info("Trashing Multibox Cheaters");
-            DbManager.AccountQueries.TRASH_CHEATERS();
-
-            //disconnect all players who were banned and are still in game
-            for(PlayerCharacter pc : SessionManager.getAllActivePlayers()){
-                Account account = pc.getClientConnection().getAccount();
-                if(account == null)
-                    continue;
-                try {
-                    boolean banned = DbManager.AccountQueries.GET_ACCOUNT(account.getUname()).status.equals(Enum.AccountStatus.BANNED);
-                    if (banned) {
-                        pc.getClientConnection().forceDisconnect();
-                    }
-                }catch(Exception e){
-                    Logger.error(e.getMessage());
-                }
-            }
-        }catch(Exception e){
-            Logger.error("Failed To Run Ban Multibox Abusers");
-        }
     }
 }

src/engine/workthreads/UpdateThread.java

@@ -45,12 +45,18 @@ public class UpdateThread implements Runnable {
     public void run() {
         lastRun = System.currentTimeMillis();
         while (true) {
-            try {
+            if (System.currentTimeMillis() >= lastRun + instancedelay) { // Correct condition
                 this.processPlayerUpdate();
-                Thread.sleep(100); // Pause for 100ms to reduce CPU usage
-            } catch (InterruptedException e) {
-                Logger.error("Thread interrupted", e);
+                lastRun = System.currentTimeMillis(); // Update lastRun after processing
+            }else {
+                try {
+                    Thread.sleep(100); // Pause for 100ms to reduce CPU usage
+                } catch (InterruptedException e) {
+                    Logger.error("Thread interrupted", e);
+                    Thread.currentThread().interrupt();
+                }
             }
+            Thread.yield();
         }
     }