move to point handler revert

src/engine/Enum.java

@@ -139,8 +139,8 @@ public class Enum {
         HALFGIANTMALE(2010, MonsterType.HalfGiant, RunSpeed.STANDARD, CharacterSex.MALE, 1.15f),
         HUMANMALE(2011, MonsterType.Human, RunSpeed.STANDARD, CharacterSex.MALE, 1),
         HUMANFEMALE(2012, MonsterType.Human, RunSpeed.STANDARD, CharacterSex.FEMALE, 1),
-        IREKEIMALE(2013, MonsterType.Irekei, RunSpeed.IREKEI, CharacterSex.MALE, 1.1f),
+        IREKEIMALE(2013, MonsterType.Irekei, RunSpeed.STANDARD, CharacterSex.MALE, 1.1f),
-        IREKEIFEMALE(2014, MonsterType.Irekei, RunSpeed.IREKEI, CharacterSex.FEMALE, 1.1f),
+        IREKEIFEMALE(2014, MonsterType.Irekei, RunSpeed.STANDARD, CharacterSex.FEMALE, 1.1f),
         SHADEMALE(2015, MonsterType.Shade, RunSpeed.STANDARD, CharacterSex.MALE, 1),
         SHADEFEMALE(2016, MonsterType.Shade, RunSpeed.STANDARD, CharacterSex.FEMALE, 1),
         MINOMALE(2017, MonsterType.Minotaur, RunSpeed.MINOTAUR, CharacterSex.MALE, 1.3f),
@@ -172,8 +172,6 @@ public class Enum {
         }
 
         public static RaceType getRaceTypebyRuneID(int runeID) {
-            if(runeID == 1999)
-                return _raceTypeByID.get(2017);
             return _raceTypeByID.get(runeID);
         }
 
@@ -210,8 +208,8 @@ public class Enum {
         SENTINEL(0, 0, 0, 0, 0, 0, 0),
         STANDARD(6.1900001f, 13.97f, 4.2199998f, 13.97f, 6.3299999f, 18.379999f, 6.5f),
         CENTAUR(6.1900001f, 16.940001f, 5.5500002f, 16.940001f, 6.3299999f, 18.379999f, 6.5f),
-        MINOTAUR(6.6300001f, 15.95f, 4.2199998f, 15.95f, 6.3299999f, 18.379999f, 6.5f),
+        MINOTAUR(6.6300001f, 15.95f, 4.2199998f, 15.95f, 6.3299999f, 18.379999f, 6.5f);
-        IREKEI(6.499500105f, 14.6685f, 4.2199998f, 14.6685f, 6.3299999f, 18.379999f, 6.5f);
+
         private float walkStandard;
         private float walkCombat;
         private float runStandard;
@@ -778,7 +776,6 @@ public class Enum {
         Combat,
         Spires,
         Snare,
-        Snared,
         Stun,
         Blind,
         Root,
@@ -881,7 +878,6 @@ public class Enum {
         Siege,
         Slash,
         Snare,
-        Snared,
         Sorcery,
         Spear,
         SpearMastery,
@@ -961,17 +957,6 @@ public class Enum {
         Wizardry;
 
         public static SourceType GetSourceType(String modName) {
-            switch(modName){
-                case "Slashing":
-                    modName = "Slash";
-                    break;
-                case "Crushing":
-                    modName = "Crush";
-                    break;
-                case "Piercing":
-                    modName = "Pierce";
-                    break;
-            }
             SourceType returnMod;
             if (modName.isEmpty())
                 return SourceType.None;
@@ -1031,7 +1016,6 @@ public class Enum {
         Silence,
         Slash,
         Snare,
-        Snared,
         Stance,
         Stun,
         Summon,
@@ -1090,15 +1074,6 @@ public class Enum {
         DamageShield,
         DeathShroud,
         DefenseBuff,
-        DefenseBuffAss,
-        DefenseBuffChn,
-        DefenseBuffDsr,
-        DefenseBuffFur,
-        DefenseBuffNec,
-        DefenseBuffNsr,
-        DefenseBuffPrl,
-        DefenseBuffRng,
-        DefenseBuffWiz,
         DefenseBuffGroup,
         DefenseDebuff,
         DetectInvis,
@@ -1165,7 +1140,6 @@ public class Enum {
         SkillDebuff,
         SlashResistanceDebuff,
         Snare,
-        Snared,
         StackableAttrCONBuff,
         StackableAttrDEXBuff,
         StackableAttrSTRBuff,
@@ -2332,9 +2306,9 @@ public class Enum {
 
     public enum CityBoundsType {
 
-        GRID(544),
+        GRID(640),
-        ZONE(672),
+        ZONE(875),
-        PLACEMENT(673);
+        PLACEMENT(876);
 
         public final float extents;
 
@@ -2848,7 +2822,6 @@ public class Enum {
 
     public enum MobBehaviourType {
         None(null, false, false, false, false, false),
-        //Power
         Power(null, false, true, true, true, false),
         PowerHelpee(Power, false, true, true, false, true),
         PowerHelpeeWimpy(Power, true, false, true, false, false),
@@ -2873,6 +2846,7 @@ public class Enum {
         //Independent Types
         SimpleStandingGuard(null, false, false, false, false, false),
         Pet1(null, false, false, true, false, false),
+        SiegeEngine(null, false, false, false, false, false),
         Simple(null, false, false, true, false, false),
         Helpee(null, false, true, true, false, true),
         HelpeeWimpy(null, true, false, true, false, false),
@@ -2883,13 +2857,12 @@ public class Enum {
         HamletGuard(null, false, true, false, false, false),
         AggroWanderer(null, false, false, true, false, false);
 
-        private static HashMap<Integer, MobBehaviourType> _behaviourTypes = new HashMap<>();
+        public final MobBehaviourType BehaviourHelperType;
-        public MobBehaviourType BehaviourHelperType;
+        public final boolean isWimpy;
-        public boolean isWimpy;
+        public final boolean isAgressive;
-        public boolean isAgressive;
+        public final boolean canRoam;
-        public boolean canRoam;
+        public final boolean callsForHelp;
-        public boolean callsForHelp;
+        public final boolean respondsToCallForHelp;
-        public boolean respondsToCallForHelp;
 
         MobBehaviourType(MobBehaviourType helpeebehaviourType, boolean wimpy, boolean agressive, boolean canroam, boolean callsforhelp, boolean respondstocallforhelp) {
             this.BehaviourHelperType = helpeebehaviourType;
@@ -2904,8 +2877,11 @@ public class Enum {
 
     public enum AIAgentType {
         MOBILE,
+        GUARDCAPTAIN,
+        GUARDMINION,
+        GUARDWALLARCHER,
         PET,
         CHARMED,
-        GUARD;
+        SIEGEENGINE;
     }
 }

src/engine/InterestManagement/InterestManager.java

@@ -19,7 +19,10 @@ import engine.net.AbstractNetMsg;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
-import engine.net.client.msg.*;
+import engine.net.client.msg.LoadCharacterMsg;
+import engine.net.client.msg.LoadStructureMsg;
+import engine.net.client.msg.MoveToPointMsg;
+import engine.net.client.msg.UnloadObjectsMsg;
 import engine.objects.*;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
@@ -137,7 +140,7 @@ public enum InterestManager implements Runnable {
 
             else {
                 if (pc != null)
-                    if (pcc.getSeeInvis() < pc.getHidden())
+                    if (pcc.getSeeInvis() < pc.hidden)
                         continue;
 
                 if (!cc.sendMsg(uom)) {
@@ -337,7 +340,7 @@ public enum InterestManager implements Runnable {
                     if (loadedPlayer.getObjectUUID() == player.getObjectUUID())
                         continue;
 
-                    if (player.getSeeInvis() < loadedPlayer.getHidden())
+                    if (player.getSeeInvis() < loadedPlayer.hidden)
                         continue;
 
                     if (loadedPlayer.safemodeInvis())
@@ -369,7 +372,7 @@ public enum InterestManager implements Runnable {
 
             if (playerLoadedObject.getObjectType().equals(GameObjectType.PlayerCharacter)) {
                 PlayerCharacter loadedPlayer = (PlayerCharacter) playerLoadedObject;
-                if (player.getSeeInvis() < loadedPlayer.getHidden())
+                if (player.getSeeInvis() < loadedPlayer.hidden)
                     toRemove.add(playerLoadedObject);
                 else if (loadedPlayer.safemodeInvis())
                     toRemove.add(playerLoadedObject);
@@ -434,7 +437,7 @@ public enum InterestManager implements Runnable {
 
                     // dont load if invis
 
-                    if (player.getSeeInvis() < awopc.getHidden())
+                    if (player.getSeeInvis() < awopc.hidden)
                         continue;
 
                     lcm = new LoadCharacterMsg(awopc, PlayerCharacter.hideNonAscii());
@@ -464,7 +467,7 @@ public enum InterestManager implements Runnable {
                     if (awonpc.despawned == true)
                         continue;
 
-                    awonpc.playerAgroMap.put(player.getObjectUUID(), false);
+                    awonpc.playerAgroMap.put(player.getObjectUUID(), 0f);
                     ((Mob) awonpc).setCombatTarget(null);
                     lcm = new LoadCharacterMsg(awonpc, PlayerCharacter.hideNonAscii());
 
@@ -477,7 +480,7 @@ public enum InterestManager implements Runnable {
                     if (!awonpc.isAlive())
                         continue;
 
-                    awonpc.playerAgroMap.put(player.getObjectUUID(), false);
+                    awonpc.playerAgroMap.put(player.getObjectUUID(), 0f);
 
                     if ((awonpc.agentType.equals(Enum.AIAgentType.MOBILE)))
                         ((Mob) awonpc).setCombatTarget(null);
@@ -518,10 +521,10 @@ public enum InterestManager implements Runnable {
 
         // Update loaded upbjects lists
 
-        player.isBoxed = PlayerCharacter.checkIfBoxed(player);
         player.setDirtyLoad(true);
         updateStaticList(player, origin);
         updateMobileList(player, origin);
+
     }
 
     public synchronized void HandleLoadForTeleport(PlayerCharacter playerCharacter) {

src/engine/db/handlers/dbBaneHandler.java

@@ -10,13 +10,17 @@
 package engine.db.handlers;
 
 import engine.gameManager.DbManager;
-import engine.gameManager.ZoneManager;
+import engine.objects.Bane;
-import engine.math.Vector3fImmutable;
+import engine.objects.Building;
-import engine.objects.*;
+import engine.objects.City;
+import engine.objects.PlayerCharacter;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;
 
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
 
 public class dbBaneHandler extends dbHandlerBase {
 
@@ -85,139 +89,6 @@ public class dbBaneHandler extends dbHandlerBase {
         return true;
     }
 
-    public boolean SET_BANE_TIME_NEW(int hour, int cityUUID) {
-        hour += 12; // Adjust hour
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement getStatement = connection.prepareStatement("SELECT `placementDate`, `liveDate` FROM `dyn_banes` WHERE `cityUUID`=?");
-             PreparedStatement updateStatement = connection.prepareStatement("UPDATE `dyn_banes` SET `liveDate`=?, `time_set`=? WHERE `cityUUID`=?")) {
-
-            // Retrieve placementDate and liveDate
-            getStatement.setInt(1, cityUUID);
-            try (ResultSet rs = getStatement.executeQuery()) {
-                if (rs.next()) {
-                    DateTime placementDate = new DateTime(rs.getTimestamp("placementDate").getTime());
-                    Timestamp liveDateTimestamp = rs.getTimestamp("liveDate");
-
-                    // Explicitly check if liveDate is null
-                    DateTime toSet;
-                    if (liveDateTimestamp == null) {
-                        // If liveDate is null, default to placementDate
-                        toSet = placementDate;
-                    } else {
-                        // If liveDate is not null, use it
-                        DateTime liveDate = new DateTime(liveDateTimestamp.getTime());
-                        toSet = liveDate;
-                    }
-
-                    // Adjust the time
-                    toSet = toSet.withHourOfDay(hour).withMinuteOfHour(0).withSecondOfMinute(0).withMillisOfSecond(0);
-
-                    // Update liveDate and time_set flag
-                    updateStatement.setTimestamp(1, new java.sql.Timestamp(toSet.getMillis()));
-                    updateStatement.setInt(2, 1); // time_set flag
-                    updateStatement.setInt(3, cityUUID);
-
-                    updateStatement.execute();
-                    return true;
-                }
-            }
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public boolean SET_BANE_DAY_NEW(int dayOffset, int cityUUID) {
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement getStatement = connection.prepareStatement("SELECT `placementDate`, `liveDate` FROM `dyn_banes` WHERE `cityUUID`=?");
-             PreparedStatement updateStatement = connection.prepareStatement("UPDATE `dyn_banes` SET `liveDate`=?, `day_set`=? WHERE `cityUUID`=?")) {
-
-            // Retrieve placementDate and liveDate
-            getStatement.setInt(1, cityUUID);
-            try (ResultSet rs = getStatement.executeQuery()) {
-                if (rs.next()) {
-                    DateTime placementDate = new DateTime(rs.getTimestamp("placementDate").getTime());
-                    Timestamp liveDateTimestamp = rs.getTimestamp("liveDate");
-
-                    // Explicitly check if liveDate is null
-                    DateTime liveDate;
-                    if (liveDateTimestamp == null) {
-                        // If liveDate is null, default to placementDate
-                        liveDate = placementDate;
-                    } else {
-                        // If liveDate is not null, use it
-                        liveDate = new DateTime(liveDateTimestamp.getTime());
-                    }
-
-                    // Calculate the new liveDate while preserving the time component
-                    DateTime updatedDate = placementDate.plusDays(dayOffset)
-                            .withHourOfDay(liveDate.getHourOfDay())
-                            .withMinuteOfHour(liveDate.getMinuteOfHour())
-                            .withSecondOfMinute(liveDate.getSecondOfMinute())
-                            .withMillisOfSecond(liveDate.getMillisOfSecond());
-
-                    // Update liveDate and day_set flag
-                    updateStatement.setTimestamp(1, new java.sql.Timestamp(updatedDate.getMillis()));
-                    updateStatement.setInt(2, 1); // day_set flag
-                    updateStatement.setInt(3, cityUUID);
-
-                    updateStatement.execute();
-                    return true;
-                }
-            }
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-
-
-
-    public boolean SET_BANE_CAP_NEW(int count, int cityUUID) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `dyn_banes` SET `cap_size`=? WHERE `cityUUID`=?")) {
-
-            preparedStatement.setInt(1, count);
-            preparedStatement.setLong(2, cityUUID);
-
-            preparedStatement.execute();
-
-        } catch (SQLException e) {
-            Logger.error(e);
-            return false;
-        }
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `dyn_banes` SET `cap_set`=? WHERE `cityUUID`=?")) {
-
-            preparedStatement.setInt(1, 1);
-            preparedStatement.setLong(2, cityUUID);
-
-            preparedStatement.execute();
-
-        } catch (SQLException e) {
-            Logger.error(e);
-            return false;
-        }
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `dyn_banes` SET `cap_size`=? WHERE `cityUUID`=?")) {
-
-            preparedStatement.setInt(1, count);
-            preparedStatement.setLong(2, cityUUID);
-
-            preparedStatement.execute();
-
-        } catch (SQLException e) {
-            Logger.error(e);
-            return false;
-        }
-        return true;
-    }
-
     public boolean REMOVE_BANE(Bane bane) {
 
         if (bane == null)
@@ -236,25 +107,4 @@ public class dbBaneHandler extends dbHandlerBase {
 
         return true;
     }
-
-    public DateTime getLiveDate(int cityUUID) {
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement statement = connection.prepareStatement("SELECT `liveDate` FROM `dyn_banes` WHERE `cityUUID`=?")) {
-
-            statement.setInt(1, cityUUID);
-
-            try (ResultSet rs = statement.executeQuery()) {
-                if (rs.next()) {
-                    Timestamp liveDateTimestamp = rs.getTimestamp("liveDate");
-                    if (liveDateTimestamp != null) {
-                        return new DateTime(liveDateTimestamp.getTime());
-                    }
-                }
-            }
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return null; // Return null if liveDate is not found or an error occurs
-    }
 }

src/engine/db/handlers/dbCityHandler.java

@@ -11,7 +11,10 @@ package engine.db.handlers;
 
 import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.objects.*;
+import engine.objects.AbstractGameObject;
+import engine.objects.Building;
+import engine.objects.City;
+import engine.objects.Zone;
 import org.pmw.tinylog.Logger;
 
 import java.sql.*;
@@ -92,16 +95,7 @@ public class dbCityHandler extends dbHandlerBase {
 
         return objectList;
     }
-    public Integer GET_CAPITAL_CITY_COUNT() {
 
-        int cityCount = 0;
-        for(Realm realm : Realm._realms.values()){
-            if(realm.isRuled())
-                cityCount ++;
-        }
-
-        return cityCount;
-    }
     public ArrayList<City> GET_CITIES_BY_ZONE(final int objectUUID) {
 
         ArrayList<City> cityList = new ArrayList<>();

src/engine/db/handlers/dbContractHandler.java

@@ -98,54 +98,32 @@ public class dbContractHandler extends dbHandlerBase {
 
     public void LOAD_SELL_LIST_FOR_CONTRACT(final Contract contract) {
 
-        if(!contract.getName().contains("Sage")) {
+        try (Connection connection = DbManager.getConnection();
-            try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_npc_contract_selltype` WHERE `contractID` = ?;")) {
-                 PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_npc_contract_selltype` WHERE `contractID` = ?;")) {
 
-                preparedStatement.setInt(1, contract.getObjectUUID());
+            preparedStatement.setInt(1, contract.getObjectUUID());
 
-                ResultSet rs = preparedStatement.executeQuery();
+            ResultSet rs = preparedStatement.executeQuery();
 
-                while (rs.next()) {
+            while (rs.next()) {
 
-                    int type = rs.getInt("type");
+                int type = rs.getInt("type");
-                    int value = rs.getInt("value");
+                int value = rs.getInt("value");
 
-                    switch (type) {
+                switch (type) {
-                        case 1:
+                    case 1:
-                            contract.getBuyItemType().add(value);
-                            break;
-                        case 2:
-                            contract.getBuySkillToken().add(value);
-                            break;
-                        case 3:
-                            contract.getBuyUnknownToken().add(value);
-                            break;
-                    }
-                }
-            } catch (SQLException e) {
-                Logger.error(e);
-            }
-        }else{
-            try (Connection connection = DbManager.getConnection();
-                 PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_npc_contract_selltype`;")) {
-
-                ResultSet rs = preparedStatement.executeQuery();
-
-                while (rs.next()) {
-                    int value = rs.getInt("value");
-                    if(!contract.getBuySkillToken().contains(value))
-                        contract.getBuySkillToken().add(value);
-
-                    if(!contract.getBuyItemType().contains(value))
                         contract.getBuyItemType().add(value);
-
+                        break;
-                    if(!contract.getBuyUnknownToken().contains(value))
+                    case 2:
+                        contract.getBuySkillToken().add(value);
+                        break;
+                    case 3:
                         contract.getBuyUnknownToken().add(value);
+                        break;
                 }
-            } catch (SQLException e) {
-                Logger.error(e);
             }
+        } catch (SQLException e) {
+            Logger.error(e);
         }
     }
 

src/engine/db/handlers/dbHandlerBase.java

@@ -32,6 +32,7 @@ public abstract class dbHandlerBase {
         try {
             if (rs.next()) {
                 abstractGameObject = localClass.getConstructor(ResultSet.class).newInstance(rs);
+
                 DbManager.addToCache(abstractGameObject);
             }
         } catch (Exception e) {
@@ -56,28 +57,12 @@ public abstract class dbHandlerBase {
             while (rs.next()) {
 
                 int id = rs.getInt(1);
-                try {
-                    if (rs.getInt("capSize") == 0) {
-                        continue;
-                    }
-                }catch(Exception e){
-                    //not a mine
-                }
 
                 if (DbManager.inCache(localObjectType, id)) {
                     objectList.add((T) DbManager.getFromCache(localObjectType, id));
                 } else {
-                    try{
-                        if(rs.getInt("mineLiveHour") == 1)
-                            continue;
-                    }catch(Exception e){
-                        //not a mine
-                    }
                     AbstractGameObject toAdd = localClass.getConstructor(ResultSet.class).newInstance(rs);
                     DbManager.addToCache(toAdd);
-                    if(toAdd.getObjectType().equals(GameObjectType.Zone) && rs.getInt("canLoad") == 0){
-                        continue;
-                    }
                     objectList.add((T) toAdd);
 
                     if (toAdd != null && toAdd instanceof AbstractWorldObject)

src/engine/db/handlers/dbItemHandler.java

@@ -496,18 +496,4 @@ public class dbItemHandler extends dbHandlerBase {
             return false;
         }
     }
-
-    public boolean UPDATE_NUM_ITEMS(final Item item, int newValue) {
-        if (item.getItemBase().getType().equals(ItemType.GOLD))
-            return false;
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_numberOfItems`=? WHERE `UID`=?")) {
-            preparedStatement.setInt(1, newValue);
-            preparedStatement.setLong(2, item.getObjectUUID());
-            return (preparedStatement.executeUpdate() > 0);
-        } catch (SQLException e) {
-            Logger.error(e);
-            return false;
-        }
-    }
 }

src/engine/db/handlers/dbMobHandler.java

@@ -28,31 +28,27 @@ public class dbMobHandler extends dbHandlerBase {
         this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
-    public Mob ADD_MOB(Mob toAdd) {
+    public Mob PERSIST(Mob toAdd) {
 
         Mob mobile = null;
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("CALL `mob_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("CALL `mob_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);")) {
 
-            preparedStatement.setLong(1, toAdd.getParentZoneID());
+            preparedStatement.setLong(1, toAdd.parentZoneUUID);
-            preparedStatement.setInt(2, toAdd.getMobBaseID());
+            preparedStatement.setInt(2, toAdd.loadID);
-            preparedStatement.setInt(3, toAdd.getGuildUUID());
+            preparedStatement.setInt(3, toAdd.guildUUID);
-            preparedStatement.setFloat(4, toAdd.getSpawnX());
+            preparedStatement.setFloat(4, toAdd.bindLoc.x);
-            preparedStatement.setFloat(5, toAdd.getSpawnY());
+            preparedStatement.setFloat(5, toAdd.bindLoc.y);
-            preparedStatement.setFloat(6, toAdd.getSpawnZ());
+            preparedStatement.setFloat(6, toAdd.bindLoc.z);
             preparedStatement.setInt(7, 0);
-            preparedStatement.setFloat(8, toAdd.getSpawnRadius());
+            preparedStatement.setFloat(8, toAdd.spawnRadius);
-            preparedStatement.setInt(9, toAdd.getTrueSpawnTime());
+            preparedStatement.setInt(9, toAdd.spawnTime);
-
+            preparedStatement.setInt(10, toAdd.contractUUID);
-            if (toAdd.getContract() != null)
+            preparedStatement.setInt(11, toAdd.buildingUUID);
-                preparedStatement.setInt(10, toAdd.getContract().getContractID());
+            preparedStatement.setInt(12, toAdd.level);
-            else
+            preparedStatement.setString(13, toAdd.firstName);
-                preparedStatement.setInt(10, 0);
+            preparedStatement.setString(14, toAdd.behaviourType.toString());
-
-            preparedStatement.setInt(11, toAdd.getBuildingID());
-            preparedStatement.setInt(12, toAdd.getLevel());
-            preparedStatement.setString(13, toAdd.getFirstName());
 
             ResultSet rs = preparedStatement.executeQuery();
 
@@ -106,17 +102,17 @@ public class dbMobHandler extends dbHandlerBase {
         return row_count;
     }
 
-    public void LOAD_PATROL_POINTS(Mob captain) {
+    public void LOAD_GUARD_MINIONS(Mob guardCaptain) {
 
         try (Connection connection = DbManager.getConnection();
              PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_guards` WHERE `captainUID` = ?")) {
 
-            preparedStatement.setInt(1, captain.getObjectUUID());
+            preparedStatement.setInt(1, guardCaptain.getObjectUUID());
             ResultSet rs = preparedStatement.executeQuery();
 
             while (rs.next()) {
-                String name = rs.getString("name");
+                String minionName = rs.getString("minionName");
-                Mob toCreate = Mob.createGuardMob(captain, captain.getGuild(), captain.getParentZone(), captain.building.getLoc(), captain.getLevel(), name);
+                Mob toCreate = Mob.createGuardMinion(guardCaptain, guardCaptain.getLevel(), minionName);
 
                 if (toCreate == null)
                     return;
@@ -131,15 +127,13 @@ public class dbMobHandler extends dbHandlerBase {
         }
     }
 
-    public boolean ADD_TO_GUARDS(final long captainUID, final int mobBaseID, final String name, final int slot) {
+    public boolean ADD_GUARD_MINION(final long captainUID, final String minionName) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_guards` (`captainUID`, `mobBaseID`,`name`, `slot`) VALUES (?,?,?,?)")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_guards` (`captainUID`, `minionName`) VALUES (?,?)")) {
 
             preparedStatement.setLong(1, captainUID);
-            preparedStatement.setInt(2, mobBaseID);
+            preparedStatement.setString(2, minionName);
-            preparedStatement.setString(3, name);
-            preparedStatement.setInt(4, slot);
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -149,14 +143,13 @@ public class dbMobHandler extends dbHandlerBase {
         }
     }
 
-    public boolean REMOVE_FROM_GUARDS(final long captainUID, final int mobBaseID, final int slot) {
+    public boolean REMOVE_GUARD_MINION(final long captainUID, final String minionName) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=? AND `mobBaseID`=? AND `slot` =?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=? AND `minionName`=? LIMIT 1;")) {
 
             preparedStatement.setLong(1, captainUID);
-            preparedStatement.setInt(2, mobBaseID);
+            preparedStatement.setString(2, minionName);
-            preparedStatement.setInt(3, slot);
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -166,6 +159,20 @@ public class dbMobHandler extends dbHandlerBase {
         }
     }
 
+    public boolean REMOVE_ALL_MINIONS(final long captainUID) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=?;")) {
+
+            preparedStatement.setLong(1, captainUID);
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+            return false;
+        }
+    }
 
     public ArrayList<Mob> GET_ALL_MOBS_FOR_ZONE(Zone zone) {
 

src/engine/db/handlers/dbNPCHandler.java

@@ -131,32 +131,6 @@ public class dbNPCHandler extends dbHandlerBase {
         return npc;
     }
 
-    public int BANE_COMMANDER_EXISTS(final int objectUUID) {
-
-        int uid = 0;
-
-        String query = "SELECT `UID` FROM `obj_npc` WHERE `npc_buildingID` = ? LIMIT 1;";
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement(query)) {
-
-            preparedStatement.setInt(1, objectUUID);
-
-            try (ResultSet rs = preparedStatement.executeQuery()) {
-                if (rs.next()) {
-                    // Retrieve the UID column value
-                    uid = rs.getInt("UID");
-                }
-            }
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-
-        return uid;
-    }
-
-
     public int MOVE_NPC(long npcID, long parentID, float locX, float locY, float locZ) {
 
         int rowCount;
@@ -202,18 +176,6 @@ public class dbNPCHandler extends dbHandlerBase {
         return result;
     }
 
-    public static void updateSpecialPricing(final NPC npc){
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE obj_npc SET specialPrice=? WHERE UID = ?")) {
-            preparedStatement.setInt(1, npc.getSpecialPrice());
-            preparedStatement.setInt(2, npc.getDBID());
-
-            preparedStatement.executeUpdate();
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-    }
     public void updateDatabase(final NPC npc) {
 
         try (Connection connection = DbManager.getConnection();

src/engine/db/handlers/dbPowerHandler.java

@@ -15,15 +15,9 @@ import engine.gameManager.PowersManager;
 import engine.objects.Mob;
 import engine.objects.PreparedStatementShared;
 import engine.powers.EffectsBase;
-import engine.powers.MobPowerEntry;
 import org.pmw.tinylog.Logger;
 
-import java.sql.Connection;
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 
 public class dbPowerHandler extends dbHandlerBase {
@@ -86,43 +80,4 @@ public class dbPowerHandler extends dbHandlerBase {
         }
     }
 
-    public static HashMap<Integer, ArrayList<MobPowerEntry>> LOAD_MOB_POWERS() {
-
-        HashMap<Integer, ArrayList<MobPowerEntry>> mobPowers = new HashMap<>();
-        MobPowerEntry mobPowerEntry;
-
-        int mobbaseID;
-        int recordsRead = 0;
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_npc_mobbase_powers ORDER BY `id` ASC;")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-
-            while (rs.next()) {
-
-                recordsRead++;
-
-                mobbaseID = rs.getInt("mobbaseUUID");
-                mobPowerEntry = new MobPowerEntry(rs);
-
-                if (mobPowers.get(mobbaseID) == null) {
-                    ArrayList<MobPowerEntry> powerList = new ArrayList<>();
-                    powerList.add(mobPowerEntry);
-                    mobPowers.put(mobbaseID, powerList);
-                } else {
-                    ArrayList<MobPowerEntry> powerList = mobPowers.get(mobbaseID);
-                    powerList.add(mobPowerEntry);
-                    mobPowers.put(mobbaseID, powerList);
-                }
-            }
-        } catch (SQLException e) {
-            Logger.error(e);
-            return mobPowers;
-        }
-
-        Logger.info("read: " + recordsRead + " cached: " + mobPowers.size());
-        return mobPowers;
-    }
-
 }

src/engine/db/handlers/dbRuneBaseHandler.java

@@ -11,6 +11,8 @@ package engine.db.handlers;
 
 import engine.gameManager.DbManager;
 import engine.objects.RuneBase;
+import engine.powers.RunePowerEntry;
+import engine.powers.RuneSkillAdjustEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.Connection;
@@ -27,6 +29,84 @@ public class dbRuneBaseHandler extends dbHandlerBase {
         this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
+    public static HashMap<Integer, ArrayList<RunePowerEntry>> LOAD_RUNE_POWERS() {
+
+        HashMap<Integer, ArrayList<RunePowerEntry>> mobPowers = new HashMap<>();
+        RunePowerEntry runePowerEntry;
+
+        int rune_id;
+        int recordsRead = 0;
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_rune_powers")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+
+            while (rs.next()) {
+
+                recordsRead++;
+
+                rune_id = rs.getInt("rune_id");
+                runePowerEntry = new RunePowerEntry(rs);
+
+                if (mobPowers.get(rune_id) == null) {
+                    ArrayList<RunePowerEntry> runePowerList = new ArrayList<>();
+                    runePowerList.add(runePowerEntry);
+                    mobPowers.put(rune_id, runePowerList);
+                } else {
+                    ArrayList<RunePowerEntry> powerList = mobPowers.get(rune_id);
+                    powerList.add(runePowerEntry);
+                    mobPowers.put(rune_id, powerList);
+                }
+            }
+        } catch (SQLException e) {
+            Logger.error(e);
+            return mobPowers;
+        }
+
+        Logger.info("read: " + recordsRead + " cached: " + mobPowers.size());
+        return mobPowers;
+    }
+
+    public static HashMap<Integer, ArrayList<RuneSkillAdjustEntry>> LOAD_RUNE_SKILL_ADJUSTS() {
+
+        HashMap<Integer, ArrayList<RuneSkillAdjustEntry>> runeSkillAdjusts = new HashMap<>();
+        RuneSkillAdjustEntry runeSkillAdjustEntry;
+
+        int rune_id;
+        int recordsRead = 0;
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_rune_skill_adjusts")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+
+            while (rs.next()) {
+
+                recordsRead++;
+
+                rune_id = rs.getInt("rune_id");
+                runeSkillAdjustEntry = new RuneSkillAdjustEntry(rs);
+
+                if (runeSkillAdjusts.get(rune_id) == null) {
+                    ArrayList<RuneSkillAdjustEntry> skillAdjustList = new ArrayList<>();
+                    skillAdjustList.add(runeSkillAdjustEntry);
+                    runeSkillAdjusts.put(rune_id, skillAdjustList);
+                } else {
+                    ArrayList<RuneSkillAdjustEntry> powerList = runeSkillAdjusts.get(rune_id);
+                    powerList.add(runeSkillAdjustEntry);
+                    runeSkillAdjusts.put(rune_id, powerList);
+                }
+            }
+        } catch (SQLException e) {
+            Logger.error(e);
+            return runeSkillAdjusts;
+        }
+
+        Logger.info("read: " + recordsRead + " cached: " + runeSkillAdjusts.size());
+        return runeSkillAdjusts;
+    }
+
     public void GET_RUNE_REQS(final RuneBase rb) {
 
         try (Connection connection = DbManager.getConnection();

src/engine/devcmd/cmds/AddMobCmd.java

@@ -9,6 +9,7 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.ChatManager;
@@ -43,7 +44,7 @@ public class AddMobCmd extends AbstractDevCmd {
                 MobBase mb = (MobBase) mobbaseAGO;
                 int loadID = mb.getObjectUUID();
                 Mob mob = Mob.createMob(loadID, Vector3fImmutable.getRandomPointInCircle(pc.getLoc(), 100),
-                        null, true, zone, null, 0, "", 1);
+                        null, zone, null, null, "", 1, Enum.AIAgentType.MOBILE);
                 if (mob != null) {
                     mob.updateDatabase();
                     this.setResult(String.valueOf(mob.getDBID()));
@@ -84,7 +85,7 @@ public class AddMobCmd extends AbstractDevCmd {
 
 
         Mob mob = Mob.createMob(loadID, pc.getLoc(),
-                null, true, zone, null, 0, "", 1);
+                null, zone, null, null, "", 1, Enum.AIAgentType.MOBILE);
         if (mob != null) {
             mob.updateDatabase();
             ChatManager.chatSayInfo(pc,

src/engine/devcmd/cmds/AddNPCCmd.java

@@ -13,7 +13,6 @@ import engine.Enum.GameObjectType;
 import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.*;
-import engine.math.Vector3fImmutable;
 import engine.objects.*;
 import org.pmw.tinylog.Logger;
 
@@ -32,6 +31,7 @@ public class AddNPCCmd extends AbstractDevCmd {
         int contractID;
         String name = "";
         int level = 0;
+
         if (words.length < 2) {
             this.sendUsage(pc);
             return;
@@ -39,54 +39,59 @@ public class AddNPCCmd extends AbstractDevCmd {
         try {
             contractID = Integer.parseInt(words[0]);
             level = Integer.parseInt(words[1]);
+
             for (int i = 2; i < words.length; i++) {
                 name += words[i];
                 if (i + 1 < words.length)
                     name += "";
             }
+
         } catch (NumberFormatException e) {
             throwbackError(pc,
                     "Failed to parse supplied contractID or level to an Integer.");
             return; // NaN
         }
+
         Contract contract = DbManager.ContractQueries.GET_CONTRACT(contractID);
+
         if (contract == null || level < 1 || level > 75) {
             throwbackError(pc,
                     "Invalid addNPC Command. Need contract ID, and level");
             return; // NaN
         }
+
         // Pick a random name
         if (name.isEmpty())
             name = NPCManager.getPirateName(contract.getMobbaseID());
+
         Zone zone = ZoneManager.findSmallestZone(pc.getLoc());
+
         if (zone == null) {
             throwbackError(pc, "Failed to find zone to place npc in.");
             return;
         }
-        Building building = null;
+
         if (target != null)
             if (target.getObjectType() == GameObjectType.Building) {
-                building = (Building)target;
+                Building parentBuilding = (Building) target;
+                BuildingManager.addHirelingForWorld(parentBuilding, pc, parentBuilding.getLoc(), parentBuilding.getParentZone(), contract, level);
+                return;
             }
-        NPC created;
+
-        Guild guild = null;
+        NPC npc = NPC.createNPC(name, contractID,
-        Vector3fImmutable loc;
+                pc.getLoc(), null, zone, (short) level, null);
-        if(building != null){
+
-            guild = building.getGuild();
+        if (npc != null) {
-            loc = building.loc;
+            WorldGrid.addObject(npc, pc);
-        } else{
+            ChatManager.chatSayInfo(pc,
-            loc = pc.loc;
+                    "NPC with ID " + npc.getDBID() + " added");
+            this.setResult(String.valueOf(npc.getDBID()));
+        } else {
+            throwbackError(pc, "Failed to create npc of contract type "
+                    + contractID);
+            Logger.error(
+                    "Failed to create npc of contract type " + contractID);
         }
-        created = NPC.createNPC(name, contractID, loc, guild, zone, (short)level, building);
-        created.bindLoc = loc;
-        if(building != null) {
-            created.buildingUUID = building.getObjectUUID();
-            created.building = building;
-            NPCManager.slotCharacterInBuilding(created);
-        }
-        created.setLoc(created.bindLoc);
-        created.updateDatabase();
-        throwbackInfo(pc, "Created NPC with UUID: " + created.getObjectUUID());
     }
 
     @Override

src/engine/devcmd/cmds/GimmeCmd.java

@@ -1,63 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.Enum.ItemContainerType;
-import engine.Enum.ItemType;
-import engine.Enum.OwnerType;
-import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.ChatManager;
-import engine.gameManager.DbManager;
-import engine.objects.*;
-import engine.powers.EffectsBase;
-
-import java.util.ArrayList;
-
-/**
- * @author Eighty
- */
-public class GimmeCmd extends AbstractDevCmd {
-
-    public GimmeCmd() {
-        super("gimme");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pc, String[] words,
-                          AbstractGameObject target) {
-        int amt = 0;
-        int currentGold = pc.getCharItemManager().getGoldInventory().getNumOfItems();
-        amt = 10000000 - currentGold;
-        if (!pc.getCharItemManager().addGoldToInventory(amt, true)) {
-            throwbackError(pc, "Failed to add gold to inventory");
-            return;
-        }
-
-        ChatManager.chatSayInfo(pc, amt + " gold added to inventory");
-
-        if(pc.level < 75) {
-            pc.setLevel((short) 75);
-            ChatManager.chatSayInfo(pc, "Level set to 75");
-        }
-        pc.getCharItemManager().updateInventory();
-
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Round up current gold in inventory to 10,000,000";
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "'./gimme";
-    }
-
-}

src/engine/devcmd/cmds/HotzoneCmd.java

@@ -0,0 +1,77 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.ZoneManager;
+import engine.objects.AbstractGameObject;
+import engine.objects.PlayerCharacter;
+
+/**
+ * ./hotzone                      <- display the current hotzone & time remaining
+ * ./hotzone random               <- change hotzone to random new zone
+ */
+
+public class HotzoneCmd extends AbstractDevCmd {
+
+    public HotzoneCmd() {
+        super("hotzone");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter playerCharacter, String[] words,
+                          AbstractGameObject target) {
+
+        StringBuilder data = new StringBuilder();
+        String outString;
+
+        for (String s : words) {
+            data.append(s);
+            data.append(' ');
+        }
+
+        String input = data.toString().trim();
+
+        if (input.length() == 0) {
+            outString = "Current hotZone: " + ZoneManager.hotZone.getName() + "\r\n";
+            outString += "Available hotZones: " + ZoneManager.availableHotZones();
+            throwbackInfo(playerCharacter, outString);
+            return;
+        }
+
+        if (input.equalsIgnoreCase("random")) {
+            ZoneManager.generateAndSetRandomHotzone();
+            outString = "New hotZone: " + ZoneManager.hotZone.getName() + "\r\n";
+            outString += "Available hotZones: " + ZoneManager.availableHotZones();
+            throwbackInfo(playerCharacter, outString);
+            return;
+        }
+
+        if (input.equalsIgnoreCase("reset")) {
+            ZoneManager.resetHotZones();
+            throwbackInfo(playerCharacter, "Available hotZones: " + ZoneManager.availableHotZones());
+            return;
+        }
+
+        return;
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Use no arguments to see the current hotzone or \"random\" to change it randomly.";
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "'./hotzone [random]";
+    }
+
+
+}

src/engine/devcmd/cmds/InfoCmd.java

@@ -337,8 +337,7 @@ public class InfoCmd extends AbstractDevCmd {
                 output += "Swimming : " + targetPC.isSwimming();
                 output += newline;
                 output += "isMoving : " + targetPC.isMoving();
-                output += newline;
+
-                output += "Zerg Multiplier : " + targetPC.ZergMultiplier;
                 break;
 
             case NPC:
@@ -441,7 +440,9 @@ public class InfoCmd extends AbstractDevCmd {
                         output += "isSummonedPet: true";
                     else
                         output += "isSummonedPet: false";
-                    PlayerCharacter owner = targetMob.getOwner();
+
+
+                    PlayerCharacter owner = (PlayerCharacter) targetMob.guardCaptain;
                     if (owner != null)
                         output += "     owner: " + owner.getObjectUUID();
                     output += newline;

src/engine/devcmd/cmds/MineActiveCmd.java

@@ -16,7 +16,6 @@ import engine.objects.AbstractGameObject;
 import engine.objects.Building;
 import engine.objects.Mine;
 import engine.objects.PlayerCharacter;
-import engine.workthreads.HalfHourlyJobThread;
 import engine.workthreads.HourlyJobThread;
 
 /**
@@ -42,10 +41,10 @@ public class MineActiveCmd extends AbstractDevCmd {
         String trigger = args[0];
         switch (trigger) {
             case "true":
-                HalfHourlyJobThread.mineWindowOpen(mine);
+                HourlyJobThread.mineWindowOpen(mine);
                 break;
             case "false":
-                HalfHourlyJobThread.mineWindowClose(mine);
+                HourlyJobThread.mineWindowClose(mine);
                 break;
             default:
                 this.sendUsage(pcSender);

src/engine/devcmd/cmds/PrintStatsCmd.java

@@ -9,7 +9,6 @@
 
 package engine.devcmd.cmds;
 
-import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
 import engine.objects.*;
 
@@ -73,10 +72,6 @@ public class PrintStatsCmd extends AbstractDevCmd {
         out += "Main Hand: atr: " + tar.getAtrHandOne() + ", damage: " + tar.getMinDamageHandOne() + " to " + tar.getMaxDamageHandOne() + ", speed: " + tar.getSpeedHandOne() + newline;
         out += "Off Hand:  atr: " + tar.getAtrHandTwo() + ", damage: " + tar.getMinDamageHandTwo() + " to " + tar.getMaxDamageHandTwo() + ", speed: " + tar.getSpeedHandTwo() + newline;
         out += "isAlive: " + tar.isAlive() + ", Combat: " + tar.isCombat() + newline;
-        out += "Move Speed: " + tar.getSpeed() + newline;
-        out += "Health Regen: " + tar.getRegenModifier(Enum.ModType.HealthRecoverRate) + newline;
-        out += "Mana Regen: " + tar.getRegenModifier(Enum.ModType.ManaRecoverRate) + newline;
-        out += "Stamina Regen: " + tar.getRegenModifier(Enum.ModType.StaminaRecoverRate) + newline;
         throwbackInfo(pc, out);
     }
 
@@ -108,15 +103,19 @@ public class PrintStatsCmd extends AbstractDevCmd {
             main = getWeaponBase(1, equip);
         ItemBase off = null;
 
-        if (equip != null)
+        if(equip != null){
-            getWeaponBase(2, equip);
+           if(equip.get(2) != null && !equip.get(2).getItemBase().isShield()){
-        if (main == null && off == null) {
+                //off hand weapon
-            out += "Main Hand: atr: " + tar.getAtrHandOne() + ", damage: " + tar.getMinDamageHandOne() + " to " + tar.getMaxDamageHandOne() + ", speed: " + tar.getSpeedHandOne() + ", range: 6" + newline;
+                out += "Attack Rating: " + tar.atrHandTwo + newline;
-        } else {
+                out += "Damage: " + tar.minDamageHandTwo + " - " + tar.maxDamageHandTwo + newline;
-            if (main != null)
+                out += "Range: " + tar.rangeHandTwo + newline;
-                out += "Main Hand: atr: " + tar.getAtrHandOne() + ", damage: " + tar.getMinDamageHandOne() + " to " + tar.getMaxDamageHandOne() + ", speed: " + tar.getSpeedHandOne() + ", range: " + main.getRange() + newline;
+               out += "Attack Speed: " + tar.speedHandTwo + newline;
-            if (off != null)
+            } else{
-                out += "Main Hand: atr: " + tar.getAtrHandTwo() + ", damage: " + tar.getMinDamageHandTwo() + " to " + tar.getMaxDamageHandTwo() + ", speed: " + tar.getSpeedHandTwo() + ", range: " + off.getRange() + newline;
+               out += "Attack Rating: " + tar.atrHandOne + newline;
+               out += "Damage: " + tar.minDamageHandOne + " - " + tar.maxDamageHandOne + newline;
+               out += "Range: " + tar.rangeHandOne + newline;
+               out += "Attack Speed: " + tar.speedHandOne + newline;
+            }
         }
         out += "isAlive: " + tar.isAlive() + ", Combat: " + tar.isCombat() + newline;
 

src/engine/devcmd/cmds/PurgeObjectsCmd.java

@@ -59,22 +59,25 @@ public class PurgeObjectsCmd extends AbstractDevCmd {
 
 
                 if (npc != null) {
-                    for (Mob mob : npc.getSiegeMinionMap().keySet()) {
+                    for (Integer minionUUID : npc.minions) {
+                        Mob mob = Mob.getMob(minionUUID);
                         WorldGrid.RemoveWorldObject(mob);
                         WorldGrid.removeObject(mob, pc);
-                        //Mob.getRespawnMap().remove(mob);
+
                         if (mob.getParentZone() != null)
                             mob.getParentZone().zoneMobSet.remove(mob);
                     }
+
                     DbManager.NPCQueries.DELETE_NPC(npc);
                     DbManager.removeFromCache(GameObjectType.NPC,
                             npc.getObjectUUID());
                     WorldGrid.RemoveWorldObject(npc);
                 } else if (mobA != null) {
-                    for (Mob mob : mobA.getSiegeMinionMap().keySet()) {
+                    for (Integer minionUUID : mobA.minions) {
+                        Mob mob = Mob.getMob(minionUUID);
                         WorldGrid.RemoveWorldObject(mob);
                         WorldGrid.removeObject(mob, pc);
-                        //Mob.getRespawnMap().remove(mob);
+
                         if (mob.getParentZone() != null)
                             mob.getParentZone().zoneMobSet.remove(mob);
                     }
@@ -151,10 +154,11 @@ public class PurgeObjectsCmd extends AbstractDevCmd {
 
 
             if (npc != null) {
-                for (Mob mob : npc.getSiegeMinionMap().keySet()) {
+                for (Integer minionUUID : npc.minions) {
+                    Mob mob = Mob.getMob(minionUUID);
                     WorldGrid.RemoveWorldObject(mob);
                     WorldGrid.removeObject(mob, pc);
-                    //Mob.getRespawnMap().remove(mob);
+
                     if (mob.getParentZone() != null)
                         mob.getParentZone().zoneMobSet.remove(mob);
                 }
@@ -163,10 +167,11 @@ public class PurgeObjectsCmd extends AbstractDevCmd {
                         npc.getObjectUUID());
                 WorldGrid.RemoveWorldObject(npc);
             } else if (mobA != null) {
-                for (Mob mob : mobA.getSiegeMinionMap().keySet()) {
+                for (Integer minionUUID : mobA.minions) {
+                    Mob mob = Mob.getMob(minionUUID);
                     WorldGrid.RemoveWorldObject(mob);
                     WorldGrid.removeObject(mob, pc);
-                    //Mob.getRespawnMap().remove(mob);
+
                     if (mob.getParentZone() != null)
                         mob.getParentZone().zoneMobSet.remove(mob);
                 }

src/engine/devcmd/cmds/RemoveObjectCmd.java

@@ -11,7 +11,6 @@ package engine.devcmd.cmds;
 
 import engine.Enum.BuildingGroup;
 import engine.Enum.DbObjectType;
-import engine.Enum.GameObjectType;
 import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.BuildingManager;
@@ -138,49 +137,16 @@ public class RemoveObjectCmd extends AbstractDevCmd {
             Warehouse.warehouseByBuildingUUID.remove(building.getObjectUUID());
         }
 
-
         //remove cached shrines.
         if ((building.getBlueprintUUID() != 0)
                 && (building.getBlueprint().getBuildingGroup() == BuildingGroup.SHRINE))
             Shrine.RemoveShrineFromCacheByBuilding(building);
 
-        for (AbstractCharacter ac : building.getHirelings().keySet()) {
+        // Remove hirelings for this building
-            NPC npc = null;
-            Mob mobA = null;
 
-            if (ac.getObjectType() == GameObjectType.NPC)
+        for (AbstractCharacter abstractCharacter : building.getHirelings().keySet())
-                npc = (NPC) ac;
+            BuildingManager.removeHireling(building, abstractCharacter);
-            else if (ac.getObjectType() == GameObjectType.Mob)
-                mobA = (Mob) ac;
 
-            if (npc != null) {
-                for (Mob mob : npc.getSiegeMinionMap().keySet()) {
-                    WorldGrid.RemoveWorldObject(mob);
-                    WorldGrid.removeObject(mob, pc);
-                    //Mob.getRespawnMap().remove(mob);
-                    if (mob.getParentZone() != null)
-                        mob.getParentZone().zoneMobSet.remove(mob);
-                }
-                DbManager.NPCQueries.DELETE_NPC(npc);
-                DbManager.removeFromCache(npc);
-                WorldGrid.RemoveWorldObject(npc);
-                WorldGrid.removeObject(npc, pc);
-            } else if (mobA != null) {
-                for (Mob mob : mobA.getSiegeMinionMap().keySet()) {
-                    WorldGrid.RemoveWorldObject(mob);
-                    WorldGrid.removeObject(mob, pc);
-                    //Mob.getRespawnMap().remove(mob);
-                    if (mob.getParentZone() != null)
-                        mob.getParentZone().zoneMobSet.remove(mob);
-                }
-                DbManager.MobQueries.DELETE_MOB(mobA);
-                DbManager.removeFromCache(mobA);
-                WorldGrid.RemoveWorldObject(mobA);
-                WorldGrid.removeObject(mobA, pc);
-            }
-
-
-        }
         Zone zone = building.getParentZone();
         DbManager.BuildingQueries.DELETE_FROM_DATABASE(building);
         DbManager.removeFromCache(building);
@@ -209,11 +175,13 @@ public class RemoveObjectCmd extends AbstractDevCmd {
         if (npc.building != null)
             npc.building.getHirelings().remove(npc);
 
-        for (Mob mob : npc.getSiegeMinionMap().keySet()) {
+        for (Integer minionUUID : npc.minions) {
-            WorldGrid.RemoveWorldObject(mob);
+            Mob minionMob = Mob.getMob(minionUUID);
-            WorldGrid.removeObject(mob, pc);
+            WorldGrid.RemoveWorldObject(minionMob);
-            if (mob.getParentZone() != null)
+            WorldGrid.removeObject(minionMob, pc);
-                mob.getParentZone().zoneMobSet.remove(mob);
+
+            if (minionMob.getParentZone() != null)
+                minionMob.getParentZone().zoneMobSet.remove(minionMob);
         }
 
         DbManager.NPCQueries.DELETE_NPC(npc);

src/engine/devcmd/cmds/SetLevelCmd.java

@@ -46,7 +46,7 @@ public class SetLevelCmd extends AbstractDevCmd {
             this.sendUsage(pc);
             return;
         }
-        if (level < 1 || level > 80) {
+        if (level < 1 || level > 75) {
             this.sendHelp(pc);
             return;
         }
@@ -62,7 +62,7 @@ public class SetLevelCmd extends AbstractDevCmd {
 
     @Override
     protected String _getHelpString() {
-        return "Sets your character's level to 'amount'.  'amount' must be between 1-80";
+        return "Sets your character's level to 'amount'.  'amount' must be between 1-75";
     }
 
     @Override

src/engine/devcmd/cmds/SetSubRaceCmd.java

@@ -159,7 +159,7 @@ public class SetSubRaceCmd extends AbstractDevCmd {
         //			pum.setEffectID(token);
         //			pum.setSourceType(pc.getObjectType().ordinal());
         //			pum.setSourceID(pc.getObjectUUID());
-        //			pum.setTargetType(pc.getObjectType().ordinal());
+        //			pum.setStartLocType(pc.getObjectType().ordinal());
         //			pum.setTargetID(pc.getObjectUUID());
         //			pum.setNumTrains(40);
         //			pum.setDuration(-1);

src/engine/devcmd/cmds/SimulateBootyCmd.java

@@ -10,8 +10,6 @@ import java.util.ArrayList;
 import java.util.concurrent.ThreadLocalRandom;
 
 public class SimulateBootyCmd extends AbstractDevCmd {
-
-    public int simCount = 250;
     public SimulateBootyCmd() {
         super("bootysim");
     }
@@ -27,15 +25,7 @@ public class SimulateBootyCmd extends AbstractDevCmd {
 
         String output;
 
-        try
+        output = "Booty Simulation:" + newline;
-        {
-            simCount = Integer.parseInt(words[0]);
-        }catch(Exception e)
-        {
-
-        }
-
-        output = "Booty Simulation: Rolls:" + simCount + newline;
 
         Mob mob = (Mob) target;
         output += "Name: " + mob.getName() + newline;
@@ -54,7 +44,6 @@ public class SimulateBootyCmd extends AbstractDevCmd {
         ArrayList<Item> Resources = new ArrayList<Item>();
         ArrayList<Item> Runes = new ArrayList<Item>();
         ArrayList<Item> Contracts = new ArrayList<Item>();
-        ArrayList<Item> GuardContracts = new ArrayList<Item>();
         ArrayList<Item> Offerings = new ArrayList<Item>();
         ArrayList<Item> OtherDrops = new ArrayList<Item>();
         ArrayList<Item> EquipmentDrops = new ArrayList<Item>();
@@ -62,17 +51,14 @@ public class SimulateBootyCmd extends AbstractDevCmd {
         int failures = 0;
         int goldAmount = 0;
 
-        for (int i = 0; i < simCount; ++i) {
+        for (int i = 0; i < 100; ++i) {
 
             try {
                 mob.loadInventory();
                 for (Item lootItem : mob.getCharItemManager().getInventory()) {
                     switch (lootItem.getItemBase().getType()) {
                         case CONTRACT: //CONTRACT
-                            if(lootItem.getName().contains("Captain"))
+                            Contracts.add(lootItem);
-                                GuardContracts.add(lootItem);
-                            else
-                                Contracts.add(lootItem);
                             break;
                         case OFFERING: //OFFERING
                             Offerings.add(lootItem);
@@ -144,17 +130,9 @@ public class SimulateBootyCmd extends AbstractDevCmd {
             }
         }
 
-        int baseBound = 100000;
-        int levelPenalty = (int) (Math.max(0, Math.abs(50 - mob.level)) * 0.01 * 100000);
-        int totalRange = baseBound + levelPenalty;
-        if(mob.level >= 50){
-            totalRange = baseBound;
-        }
-        output += "TOTAL ROLL POTENTIAL: " + totalRange + newline;
         output += "GLASS DROPS: " + GlassItems.size() + newline;
         output += "RUNE DROPS: " + Runes.size() + newline;
         output += "CONTRACTS DROPS: " + Contracts.size() + newline;
-        output += "GUARD CONTRACTS DROPS: " + GuardContracts.size() + newline;
         output += "RESOURCE DROPS: " + Resources.size() + newline;
         output += "OFFERINGS DROPPED: " + Offerings.size() + newline;
         output += "ENCHANTED ITEMS DROPPED: " + OtherDrops.size() + newline;

src/engine/devcmd/cmds/SplatMobCmd.java

@@ -1,5 +1,6 @@
 package engine.devcmd.cmds;
 
+import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.ZoneManager;
 import engine.math.Vector3fImmutable;
@@ -110,7 +111,7 @@ public class SplatMobCmd extends AbstractDevCmd {
 
                 mobile = Mob.createMob(_mobileUUID,
                         Vector3fImmutable.getRandomPointInCircle(_currentLocation, _targetRange),
-                        null, true, serverZone, null, 0, "", 1);
+                        null, serverZone, null, null, "", 1, Enum.AIAgentType.MOBILE);
 
                 if (mobile != null) {
                     mobile.updateDatabase();

src/engine/devcmd/cmds/aiInfoCmd.java

@@ -9,12 +9,17 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.PowersManager;
+import engine.mobileAI.MobAI;
 import engine.objects.AbstractGameObject;
 import engine.objects.Mob;
 import engine.objects.PlayerCharacter;
+import engine.powers.RunePowerEntry;
 
+import java.util.ArrayList;
 import java.util.Map;
 
 
@@ -56,36 +61,95 @@ public class aiInfoCmd extends AbstractDevCmd {
         Mob mob = (Mob) target;
         output = "Mob AI Information:" + newline;
         output += mob.getName() + newline;
-        if (mob.BehaviourType != null) {
+        output += mob.agentType.toString() + newline;
-            output += "BehaviourType: " + mob.BehaviourType.toString() + newline;
+
-            if (mob.BehaviourType.BehaviourHelperType != null) {
+        int contractID = 0;
-                output += "Behaviour Helper Type: " + mob.BehaviourType.BehaviourHelperType.toString() + newline;
+
+        if (mob.isPlayerGuard() == true) {
+
+            if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION))
+                contractID = mob.guardCaptain.contract.getContractID();
+            else
+                contractID = mob.contract.getContractID();
+        }
+
+        if (contractID != 0) {
+
+            if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION)) {
+                output += "Captain Contract: " + contractID + newline;
+                output += "Captain UUID: " + mob.guardCaptain.getObjectUUID() + newline;
+            } else
+                output += "Contract: " + contractID + newline;
+        }
+
+        if (mob.behaviourType != null) {
+            output += "BehaviourType: " + mob.behaviourType.toString() + newline;
+            if (mob.behaviourType.BehaviourHelperType != null) {
+                output += "Behaviour Helper Type: " + mob.behaviourType.BehaviourHelperType.toString() + newline;
             } else {
                 output += "Behaviour Helper Type: NULL" + newline;
-                }
+            }
-                output += "Wimpy: " + mob.BehaviourType.isWimpy + newline;
+            output += "Wimpy: " + mob.behaviourType.isWimpy + newline;
-                output += "Agressive: " + mob.BehaviourType.isAgressive + newline;
+            output += "Agressive: " + mob.behaviourType.isAgressive + newline;
-                output += "Can Roam: " + mob.BehaviourType.canRoam + newline;
+            output += "Can Roam: " + mob.behaviourType.canRoam + newline;
-                output += "Calls For Help: " + mob.BehaviourType.callsForHelp + newline;
+            output += "Calls For Help: " + mob.behaviourType.callsForHelp + newline;
-                output += "Responds To Call For Help: " + mob.BehaviourType.respondsToCallForHelp + newline;
+            output += "Responds To Call For Help: " + mob.behaviourType.respondsToCallForHelp + newline;
-            } else {
+        } else {
-                output += "BehaviourType: NULL" + newline;
+            output += "BehaviourType: NULL" + newline;
             }
             output += "Aggro Range: " + mob.getAggroRange() + newline;
             output += "Player Aggro Map Size: " + mob.playerAgroMap.size() + newline;
         if (mob.playerAgroMap.size() > 0) {
             output += "Players Loaded:" + newline;
         }
-        for (Map.Entry<Integer, Boolean> entry : mob.playerAgroMap.entrySet()) {
+        for (Map.Entry<Integer, Float> entry : mob.playerAgroMap.entrySet()) {
-            output += "Player ID: " + entry.getKey() + " Hate Value: " + (PlayerCharacter.getPlayerCharacter(entry.getKey())).getHateValue() + newline;
+            output += "Player ID: " + entry.getKey() + " Hate Value: " + entry.getValue() + newline;
         }
         if (mob.getCombatTarget() != null)
             output += "Current Target: " + mob.getCombatTarget().getName() + newline;
         else
             output += "Current Target: NULL" + newline;
 
-        for (int token : mob.mobPowers.keySet())
+        if (mob.guardedCity != null)
-            output += token + newline;
+            output += "Patrolling: " + mob.guardedCity.getCityName() + newline;
+        output += "See Invis Level: "  + mob.mobBase.getSeeInvis() + newline;
+        output += "Can Cast: " + MobAI.canCast(mob) + newline;
+        output += "Powers:" + newline;
+
+        ArrayList<RunePowerEntry> powerEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.getMobBaseID()));
+
+        // Additional powers may come from the contract ID.  This is to support
+        // powers for player guards irrespective of the mobbase used.
+
+        if (mob.isPlayerGuard()) {
+
+            ArrayList<RunePowerEntry> contractEntries = new ArrayList<>();
+
+            if (mob.contract != null)
+                contractEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.contractUUID));
+
+            if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION))
+                contractEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.guardCaptain.contractUUID));
+
+            powerEntries.addAll(contractEntries);
+
+        }
+
+        for (RunePowerEntry runePowerEntry : powerEntries)
+            output += PowersManager.getPowerByToken(runePowerEntry.token).getName() + newline;
+
+        // List outlaws defined for this player guard's city
+
+        if (mob.isPlayerGuard()) {
+
+            ArrayList<Integer> outlaws = new ArrayList(mob.guardedCity.cityOutlaws);
+
+            if (outlaws.isEmpty() == false)
+                output += "Outlaws: " + newline;
+
+            for (Integer outlawUUID : outlaws)
+                output += outlawUUID + newline;
+        }
 
         throwbackInfo(playerCharacter, output);
     }

src/engine/gameManager/ArenaManager.java

@@ -1,158 +0,0 @@
-package engine.gameManager;
-
-import engine.Enum;
-import engine.InterestManagement.WorldGrid;
-import engine.exception.MsgSendException;
-import engine.math.Vector3f;
-import engine.math.Vector3fImmutable;
-import engine.objects.*;
-import engine.server.MBServerStatics;
-import org.pmw.tinylog.Logger;
-
-import java.util.*;
-import java.util.concurrent.ThreadLocalRandom;
-
-public class ArenaManager {
-    private static final List<Arena> activeArenas = new ArrayList<>();
-    public static final List<PlayerCharacter> playerQueue = new ArrayList<>();
-    public static Long pulseDelay = 180000L;
-    public static Long lastExecution = 0L;
-
-    public static void pulseArenas() {
-        if(lastExecution == 0L){
-            lastExecution = System.currentTimeMillis();
-        }
-
-        if(activeArenas.isEmpty() && playerQueue.isEmpty())
-            return;
-
-        Iterator<Arena> iterator = activeArenas.iterator();
-
-        while (iterator.hasNext()) {
-            Arena arena = iterator.next();
-            if (arena.checkToComplete()) {
-                iterator.remove();
-            }
-        }
-
-        if(lastExecution + pulseDelay > System.currentTimeMillis())
-            return;
-
-        lastExecution = System.currentTimeMillis();
-
-        while (playerQueue.size() > 1) {
-            createArena();
-        }
-    }
-
-    public static void joinQueue(PlayerCharacter player) {
-        if (!playerQueue.contains(player)) {
-            playerQueue.add(player);
-        }
-    }
-
-    public static void leaveQueue(PlayerCharacter player) {
-        playerQueue.remove(player);
-    }
-
-    private static void createArena() {
-        if (playerQueue.size() > 1) {
-
-            Collections.shuffle(playerQueue);
-            Arena newArena = new Arena();
-
-            //set starting time
-            newArena.startTime = System.currentTimeMillis();
-
-            //decide an arena location
-            newArena.loc = selectRandomArenaLocation();
-
-            // Assign players to the arena
-            newArena.player1 = playerQueue.remove(0);
-            newArena.player2 = playerQueue.remove(0);
-
-            // Teleport players to the arena location
-            Zone sdr = ZoneManager.getZoneByUUID(656);
-            MovementManager.translocate(newArena.player1, Vector3fImmutable.getRandomPointOnCircle(newArena.loc,75f), null);
-            MovementManager.translocate(newArena.player2, Vector3fImmutable.getRandomPointOnCircle(newArena.loc,75f), null);
-
-            // Add the new arena to the active arenas list
-            activeArenas.add(newArena);
-        }
-    }
-
-    public static void endArena(Arena arena, PlayerCharacter winner, PlayerCharacter loser, String condition){
-        if (winner != null && loser != null) {
-            Logger.info("[ARENA] The fight between {} and {} is concluded. Victor: {}",
-                    arena.player1.getName(), arena.player2.getName(), winner.getName());
-        } else {
-            Logger.info("[ARENA] The fight between {} and {} is concluded. No Winner Declared.",
-                    arena.player1.getName(), arena.player2.getName());
-        }
-        // Teleport players to the arena location
-        Zone sdr = ZoneManager.getZoneByUUID(656);
-        MovementManager.translocate(arena.player1, Vector3fImmutable.getRandomPointOnCircle(sdr.getLoc(),50f), null);
-        MovementManager.translocate(arena.player2, Vector3fImmutable.getRandomPointOnCircle(sdr.getLoc(),50f), null);
-
-
-
-        activeArenas.remove(arena);
-
-        if(winner != null){
-            ChatManager.chatPVP("[ARENA] " + winner.getName() + " has slain " + loser.getName() + " in the arena!");
-            //handle prize distribution
-            //ItemBase specialLoot = ItemBase.getItemBase(866);
-            //Item promoted = new MobLoot(winner, specialLoot, 1, false).promoteToItem(winner);
-            //promoted.setNumOfItems(21235);
-            //promoted.setName("Special Banker(21235)");
-            //DbManager.ItemQueries.UPDATE_NUM_ITEMS(promoted,21235);
-            //winner.getCharItemManager().addItemToInventory(promoted);
-            //winner.getCharItemManager().updateInventory();
-        }
-    }
-
-    public static Vector3fImmutable selectRandomArenaLocation() {
-        boolean locSet = false;
-        Vector3fImmutable loc = Vector3fImmutable.ZERO;
-
-        while (!locSet) {
-            try {
-                float x = ThreadLocalRandom.current().nextInt(114300, 123600);
-                float z = ThreadLocalRandom.current().nextInt(82675, 91700);
-                float y = 0; // Y coordinate is always 0
-
-                loc = new Vector3fImmutable(x, y, z * -1);
-                HashSet<AbstractWorldObject> inRange = WorldGrid.getObjectsInRangePartial(loc,500f, MBServerStatics.MASK_PLAYER);
-                if(inRange.isEmpty() && !isUnderWater(loc))
-                    locSet = true;
-                //}
-            }catch(Exception e){
-
-            }
-        }
-
-        return loc;
-    }
-
-    public static boolean isUnderWater(Vector3fImmutable loc) {
-
-        try {
-
-            Zone zone = ZoneManager.findSmallestZone(loc);
-
-            if (zone.getSeaLevel() != 0) {
-
-                float localAltitude = loc.y;
-                if (localAltitude < zone.getSeaLevel())
-                    return true;
-            } else {
-                if (loc.y < 0)
-                    return true;
-            }
-        } catch (Exception e) {
-
-        }
-
-        return false;
-    }
-}

src/engine/gameManager/BuildingManager.java

@@ -308,6 +308,72 @@ public enum BuildingManager {
 
     }
 
+    public static void removeHireling(Building building, AbstractCharacter hireling) {
+
+        if (hireling.getObjectType().equals(GameObjectType.Mob)) {
+
+            Mob guardCaptain = (Mob) hireling;
+
+            // Clear minions from database if a guard captain
+
+            if (guardCaptain.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN))
+                DbManager.MobQueries.REMOVE_ALL_MINIONS(hireling.getObjectUUID());
+        }
+
+        // Clear minions from world
+
+        for (Integer minionUUID : hireling.minions) {
+            Mob minionMob = Mob.getMob(minionUUID);
+            DbManager.removeFromCache(minionMob);
+            WorldGrid.RemoveWorldObject(minionMob);
+            WorldGrid.unloadObject(minionMob);
+
+            if (minionMob.getParentZone() != null)
+                minionMob.getParentZone().zoneMobSet.remove(minionMob);
+        }
+
+        // Remove hireling from building
+
+        building.getHirelings().remove(hireling);
+
+        // Remove from zone mob set
+
+        if (hireling.getObjectType().equals(GameObjectType.Mob)) {
+
+            Mob hirelingMob = (Mob) hireling;
+
+            if (hirelingMob.getParentZone() != null)
+                if (hirelingMob.getParentZone().zoneMobSet.contains(hirelingMob))
+                    hirelingMob.getParentZone().zoneMobSet.remove(hireling);
+
+        }
+
+        if (hireling.getObjectType().equals(GameObjectType.NPC)) {
+
+            NPC hirelingNPC = (NPC) hireling;
+
+            if (hirelingNPC.getParentZone() != null)
+                if (hirelingNPC.getParentZone().zoneNPCSet.contains(hirelingNPC))
+                    hirelingNPC.getParentZone().zoneNPCSet.remove(hireling);
+
+        }
+
+        // Unload hireling from world
+
+        DbManager.removeFromCache(hireling);
+        WorldGrid.RemoveWorldObject(hireling);
+        WorldGrid.removeObject(hireling);
+
+        // Delete hireling from database
+
+        if (hireling.getObjectType().equals(GameObjectType.Mob))
+            DbManager.MobQueries.DELETE_MOB((Mob) hireling);
+        else
+            DbManager.NPCQueries.DELETE_NPC((NPC) hireling);
+
+    }
+
+
     public static void cleanupHirelings(Building building) {
 
         // Early exit:  Cannot have hirelings in a building
@@ -320,42 +386,18 @@ public enum BuildingManager {
 
         if (building.getRank() < 1) {
 
-            for (AbstractCharacter slottedNPC : building.getHirelings().keySet()) {
+            for (AbstractCharacter slottedNPC : building.getHirelings().keySet())
+                BuildingManager.removeHireling(building, slottedNPC);
 
-                if (slottedNPC.getObjectType() == Enum.GameObjectType.NPC)
-                    ((NPC) slottedNPC).remove();
-                else if (slottedNPC.getObjectType() == Enum.GameObjectType.Mob)
-                    NPCManager.removeMobileFromBuilding(((Mob) slottedNPC), building);
-            }
             return;
         }
 
         // Delete hireling if building has deranked.
+
         for (AbstractCharacter hireling : building.getHirelings().keySet()) {
 
-            NPC npc = null;
-            Mob mob = null;
-
-            if (hireling.getObjectType() == Enum.GameObjectType.NPC)
-                npc = (NPC) hireling;
-            else if (hireling.getObjectType() == Enum.GameObjectType.Mob)
-                mob = (Mob) hireling;
-
             if (building.getHirelings().get(hireling) > building.getBlueprint().getSlotsForRank(building.getRank()))
-
+                BuildingManager.removeHireling(building, hireling);
-                if (npc != null) {
-                    if (!npc.remove())
-                        Logger.error("Failed to remove npc " + npc.getObjectUUID()
-                                + "from Building " + building.getObjectUUID());
-                    else
-                        building.getHirelings().remove(npc);
-                } else if (mob != null) {
-                    if (!NPCManager.removeMobileFromBuilding(mob, building))
-                        Logger.error("Failed to remove npc " + npc.getObjectUUID()
-                                + "from Building " + building.getObjectUUID());
-                    else
-                        building.getHirelings().remove(npc);
-                }
 
         }
 
@@ -438,18 +480,6 @@ public enum BuildingManager {
 
     public static boolean IsPlayerHostile(Building building, PlayerCharacter player) {
 
-        if(building.getBlueprint() != null && building.getBlueprint().getBuildingGroup() != null && building.getBlueprint().getBuildingGroup().equals(BuildingGroup.BANESTONE))
-        {
-            Guild playerNation = player.guild.getNation();
-            City banedCity = ZoneManager.getCityAtLocation(building.loc);
-            if(banedCity != null){
-                if(banedCity.getGuild().getNation().equals(playerNation)){
-                    return false;
-                }else{
-                    return true;
-                }
-            }
-        }
         //Nation Members and Guild members are not hostile.
         //		if (building.getGuild() != null){
         //			if (pc.getGuild() != null)
@@ -532,30 +562,7 @@ public enum BuildingManager {
         if (building.getBlueprintUUID() == 0)
             return false;
 
-        if(building.getBlueprint().getBuildingGroup().equals(BuildingGroup.TOL)){
+        if (building.getBlueprint().getMaxSlots() == building.getHirelings().size())
-            if(contract.getContractID() == 850) {
-                boolean hasRunemaster = false;
-                for (AbstractCharacter npc : building.getHirelings().keySet()) {
-
-                    if (npc.getObjectType() != GameObjectType.NPC)
-                        continue;
-
-                    if(npc.contractUUID == 850)
-                        hasRunemaster = true;
-                }
-
-                if(hasRunemaster)
-                    return false;
-            }
-        }
-
-
-        int maxSlots = building.getBlueprint().getMaxSlots();
-        if(building.getBlueprint().getBuildingGroup() != null) {
-            maxSlots = building.getBlueprint().getSlotsForRank(building.getRank());
-        }
-
-        if (maxSlots == building.getHirelings().size())
             return false;
 
         String pirateName = NPCManager.getPirateName(contract.getMobbaseID());
@@ -565,41 +572,63 @@ public enum BuildingManager {
         else
             rank = 10;
 
-        Mob mob;
+        Mob mobile;
         NPC npc;
 
         if (NPC.ISWallArcher(contract)) {
 
-            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), true, zone, building, contract.getContractID(), pirateName, rank);
+            mobile = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, building, contract, pirateName, rank, Enum.AIAgentType.GUARDWALLARCHER);
 
-            if (mob == null)
+            if (mobile == null)
                 return false;
 
-            mob.setLoc(mob.getLoc());
+            // Configure AI and write new mobile to disk
+
+            mobile.behaviourType = Enum.MobBehaviourType.GuardWallArcher;
+            mobile = DbManager.MobQueries.PERSIST(mobile);
+
+            // Spawn new mobile
+
+            mobile.setLoc(mobile.getLoc());
 
             return true;
         }
 
         if (NPC.ISGuardCaptain(contract.getContractID())) {
 
-            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), true, zone, building, contract.getContractID(), pirateName, rank);
+            mobile = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, building, contract, pirateName, rank, Enum.AIAgentType.GUARDCAPTAIN);
 
-            if (mob == null)
+            if (mobile == null)
                 return false;
 
-            mob.setLoc(mob.getLoc());
+            // Configure AI and write new mobile to disk
+
+            mobile.behaviourType = Enum.MobBehaviourType.GuardCaptain;
+            mobile = DbManager.MobQueries.PERSIST(mobile);
+
+            // Spawn new mobile
+
+            mobile.setLoc(mobile.getLoc());
 
             return true;
         }
+
         if (contract.getContractID() == 910) {
 
             //guard dog
-            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), true, zone, building, contract.getContractID(), pirateName, rank);
+            mobile = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, building, contract, pirateName, rank, Enum.AIAgentType.GUARDCAPTAIN);
 
-            if (mob == null)
+            if (mobile == null)
                 return false;
 
-            mob.setLoc(mob.getLoc());
+            // Configure AI and write new mobile to disk
+
+            mobile.behaviourType = Enum.MobBehaviourType.GuardCaptain;
+            mobile = DbManager.MobQueries.PERSIST(mobile);
+
+            // Spawn new mobile
+
+            mobile.setLoc(mobile.getLoc());
 
             return true;
         }

src/engine/gameManager/ChatManager.java

@@ -788,7 +788,7 @@ public enum ChatManager {
                         it.remove();
                     else {
                         PlayerCharacter pcc = (PlayerCharacter) awo;
-                        if (pcc.getSeeInvis() < pc.getHidden())
+                        if (pcc.getSeeInvis() < pc.hidden)
                             it.remove();
                     }
                 }

src/engine/gameManager/CombatManager.java

@@ -30,8 +30,6 @@ import java.util.HashSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
 
-import static engine.math.FastMath.sqr;
-
 public enum CombatManager {
 
     COMBATMANAGER;
@@ -41,63 +39,6 @@ public enum CombatManager {
     /**
      * Message sent by player to attack something.
      */
-    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 == GameObjectType.PlayerCharacter.ordinal()) {
-            target = PlayerCharacter.getFromCache(msg.getTargetID());
-        } else if (targetType == GameObjectType.Building.ordinal()) {
-            target = BuildingManager.getBuildingFromCache(msg.getTargetID());
-        } else if (targetType == 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);
-
-        //put in combat if not already
-
-        if (!player.isCombat())
-            toggleCombat(true, origin);
-
-        //make character stand if sitting
-
-        if (player.isSit())
-            toggleSit(false, origin);
-
-        AttackTarget(player, target);
-
-    }
 
     public static void AttackTarget(PlayerCharacter playerCharacter, AbstractWorldObject target) {
 
@@ -141,11 +82,6 @@ public enum CombatManager {
             if (off == null)
                 CombatManager.createTimer(playerCharacter, MBServerStatics.SLOT_OFFHAND, 1, true); // attack in 0.1 of a second
         }
-
-        City playerCity = ZoneManager.getCityAtLocation(playerCharacter.getLoc());
-
-        if (playerCity != null && playerCity.getGuild().getNation().equals(playerCharacter.getGuild().getNation()) == false && playerCity.cityOutlaws.contains(playerCharacter.getObjectUUID()) == false)
-            playerCity.cityOutlaws.add(playerCharacter.getObjectUUID());
     }
 
     public static void setAttackTarget(PetAttackMsg msg, ClientConnection origin) throws MsgSendException {
@@ -523,7 +459,7 @@ public enum CombatManager {
     /**
      * Attempt to attack target
      */
-    private static void attack(AbstractCharacter ac, AbstractWorldObject target, Item weapon, ItemBase wb, boolean mainHand) {
+    private static void attack(AbstractCharacter attacker, AbstractWorldObject target, Item weapon, ItemBase wb, boolean mainHand) {
 
         float atr;
         int minDamage, maxDamage;
@@ -531,20 +467,20 @@ public enum CombatManager {
 
         try {
 
-            if (ac == null)
+            if (attacker == null)
                 return;
 
             if (target == null)
                 return;
 
             if (mainHand) {
-                atr = ac.getAtrHandOne();
+                atr = attacker.getAtrHandOne();
-                minDamage = ac.getMinDamageHandOne();
+                minDamage = attacker.getMinDamageHandOne();
-                maxDamage = ac.getMaxDamageHandOne();
+                maxDamage = attacker.getMaxDamageHandOne();
             } else {
-                atr = ac.getAtrHandTwo();
+                atr = attacker.getAtrHandTwo();
-                minDamage = ac.getMinDamageHandTwo();
+                minDamage = attacker.getMinDamageHandTwo();
-                maxDamage = ac.getMaxDamageHandTwo();
+                maxDamage = attacker.getMaxDamageHandTwo();
             }
 
             boolean tarIsRat = false;
@@ -563,9 +499,9 @@ public enum CombatManager {
             //Dont think we need to do this anymore.
 
             if (tarIsRat)
-                if (ac.getBonuses().getFloatPercentAll(ModType.Slay, SourceType.Rat) != 0) {   //strip away current % dmg buffs then add with rat %
+                if (attacker.getBonuses().getFloatPercentAll(ModType.Slay, SourceType.Rat) != 0) {   //strip away current % dmg buffs then add with rat %
 
-                    float percent = 1 + ac.getBonuses().getFloatPercentAll(ModType.Slay, SourceType.Rat);
+                    float percent = 1 + attacker.getBonuses().getFloatPercentAll(ModType.Slay, SourceType.Rat);
 
                     minDamage *= percent;
                     maxDamage *= percent;
@@ -576,24 +512,24 @@ public enum CombatManager {
             //subtract stamina
 
             if (wb == null)
-                ac.modifyStamina(-0.5f, ac, true);
+                attacker.modifyStamina(-0.5f, attacker, true);
             else {
                 float stam = wb.getWeight() / 3;
                 stam = (stam < 1) ? 1 : stam;
-                ac.modifyStamina(-(stam), ac, true);
+                attacker.modifyStamina(-(stam), attacker, true);
             }
 
-            ac.cancelOnAttackSwing();
+            attacker.cancelOnAttackSwing();
 
             errorTrack = 2;
 
             //set last time this player has attacked something.
 
-            if (target.getObjectType().equals(GameObjectType.PlayerCharacter) && target.getObjectUUID() != ac.getObjectUUID() && ac.getObjectType() == GameObjectType.PlayerCharacter) {
+            if (target.getObjectType().equals(GameObjectType.PlayerCharacter) && target.getObjectUUID() != attacker.getObjectUUID() && attacker.getObjectType() == GameObjectType.PlayerCharacter) {
-                ac.setTimeStamp("LastCombatPlayer", System.currentTimeMillis());
+                attacker.setTimeStamp("LastCombatPlayer", System.currentTimeMillis());
                 ((PlayerCharacter) target).setTimeStamp("LastCombatPlayer", System.currentTimeMillis());
             } else
-                ac.setTimeStamp("LastCombatMob", System.currentTimeMillis());
+                attacker.setTimeStamp("LastCombatMob", System.currentTimeMillis());
 
             errorTrack = 3;
 
@@ -604,73 +540,46 @@ public enum CombatManager {
             if (target.getObjectType().equals(GameObjectType.Building)) {
 
                 if (BuildingManager.getBuildingFromCache(target.getObjectUUID()) == null) {
-                    ac.setCombatTarget(null);
+                    attacker.setCombatTarget(null);
                     return;
                 }
 
                 defense = 0;
 
-                Building building = (Building) target;
-
-                if (building.getParentZone() != null && building.getParentZone().isPlayerCity()) {
-
-                    if (System.currentTimeMillis() > building.getTimeStamp("CallForHelp")) {
-
-                        building.getTimestamps().put("CallForHelp", System.currentTimeMillis() + 15000);
-
-                        for (Mob mob : building.getParentZone().zoneMobSet) {
-                            if (!mob.isPlayerGuard())
-                                continue;
-
-                            if (mob.getCombatTarget() != null)
-                                continue;
-
-                            if (mob.getGuild() != null && building.getGuild() != null)
-                                if (!Guild.sameGuild(mob.getGuild().getNation(), building.getGuild().getNation()))
-                                    continue;
-
-                            if (mob.getLoc().distanceSquared2D(building.getLoc()) > sqr(300))
-                                continue;
-
-                            mob.setCombatTarget(ac);
-                        }
-                    }
-                }
             } else {
                 AbstractCharacter tar = (AbstractCharacter) target;
                 defense = tar.getDefenseRating();
-                handleRetaliate(tar, ac);   //Handle target attacking back if in combat and has no other target
+                handleRetaliate(tar, attacker);   //Handle target attacking back if in combat and has no other target
             }
 
             errorTrack = 4;
 
             //Get hit chance
 
-            //int chance;
+            int chance;
             float dif = atr - defense;
 
-            //if (dif > 100)
+            if (dif > 100)
-            //    chance = 94;
+                chance = 94;
-            //else if (dif < -100)
+            else if (dif < -100)
-            //    chance = 4;
+                chance = 4;
-            //else
+            else
-            //    chance = (int) ((0.45 * dif) + 49);
+                chance = (int) ((0.45 * dif) + 49);
 
             errorTrack = 5;
 
             //calculate hit/miss
 
+            int roll = ThreadLocalRandom.current().nextInt(100);
             DeferredPowerJob dpj = null;
 
+            if (roll < chance) {
 
-
+                if (attacker.getObjectType().equals(GameObjectType.PlayerCharacter))
-            if (LandHit((int)atr,(int)defense)) {
+                    updateAttackTimers((PlayerCharacter) attacker, target, true);
-
-                if (ac.getObjectType().equals(GameObjectType.PlayerCharacter))
-                    updateAttackTimers((PlayerCharacter) ac, target, true);
 
                 boolean skipPassives = false;
-                PlayerBonuses bonuses = ac.getBonuses();
+                PlayerBonuses bonuses = attacker.getBonuses();
 
                 if (bonuses != null && bonuses.getBool(ModType.IgnorePassiveDefense, SourceType.None))
                     skipPassives = true;
@@ -685,26 +594,26 @@ public enum CombatManager {
                 // Apply Weapon power effect if any. don't try to apply twice if
                 // dual wielding. Perform after passive test for sync purposes.
 
-                if (ac.getObjectType().equals(GameObjectType.PlayerCharacter) && (mainHand || wb.isTwoHanded())) {
+                if (attacker.getObjectType().equals(GameObjectType.PlayerCharacter) && (mainHand || wb.isTwoHanded())) {
 
-                    dpj = ((PlayerCharacter) ac).getWeaponPower();
+                    dpj = ((PlayerCharacter) attacker).getWeaponPower();
 
                     if (dpj != null) {
 
-                        PlayerBonuses bonus = ac.getBonuses();
+                        PlayerBonuses bonus = attacker.getBonuses();
                         float attackRange = getWeaponRange(wb, bonus);
                         dpj.attack(target, attackRange);
 
                         if (dpj.getPower() != null && (dpj.getPowerToken() == -1851459567 || dpj.getPowerToken() == -1851489518))
-                            ((PlayerCharacter) ac).setWeaponPower(dpj);
+                            ((PlayerCharacter) attacker).setWeaponPower(dpj);
                     }
                 }
 
                 //check to apply second backstab.
 
-                if (ac.getObjectType().equals(GameObjectType.PlayerCharacter) && !mainHand) {
+                if (attacker.getObjectType().equals(GameObjectType.PlayerCharacter) && !mainHand) {
 
-                    dpj = ((PlayerCharacter) ac).getWeaponPower();
+                    dpj = ((PlayerCharacter) attacker).getWeaponPower();
 
                     if (dpj != null && dpj.getPower() != null && (dpj.getPowerToken() == -1851459567 || dpj.getPowerToken() == -1851489518)) {
                         float attackRange = getWeaponRange(wb, bonuses);
@@ -724,24 +633,24 @@ public enum CombatManager {
 
                         //Handle Block passive
 
-                        if (testPassive(ac, tarAc, "Block") && canTestBlock(ac, target)) {
+                        if (testPassive(attacker, tarAc, "Block") && canTestBlock(attacker, target)) {
 
                             if (!target.isAlive())
                                 return;
 
-                            sendPassiveDefenseMessage(ac, wb, target, MBServerStatics.COMBAT_SEND_BLOCK, dpj, mainHand);
+                            sendPassiveDefenseMessage(attacker, wb, target, MBServerStatics.COMBAT_SEND_BLOCK, dpj, mainHand);
                             passiveFired = true;
                         }
 
                         //Handle Parry passive
 
                         if (!passiveFired)
-                            if (canTestParry(ac, target) && testPassive(ac, tarAc, "Parry")) {
+                            if (canTestParry(attacker, target) && testPassive(attacker, tarAc, "Parry")) {
 
                                 if (!target.isAlive())
                                     return;
 
-                                sendPassiveDefenseMessage(ac, wb, target, MBServerStatics.COMBAT_SEND_PARRY, dpj, mainHand);
+                                sendPassiveDefenseMessage(attacker, wb, target, MBServerStatics.COMBAT_SEND_PARRY, dpj, mainHand);
                                 passiveFired = true;
                             }
 
@@ -752,12 +661,12 @@ public enum CombatManager {
                     //Handle Dodge passive
 
                     if (!passiveFired)
-                        if (testPassive(ac, tarAc, "Dodge")) {
+                        if (testPassive(attacker, tarAc, "Dodge")) {
 
                             if (!target.isAlive())
                                 return;
 
-                            sendPassiveDefenseMessage(ac, wb, target, MBServerStatics.COMBAT_SEND_DODGE, dpj, mainHand);
+                            sendPassiveDefenseMessage(attacker, wb, target, MBServerStatics.COMBAT_SEND_DODGE, dpj, mainHand);
                             passiveFired = true;
                         }
                 }
@@ -773,7 +682,7 @@ public enum CombatManager {
                 //if target is player, set last attack timestamp
 
                 if (target.getObjectType().equals(GameObjectType.PlayerCharacter))
-                    updateAttackTimers((PlayerCharacter) target, ac, false);
+                    updateAttackTimers((PlayerCharacter) target, attacker, false);
 
                 //Get damage Type
 
@@ -781,7 +690,7 @@ public enum CombatManager {
 
                 if (wb != null)
                     damageType = wb.getDamageType();
-                else if (ac.getObjectType().equals(GameObjectType.Mob) && ((Mob) ac).isSiege())
+                else if (attacker.getObjectType().equals(GameObjectType.Mob) && ((Mob) attacker).isSiege())
                     damageType = DamageType.Siege;
                 else
                     damageType = DamageType.Crush;
@@ -800,7 +709,7 @@ public enum CombatManager {
                 //make sure target is not immune to damage type;
 
                 if (resists != null && resists.immuneTo(damageType)) {
-                    sendCombatMessage(ac, target, 0f, wb, dpj, mainHand);
+                    sendCombatMessage(attacker, target, 0f, wb, dpj, mainHand);
                     return;
                 }
 
@@ -811,9 +720,9 @@ public enum CombatManager {
                 float damage;
 
                 if (wb != null)
-                    damage = calculateDamage(ac, tarAc, minDamage, maxDamage, damageType, resists);
+                    damage = calculateDamage(attacker, tarAc, minDamage, maxDamage, damageType, resists);
                 else
-                    damage = calculateDamage(ac, tarAc, minDamage, maxDamage, damageType, resists);
+                    damage = calculateDamage(attacker, tarAc, minDamage, maxDamage, damageType, resists);
 
                 float d = 0f;
 
@@ -826,40 +735,35 @@ public enum CombatManager {
                     if (tarAc.isSit())
                         damage *= 2.5f; //increase damage if sitting
 
-                    if (tarAc.getObjectType() == GameObjectType.Mob) {
-                        ac.setHateValue(damage * MBServerStatics.PLAYER_COMBAT_HATE_MODIFIER);
-                        ((Mob) tarAc).handleDirectAggro(ac);
-                    }
-
                     if (tarAc.getHealth() > 0)
-                        d = tarAc.modifyHealth(-damage, ac, false);
+                        d = tarAc.modifyHealth(-damage, attacker, false);
 
                 } else if (target.getObjectType().equals(GameObjectType.Building)) {
 
                     if (BuildingManager.getBuildingFromCache(target.getObjectUUID()) == null) {
-                        ac.setCombatTarget(null);
+                        attacker.setCombatTarget(null);
                         return;
                     }
 
                     if (target.getHealth() > 0)
-                        d = ((Building) target).modifyHealth(-damage, ac);
+                        d = ((Building) target).modifyHealth(-damage, attacker);
                 }
 
                 errorTrack = 13;
 
                 //Test to see if any damage needs done to weapon or armor
 
-                testItemDamage(ac, target, weapon, wb);
+                testItemDamage(attacker, target, weapon, wb);
 
                 // if target is dead, we got the killing blow, remove attack timers on our weapons
 
                 if (tarAc != null && !tarAc.isAlive())
-                    removeAttackTimers(ac);
+                    removeAttackTimers(attacker);
 
                 //test double death fix
 
                 if (d != 0)
-                    sendCombatMessage(ac, target, damage, wb, dpj, mainHand); //send damage message
+                    sendCombatMessage(attacker, target, damage, wb, dpj, mainHand); //send damage message
 
                 errorTrack = 14;
 
@@ -886,7 +790,7 @@ public enum CombatManager {
                                     int procChance = ThreadLocalRandom.current().nextInt(100);
 
                                     if (procChance < MBServerStatics.PROC_CHANCE)
-                                        ((WeaponProcEffectModifier) aem).applyProc(ac, target);
+                                        ((WeaponProcEffectModifier) aem).applyProc(attacker, target);
 
                                 }
                             }
@@ -898,52 +802,52 @@ public enum CombatManager {
 
                 //handle damage shields
 
-                if (ac.isAlive() && tarAc != null && tarAc.isAlive())
+                if (attacker.isAlive() && tarAc != null && tarAc.isAlive())
-                    handleDamageShields(ac, tarAc, damage);
+                    handleDamageShields(attacker, tarAc, damage);
 
             } else {
 
                 // Apply Weapon power effect if any.
                 // don't try to apply twice if dual wielding.
 
-                if (ac.getObjectType().equals(GameObjectType.PlayerCharacter) && (mainHand || wb.isTwoHanded())) {
+                if (attacker.getObjectType().equals(GameObjectType.PlayerCharacter) && (mainHand || wb.isTwoHanded())) {
-                    dpj = ((PlayerCharacter) ac).getWeaponPower();
+                    dpj = ((PlayerCharacter) attacker).getWeaponPower();
 
                     if (dpj != null) {
 
                         PowersBase wp = dpj.getPower();
 
                         if (wp.requiresHitRoll() == false) {
-                            PlayerBonuses bonus = ac.getBonuses();
+                            PlayerBonuses bonus = attacker.getBonuses();
                             float attackRange = getWeaponRange(wb, bonus);
                             dpj.attack(target, attackRange);
                         } else
-                            ((PlayerCharacter) ac).setWeaponPower(null);
+                            ((PlayerCharacter) attacker).setWeaponPower(null);
                     }
                 }
 
                 if (target.getObjectType() == GameObjectType.Mob)
-                    ((Mob) target).handleDirectAggro(ac);
+                    ((Mob) target).handleDirectAggro(attacker);
 
                 errorTrack = 17;
 
                 //miss, Send miss message
 
-                sendCombatMessage(ac, target, 0f, wb, dpj, mainHand);
+                sendCombatMessage(attacker, target, 0f, wb, dpj, mainHand);
 
                 //if attacker is player, set last attack timestamp
 
-                if (ac.getObjectType().equals(GameObjectType.PlayerCharacter))
+                if (attacker.getObjectType().equals(GameObjectType.PlayerCharacter))
-                    updateAttackTimers((PlayerCharacter) ac, target, true);
+                    updateAttackTimers((PlayerCharacter) attacker, target, true);
             }
 
             errorTrack = 18;
 
             //cancel effects that break on attack or attackSwing
-            ac.cancelOnAttack();
+            attacker.cancelOnAttack();
 
         } catch (Exception e) {
-            Logger.error(ac.getName() + ' ' + errorTrack + ' ' + e);
+            Logger.error(attacker.getName() + ' ' + errorTrack + ' ' + e);
         }
     }
 
@@ -1055,10 +959,6 @@ public enum CombatManager {
                 if (eff.getPower() != null && (eff.getPower().getToken() == 429506943 || eff.getPower().getToken() == 429408639 || eff.getPower().getToken() == 429513599 || eff.getPower().getToken() == 429415295))
                     swingAnimation = 0;
 
-        if(source != null && source.getObjectType().equals(GameObjectType.PlayerCharacter)){
-            damage *= ((PlayerCharacter)source).ZergMultiplier;
-        } // Health modifications are modified by the ZergMechanic
-
         TargetedActionMsg cmm = new TargetedActionMsg(source, target, damage, swingAnimation);
         DispatchMessage.sendToAllInRange(target, cmm);
     }
@@ -1225,7 +1125,7 @@ public enum CombatManager {
         toggleCombat(msg.getToggle(), origin);
     }
 
-    private static void toggleCombat(boolean toggle, ClientConnection origin) {
+    public static void toggleCombat(boolean toggle, ClientConnection origin) {
 
         PlayerCharacter pc = SessionManager.getPlayerCharacter(origin);
 
@@ -1249,10 +1149,7 @@ public enum CombatManager {
         if (pc == null)
             return;
 
-        if(pc.isFlying())
+        pc.setSit(toggle);
-            pc.setSit(false);
-        else
-            pc.setSit(toggle);
 
         UpdateStateMsg rwss = new UpdateStateMsg();
         rwss.setPlayer(pc);
@@ -1275,69 +1172,70 @@ public enum CombatManager {
     }
 
     //Called when character takes damage.
-    public static void handleRetaliate(AbstractCharacter tarAc, AbstractCharacter ac) {
+    public static void handleRetaliate(AbstractCharacter target, AbstractCharacter attacker) {
 
-        if (ac == null || tarAc == null)
+        if (attacker == null || target == null)
             return;
 
-        if (ac.equals(tarAc))
+        if (attacker.equals(target))
             return;
 
-        if (tarAc.isMoving() && tarAc.getObjectType().equals(GameObjectType.PlayerCharacter))
+        if (target.isMoving() && target.getObjectType().equals(GameObjectType.PlayerCharacter))
             return;
 
-        if (!tarAc.isAlive() || !ac.isAlive())
+        if (!target.isAlive() || !attacker.isAlive())
             return;
 
-        boolean isCombat = tarAc.isCombat();
+        boolean isCombat = target.isCombat();
 
         //If target in combat and has no target, then attack back
 
-        AbstractWorldObject awoCombTar = tarAc.getCombatTarget();
+        AbstractWorldObject awoCombTar = target.getCombatTarget();
 
-        if ((tarAc.isCombat() && awoCombTar == null) || (isCombat && awoCombTar != null && (!awoCombTar.isAlive() || tarAc.isCombat() && NotInRange(tarAc, awoCombTar, tarAc.getRange()))) || (tarAc != null && tarAc.getObjectType() == GameObjectType.Mob && ((Mob) tarAc).isSiege()))
+        if ((target.isCombat() && awoCombTar == null) || (isCombat && awoCombTar != null && (!awoCombTar.isAlive() || target.isCombat() && NotInRange(target, awoCombTar, target.getRange()))) || (target != null && target.getObjectType() == GameObjectType.Mob && ((Mob) target).isSiege()))
-            if (tarAc.getObjectType().equals(GameObjectType.PlayerCharacter)) {  // we are in combat with no valid target
+            if (target.getObjectType().equals(GameObjectType.PlayerCharacter)) {  // we are in combat with no valid target
 
-                PlayerCharacter pc = (PlayerCharacter) tarAc;
+                PlayerCharacter pc = (PlayerCharacter) target;
-                tarAc.setCombatTarget(ac);
+                target.setCombatTarget(attacker);
-                pc.setLastTarget(ac.getObjectType(), ac.getObjectUUID());
+                pc.setLastTarget(attacker.getObjectType(), attacker.getObjectUUID());
 
-                if (tarAc.getTimers() != null)
+                if (target.getTimers() != null)
-                    if (!tarAc.getTimers().containsKey("Attack" + MBServerStatics.SLOT_MAINHAND))
+                    if (!target.getTimers().containsKey("Attack" + MBServerStatics.SLOT_MAINHAND))
-                        CombatManager.AttackTarget((PlayerCharacter) tarAc, tarAc.getCombatTarget());
+                        CombatManager.AttackTarget((PlayerCharacter) target, target.getCombatTarget());
             }
 
         //Handle pet retaliate if assist is on and pet doesn't have a target.
 
-        if (tarAc.getObjectType().equals(GameObjectType.PlayerCharacter)) {
+        if (target.getObjectType().equals(GameObjectType.PlayerCharacter)) {
 
-            Mob pet = ((PlayerCharacter) tarAc).getPet();
+            Mob pet = ((PlayerCharacter) target).getPet();
 
             if (pet != null && pet.assist && pet.getCombatTarget() == null)
-                pet.setCombatTarget(ac);
+                pet.setCombatTarget(attacker);
         }
 
         //Handle Mob Retaliate.
 
-        if (tarAc.getObjectType() == GameObjectType.Mob) {
+        if (target.getObjectType() == GameObjectType.Mob) {
 
-            Mob retaliater = (Mob) tarAc;
+            Mob attackedMobile = (Mob) target;
 
-            if (retaliater.getCombatTarget() != null && !retaliater.isSiege())
+            //handle minion informing his captain of an attack
-                return;
 
-            if (ac.getObjectType() == GameObjectType.Mob && retaliater.isSiege())
+            if (attackedMobile.agentType.equals(AIAgentType.GUARDMINION) && attackedMobile.guardCaptain != null && attackedMobile.guardCaptain.isAlive()) {
-                return;
+
+                if (attackedMobile.guardCaptain.combatTarget == null)
+                    attackedMobile.guardCaptain.setCombatTarget(attacker);
 
-            retaliater.setCombatTarget(ac);
-            if(retaliater.isPlayerGuard && (retaliater.BehaviourType.equals(MobBehaviourType.GuardMinion) || retaliater.BehaviourType.equals(MobBehaviourType.GuardCaptain))){
-                for(Mob guard : retaliater.guardedCity.getParent().zoneMobSet){
-                    if(guard.isPlayerGuard && guard.combatTarget == null){
-                        guard.setCombatTarget(ac);
-                    }
-                }
             }
 
+            // Mobile already has a target; don't switch.
+
+            if (attackedMobile.getCombatTarget() != null && !attackedMobile.isSiege())
+                return;
+
+            attackedMobile.setCombatTarget(attacker);
+
         }
     }
 
@@ -1453,19 +1351,4 @@ public enum CombatManager {
             ((AbstractCharacter) awo).getCharItemManager().damageRandomArmor(1);
     }
 
-    public static boolean LandHit(int atr, int defense){
-
-        int roll = ThreadLocalRandom.current().nextInt(101);
-        float chance = (float)((atr-((atr+defense)*0.315))/((defense-((atr+defense)*0.315))+(atr-((atr+defense)*0.315))));
-
-        int connvertedChance = (int)(chance * 100);
-
-        if(connvertedChance < 5)
-            connvertedChance = 5;
-
-        if(connvertedChance > 95)
-            connvertedChance = 95;
-
-        return connvertedChance > roll;
-    }
 }

src/engine/gameManager/ConfigManager.java

@@ -65,7 +65,6 @@ public enum ConfigManager {
     MB_WORLD_MAINTENANCE,
     MB_WORLD_GREETING,
     MB_WORLD_KEYCLONE_MAX,
-    MB_WORLD_TESTMODE,
     MB_USE_RUINS,
 
     // Mobile AI modifiers

src/engine/gameManager/DevCmdManager.java

@@ -79,6 +79,7 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new AddGoldCmd());
         DevCmdManager.registerDevCmd(new ZoneInfoCmd());
         DevCmdManager.registerDevCmd(new DebugMeleeSyncCmd());
+        DevCmdManager.registerDevCmd(new HotzoneCmd());
         DevCmdManager.registerDevCmd(new MineActiveCmd());
         // Dev
         DevCmdManager.registerDevCmd(new ApplyStatModCmd());
@@ -102,7 +103,6 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new SetAdminRuneCmd());
         DevCmdManager.registerDevCmd(new SetInvulCmd());
         DevCmdManager.registerDevCmd(new MakeItemCmd());
-        DevCmdManager.registerDevCmd(new GimmeCmd());
         DevCmdManager.registerDevCmd(new EnchantCmd());
         DevCmdManager.registerDevCmd(new SetSubRaceCmd());
         // Admin
@@ -179,23 +179,8 @@ public enum DevCmdManager {
 
         //kill any commands not available to everyone on production server
         //only admin level can run dev commands on production
-        boolean playerAllowed = false;
+
-        if(ConfigManager.MB_WORLD_TESTMODE.getValue().equals("true")) {
+        if (a.status.equals(Enum.AccountStatus.ADMIN) == false) {
-            switch (adc.getMainCmdString()) {
-                case "printresists":
-                case "printstats":
-                case "printskills":
-                case "printpowers":
-                case "gimme":
-                case "goto":
-                case "teleportmode":
-                    playerAllowed = true;
-                    if (!a.status.equals(Enum.AccountStatus.ADMIN))
-                        target = pcSender;
-                    break;
-            }
-        }
-        if (!playerAllowed && !a.status.equals(Enum.AccountStatus.ADMIN)) {
             Logger.info("Account " + a.getUname() + "attempted to use dev command " + cmd);
             return false;
         }

src/engine/gameManager/LootManager.java

@@ -17,9 +17,7 @@ import engine.objects.*;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
-import java.util.List;
 import java.util.concurrent.ThreadLocalRandom;
 
 /**
@@ -36,12 +34,6 @@ public enum LootManager {
     public static HashMap<Integer, ArrayList<ModTableEntry>> _modTables = new HashMap<>();
     public static HashMap<Integer, ArrayList<ModTypeTableEntry>> _modTypeTables = new HashMap<>();
 
-    public static final ArrayList<Integer> vorg_ha_uuids = new ArrayList<>(Arrays.asList(27580, 27590, 188500, 188510, 188520, 188530, 188540, 188550, 189510));
-    public static final ArrayList<Integer> vorg_ma_uuids = new ArrayList<>(Arrays.asList(27570,188900,188910,188920,188930,188940,188950,189500));
-    public static final ArrayList<Integer> vorg_la_uuids = new ArrayList<>(Arrays.asList(27550,27560,189100,189110,189120,189130,189140,189150));
-    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));
-
     // Drop Rates
 
     public static float NORMAL_DROP_RATE;
@@ -75,111 +67,41 @@ public enum LootManager {
     }
 
     public static void GenerateMobLoot(Mob mob) {
+
         //determine if mob is in hotzone
-        boolean inHotzone = false;
+        boolean inHotzone = ZoneManager.inHotZone(mob.getLoc());
 
         //iterate the booty sets
 
-        if(mob.mobBase == null || mob.getMobBaseID() == 253003){
+        if (mob.getMobBase().bootySet != 0 && _bootySetMap.containsKey(mob.getMobBase().bootySet) == true)
-            int i = 0;
-        }
-
-        if (mob.getMobBase().bootySet != 0 && _bootySetMap.containsKey(mob.getMobBase().bootySet))
             RunBootySet(_bootySetMap.get(mob.getMobBase().bootySet), mob, inHotzone);
 
-        if (mob.bootySet != 0 && _bootySetMap.containsKey(mob.bootySet)) {
+        if (mob.bootySet != 0 && _bootySetMap.containsKey(mob.bootySet) == true)
             RunBootySet(_bootySetMap.get(mob.bootySet), mob, inHotzone);
-        }else if(mob.bootySet != 0 && ItemBase.getItemBase(mob.bootySet) != null){
-            MobLoot specialDrop = null;
-            specialDrop = new MobLoot(mob,ItemBase.getItemBase(mob.bootySet),true);
-            if(specialDrop != null) {
-                ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + mob.getParentZone().getName() + " has found the " + specialDrop.getName() + ". Are you tough enough to take it?");
-                chatMsg.setMessageType(10);
-                chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
-                DispatchMessage.dispatchMsgToAll(chatMsg);
-                mob.getCharItemManager().addItemToInventory(specialDrop);
-                mob.setResists(new Resists("Dropper"));
-                if(!Mob.discDroppers.contains(mob))
-                    Mob.AddDiscDropper(mob);
-            }
-
-        }
 
         //lastly, check mobs inventory for godly or disc runes to send a server announcement
-        for (Item it : mob.getInventory()) {
+            for (Item it : mob.getInventory()) {
 
-            ItemBase ib = it.getItemBase();
+                ItemBase ib = it.getItemBase();
-            if (ib == null)
+                if(ib == null)
-                break;
+                    break;
-            if (ib.isDiscRune() || ib.getName().toLowerCase().contains("of the gods")) {
+                if (ib.isDiscRune() || ib.getName().toLowerCase().contains("of the gods")) {
-                ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + mob.getParentZone().getName() + " has found the " + ib.getName() + ". Are you tough enough to take it?");
+                    ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + mob.getParentZone().getName() + " has found the " + ib.getName() + ". Are you tough enough to take it?");
-                chatMsg.setMessageType(10);
+                    chatMsg.setMessageType(10);
-                chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
+                    chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
-                DispatchMessage.dispatchMsgToAll(chatMsg);
+                    DispatchMessage.dispatchMsgToAll(chatMsg);
+                }
             }
-        }
 
     }
 
     private static void RunBootySet(ArrayList<BootySetEntry> entries, Mob mob, boolean inHotzone) {
 
         boolean hotzoneWasRan = false;
-        float dropRate;
+        float dropRate = 1.0f;
-
-        if (!mob.getSafeZone()) {
-            int contractLow = 1, contractHigh = 400;
-            int runeLow = 401, runeHigh = 800;
-            int resourceLow = 801, resourceHigh = 900;
-            int glassLow = 901, glassHigh = 910;
-            int guardLow = 911, guardHigh = 920;
-
-            // Pre-compute adjusted high values
-            int contractAdjust = 0, runeAdjust = 0, resourceAdjust = 0, glassAdjust = 0, guardAdjust = 0;
-            if (mob.level < 50) {
-                int dif = 50 - mob.level;
-                contractAdjust = (int)(400 * (dif * 0.02f));
-                runeAdjust = (int)(400 * (dif * 0.02f));
-                resourceAdjust = (int)(100 * (dif * 0.02f));
-                glassAdjust = (int)(10 * (dif * 0.02f));
-                guardAdjust = (int)(10 * (dif * 0.02f));
-            }
-
-            // Generate a single random roll
-            int specialCaseRoll = ThreadLocalRandom.current().nextInt(1, 100001);
-
-            // Calculate adjusted high values once
-            int contractHighAdjusted = contractHigh - contractAdjust;
-            int runeHighAdjusted = runeHigh - runeAdjust;
-            int resourceHighAdjusted = resourceHigh - resourceAdjust;
-            int glassHighAdjusted = glassHigh - glassAdjust;
-            int guardHighAdjusted = guardHigh - guardAdjust;
-
-            // Check the roll range and handle accordingly
-            if (specialCaseRoll >= contractLow && specialCaseRoll <= contractHighAdjusted) {
-                SpecialCaseContractDrop(mob, entries);
-            } else if (specialCaseRoll >= runeLow && specialCaseRoll <= runeHighAdjusted) {
-                SpecialCaseRuneDrop(mob, entries);
-            } else if (specialCaseRoll >= resourceLow && specialCaseRoll <= resourceHighAdjusted) {
-                SpecialCaseResourceDrop(mob, entries);
-            } else if (specialCaseRoll >= glassLow && specialCaseRoll <= glassHighAdjusted) {
-                int glassID = rollRandomItem(126);
-                ItemBase glassItem = ItemBase.getItemBase(glassID);
-                if (glassItem != null) {
-                    MobLoot toAddGlass = new MobLoot(mob, glassItem, false);
-                    mob.getCharItemManager().addItemToInventory(toAddGlass);
-                }
-            } else if (specialCaseRoll >= guardLow && specialCaseRoll <= guardHighAdjusted) {
-                int guardContractID = racial_guard_uuids.get(new java.util.Random().nextInt(racial_guard_uuids.size()));
-                ItemBase guardContract = ItemBase.getItemBase(guardContractID);
-                if (guardContract != null) {
-                    MobLoot toAddContract = new MobLoot(mob, guardContract, false);
-                    mob.getCharItemManager().addItemToInventory(toAddContract);
-                }
-            }
-        }
-
 
         // Iterate all entries in this bootySet and process accordingly
+
         for (BootySetEntry bse : entries) {
             switch (bse.bootyType) {
                 case "GOLD":
@@ -187,10 +109,8 @@ public enum LootManager {
                     break;
                 case "LOOT":
 
-                    if (mob.getSafeZone())
+                    if (mob.getSafeZone() == false)
-                        return; // no loot to drop in safezones
+                        dropRate = LootManager.NORMAL_DROP_RATE;
-
-                    dropRate = LootManager.NORMAL_DROP_RATE;
 
                     if (inHotzone == true)
                         dropRate = LootManager.HOTZONE_DROP_RATE;
@@ -215,109 +135,6 @@ public enum LootManager {
         }
     }
 
-    public static void SpecialCaseContractDrop(Mob mob,ArrayList<BootySetEntry> entries){
-
-        int lootTableID = 0;
-        for(BootySetEntry entry : entries){
-            if(entry.bootyType.equals("LOOT")){
-                lootTableID = entry.genTable;
-                break;
-            }
-        }
-
-        if(lootTableID == 0)
-            return;
-
-        int ContractTableID = 0;
-        for(GenTableEntry entry : _genTables.get(lootTableID)){
-            try {
-                if (ItemBase.getItemBase(_itemTables.get(entry.itemTableID).get(0).cacheID).getType().equals(Enum.ItemType.CONTRACT)) {
-                    ContractTableID = entry.itemTableID;
-                    break;
-                }
-            }catch(Exception e){
-
-            }
-        }
-
-        if(ContractTableID == 0)
-            return;
-
-        ItemBase ib = ItemBase.getItemBase(rollRandomItem(ContractTableID));
-        if(ib != null){
-            MobLoot toAdd = new MobLoot(mob,ib,false);
-            mob.getCharItemManager().addItemToInventory(toAdd);
-        }
-    }
-
-    public static void SpecialCaseRuneDrop(Mob mob,ArrayList<BootySetEntry> entries){
-        int lootTableID = 0;
-        for(BootySetEntry entry : entries){
-            if(entry.bootyType.equals("LOOT")){
-                lootTableID = entry.genTable;
-                break;
-            }
-        }
-
-        if(lootTableID == 0)
-            return;
-
-        int RuneTableID = 0;
-        for(GenTableEntry entry : _genTables.get(lootTableID)){
-            try {
-                if (ItemBase.getItemBase(_itemTables.get(entry.itemTableID).get(0).cacheID).getType().equals(Enum.ItemType.RUNE)) {
-                    RuneTableID = entry.itemTableID;
-                    break;
-                }
-            }catch(Exception e){
-
-            }
-        }
-
-        if(RuneTableID == 0)
-            return;
-
-        ItemBase ib = ItemBase.getItemBase(rollRandomItem(RuneTableID));
-        if(ib != null){
-            MobLoot toAdd = new MobLoot(mob,ib,false);
-            mob.getCharItemManager().addItemToInventory(toAdd);
-        }
-    }
-
-    public static void SpecialCaseResourceDrop(Mob mob,ArrayList<BootySetEntry> entries){
-        int lootTableID = 0;
-        for(BootySetEntry entry : entries){
-            if(entry.bootyType.equals("LOOT")){
-                lootTableID = entry.genTable;
-                break;
-            }
-        }
-
-        if(lootTableID == 0)
-            return;
-
-        int ResourceTableID = 0;
-        for(GenTableEntry entry : _genTables.get(lootTableID)){
-            try {
-                if (ItemBase.getItemBase(_itemTables.get(entry.itemTableID).get(0).cacheID).getType().equals(Enum.ItemType.RESOURCE)) {
-                    ResourceTableID = entry.itemTableID;
-                    break;
-                }
-            }catch(Exception e){
-
-            }
-        }
-
-        if(ResourceTableID == 0)
-            return;
-
-        ItemBase ib = ItemBase.getItemBase(rollRandomItem(ResourceTableID));
-        if(ib != null){
-            MobLoot toAdd = new MobLoot(mob,ib,false);
-            mob.getCharItemManager().addItemToInventory(toAdd);
-        }
-    }
-
     public static MobLoot getGenTableItem(int genTableID, AbstractCharacter mob, Boolean inHotzone) {
 
         if (mob == null || _genTables.containsKey(genTableID) == false)
@@ -339,10 +156,11 @@ public enum LootManager {
 
         //gets the 1-320 roll for this mob
         int itemTableRoll = 0;
+        int objectType = mob.getObjectType().ordinal();
         if(mob.getObjectType().ordinal() == 52) { //52 = player character
             itemTableRoll = ThreadLocalRandom.current().nextInt(1,320 + 1);
         } else{
-            itemTableRoll = TableRoll(mob.level);
+            itemTableRoll = TableRoll(mob.level, inHotzone);
         }
         ItemTableEntry tableRow = ItemTableEntry.rollTable(itemTableId, itemTableRoll);
         if (tableRow == null)
@@ -354,23 +172,13 @@ public enum LootManager {
             return null;
 
         if (ItemBase.getItemBase(itemUUID).getType().ordinal() == Enum.ItemType.RESOURCE.ordinal()) {
-            if(ThreadLocalRandom.current().nextInt(1,101) < 91)
-                return null; // cut down world drops rates of resources by 90%
             int amount = ThreadLocalRandom.current().nextInt(tableRow.minSpawn, tableRow.maxSpawn + 1);
             return new MobLoot(mob, ItemBase.getItemBase(itemUUID), amount, false);
         }
-        if(ItemBase.getItemBase(itemUUID).getType().equals(Enum.ItemType.RUNE)){
+
-            int randomRune = rollRandomItem(itemTableId);
-            if(randomRune != 0) {
-                itemUUID = randomRune;
-            }
-        } else if(ItemBase.getItemBase(itemUUID).getType().equals(Enum.ItemType.CONTRACT)){
-            int randomContract = rollRandomItem(itemTableId);
-            if(randomContract != 0) {
-                itemUUID = randomContract;
-            }
-        }
         outItem = new MobLoot(mob, ItemBase.getItemBase(itemUUID), false);
+        Enum.ItemType outType = outItem.getItemBase().getType();
+
 
         if(selectedRow.pModTable != 0){
             try {
@@ -388,12 +196,6 @@ public enum LootManager {
                 Logger.error("Failed to GenerateSuffix for item: " + outItem.getName());
             }
         }
-
-        if(outItem.getItemBase().getType().equals(Enum.ItemType.CONTRACT) || outItem.getItemBase().getType().equals(Enum.ItemType.RUNE)){
-            if(ThreadLocalRandom.current().nextInt(1,101) < 66)
-                return null; // cut down world drops rates of resources by 65%
-        }
-
         return outItem;
     }
 
@@ -414,7 +216,7 @@ public enum LootManager {
         if(mob.getObjectType().ordinal() == 52) {
             prefixTableRoll = ThreadLocalRandom.current().nextInt(1,320 + 1);
         } else{
-            prefixTableRoll = TableRoll(mob.level);
+            prefixTableRoll = TableRoll(mob.level, inHotzone);
         }
         ModTableEntry prefixMod = ModTableEntry.rollTable(prefixTable.modTableID, prefixTableRoll);
 
@@ -446,7 +248,7 @@ public enum LootManager {
         if(mob.getObjectType().ordinal() == 52) {
             suffixTableRoll = ThreadLocalRandom.current().nextInt(1,320 + 1);
         } else{
-            suffixTableRoll = TableRoll(mob.level);
+            suffixTableRoll = TableRoll(mob.level, inHotzone);
         }
         ModTableEntry suffixMod = ModTableEntry.rollTable(suffixTable.modTableID, suffixTableRoll);
 
@@ -461,36 +263,23 @@ public enum LootManager {
         return inItem;
     }
 
-    public static int TableRoll(int mobLevel) {
+    public static int TableRoll(int mobLevel, Boolean inHotzone) {
 
-        int rank = (int)(mobLevel * 0.1f);
+        if (mobLevel > 65)
-        int min = 50;
+            mobLevel = 65;
-        int max = 100;
+
-        switch(rank){
+        int max = (int) (4.882 * mobLevel + 127.0);
-            case 1:
+
-                min = 200;
+        if (max > 319)
-                max = 250;
+            max = 319;
-                break;
+
-            case 2:
+        int min = (int) (4.469 * mobLevel - 3.469);
-                min = 210;
+
-                max = 275;
+        if (min < 70)
-                break;
+            min = 70;
-            case 3:
+
-                min = 220;
+        if (inHotzone)
-                max = 300;
+            min += mobLevel;
-                break;
-            case 4:
-                min = 230;
-                max = 320;
-                break;
-            case 5:
-            case 6:
-            case 7:
-            case 8:
-                min = 240;
-                max = 320;
-                break;
-        }
 
         int roll = ThreadLocalRandom.current().nextInt(min, max + 1);
 
@@ -510,7 +299,12 @@ public enum LootManager {
 
         int high = bse.highGold;
         int low = bse.lowGold;
-        int gold = (int) (ThreadLocalRandom.current().nextInt(low, high + 1) * NORMAL_GOLD_RATE);
+        int gold = ThreadLocalRandom.current().nextInt(low, high + 1);
+
+        if (inHotzone == true)
+            gold = (int) (gold * HOTZONE_GOLD_RATE);
+        else
+            gold = (int) (gold * NORMAL_GOLD_RATE);
 
         if (gold > 0) {
             MobLoot goldAmount = new MobLoot(mob, gold);
@@ -521,63 +315,45 @@ public enum LootManager {
 
     public static void GenerateLootDrop(Mob mob, int tableID, Boolean inHotzone) {
 
-        MobLoot toAdd = getGenTableItem(tableID, mob, inHotzone);
+        try {
-        if(toAdd != null){
+
-            ItemBase ib = toAdd.getItemBase();
+            MobLoot toAdd = getGenTableItem(tableID, mob, inHotzone);
-            switch(ib.getType()){
+
-                case CONTRACT:
+            if (toAdd != null)
-                case RUNE:
+                mob.getCharItemManager().addItemToInventory(toAdd);
-                case RESOURCE:
+
-                    return;
+        } catch (Exception e) {
-            }
+            //TODO chase down loot generation error, affects roughly 2% of drops
-            toAdd.setIsID(true);
+            int i = 0;
-            mob.getCharItemManager().addItemToInventory(toAdd);
         }
     }
 
-
     public static void GenerateEquipmentDrop(Mob mob) {
 
-        if (mob == null || mob.getSafeZone())
-            return; // no equipment to drop in safezones
-
-        if(mob.StrongholdGuardian || mob.StrongholdCommander || mob.StrongholdEpic)
-            return; // stronghold mobs don't drop equipment
-
         //do equipment here
-        if (mob.getEquip() != null) {
+        int dropCount = 0;
-            boolean isVorg = false;
+        if (mob.getEquip() != null)
             for (MobEquipment me : mob.getEquip().values()) {
 
                 if (me.getDropChance() == 0)
                     continue;
 
-                String name = me.getItemBase().getName().toLowerCase();
-                if (name.contains("vorgrim legionnaire's") || name.contains("vorgrim auxiliary's") ||name.contains("bellugh nuathal") || name.contains("crimson circle"))
-                    isVorg = true;
-
-                if(isVorg && !mob.isDropper){
-                    continue;
-                }
-
                 float equipmentRoll = ThreadLocalRandom.current().nextInt(1, 100 + 1);
                 float dropChance = me.getDropChance() * 100;
-                ItemBase itemBase = me.getItemBase();
+
-                if(isVorg) {
-                    mob.spawnTime = ThreadLocalRandom.current().nextInt(300, 2700);
-                    dropChance = 10;
-                    itemBase = getRandomVorg(itemBase);
-                }
                 if (equipmentRoll > dropChance)
                     continue;
 
-                MobLoot ml = new MobLoot(mob, itemBase, false);
+                MobLoot ml = new MobLoot(mob, me.getItemBase(), false);
 
-                ml.setIsID(true);
+                if (ml != null && dropCount < 1) {
-                ml.setDurabilityCurrent((short) (ml.getDurabilityCurrent() - ThreadLocalRandom.current().nextInt(5) + 1));
+                    ml.setIsID(true);
-                mob.getCharItemManager().addItemToInventory(ml);
+                    ml.setDurabilityCurrent((short) (ml.getDurabilityCurrent() - ThreadLocalRandom.current().nextInt(5) + 1));
+                    mob.getCharItemManager().addItemToInventory(ml);
+                    dropCount = 1;
+                    //break; // Exit on first successful roll.
+                }
             }
-        }
     }
 
     public static void GenerateInventoryDrop(Mob mob, BootySetEntry bse) {
@@ -591,11 +367,8 @@ public enum LootManager {
 
         MobLoot lootItem = new MobLoot(mob, ItemBase.getItemBase(bse.itemBase), true);
 
-        if (lootItem != null) {
+        if (lootItem != null)
             mob.getCharItemManager().addItemToInventory(lootItem);
-            if(lootItem.getItemBase().isDiscRune() && !Mob.discDroppers.contains(mob))
-                Mob.AddDiscDropper(mob);
-        }
     }
 
     public static void peddleFate(PlayerCharacter playerCharacter, Item gift) {
@@ -619,12 +392,12 @@ public enum LootManager {
 
         //check if player owns the gift he is trying to open
 
-        if (!itemMan.doesCharOwnThisItem(gift.getObjectUUID()))
+        if (itemMan.doesCharOwnThisItem(gift.getObjectUUID()) == false)
             return;
 
         //roll 1-100 for the gen table selection
 
-        int genRoll = ThreadLocalRandom.current().nextInt(94, 100) + 1;
+        int genRoll = ThreadLocalRandom.current().nextInt(1, 100 + 1);
         GenTableEntry selectedRow = GenTableEntry.rollTable(tableID, genRoll, LootManager.NORMAL_DROP_RATE);
 
         if(selectedRow == null)
@@ -640,276 +413,45 @@ public enum LootManager {
 
         //create the item from the table, quantity is always 1
 
-        ItemBase ib = ItemBase.getItemBase(selectedItem.cacheID);
+        MobLoot winnings = new MobLoot(playerCharacter, ItemBase.getItemBase(selectedItem.cacheID), 1, false);
-        if(ib.getUUID() == Warehouse.coalIB.getUUID()){
-            //no more coal, give gold instead
-            if (itemMan.getGoldInventory().getNumOfItems() + 250000 > 10000000) {
-                ErrorPopupMsg.sendErrorPopup(playerCharacter, 21);
-                return;
-            }
-            itemMan.addGoldToInventory(250000,false);
-            itemMan.updateInventory();
-        }else {
-            MobLoot winnings = new MobLoot(playerCharacter, ib, 1, false);
 
-            if (winnings == null)
+        if (winnings == null)
-                return;
+            return;
 
-            //early exit if the inventory of the player will not hold the item
+        //early exit if the inventory of the player will not old the item
 
-            if (itemMan.hasRoomInventory(winnings.getItemBase().getWeight()) == false) {
+        if (itemMan.hasRoomInventory(winnings.getItemBase().getWeight()) == false) {
-                ErrorPopupMsg.sendErrorPopup(playerCharacter, 21);
+            ErrorPopupMsg.sendErrorPopup(playerCharacter, 21);
-                return;
+            return;
-            }
-
-            //determine if the winning item needs a prefix
-
-            if (selectedRow.pModTable != 0) {
-                int prefixRoll = ThreadLocalRandom.current().nextInt(220, 320 + 1);
-                ModTableEntry prefix = ModTableEntry.rollTable(selectedRow.pModTable, prefixRoll);
-                if (prefix != null)
-                    winnings.addPermanentEnchantment(prefix.action, 0, prefix.level, true);
-            }
-
-            //determine if the winning item needs a suffix
-
-            if (selectedRow.sModTable != 0) {
-                int suffixRoll = ThreadLocalRandom.current().nextInt(220, 320 + 1);
-                ModTableEntry suffix = ModTableEntry.rollTable(selectedRow.sModTable, suffixRoll);
-                if (suffix != null)
-                    winnings.addPermanentEnchantment(suffix.action, 0, suffix.level, true);
-            }
-            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 int rollRandomItem(int itemTable){
-        int returnedID = ItemTableEntry.getRandomItem(itemTable);
-        return returnedID;
-    }
-
-    public static ItemBase getRandomVorg(ItemBase itemBase){
-        int roll = 0;
-        if(vorg_ha_uuids.contains(itemBase.getUUID())) {
-            roll = ThreadLocalRandom.current().nextInt(0, 10);
-            switch (roll) {
-                case 1:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(0));
-                case 2:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(1));
-                case 3:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(2));
-                case 4:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(3));
-                case 5:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(4));
-                case 6:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(5));
-                case 7:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(6));
-                case 8:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(7));
-                default:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(8));
-            }
         }
 
-        if(vorg_ma_uuids.contains(itemBase.getUUID())) {
+        //determine if the winning item needs a prefix
-            roll = ThreadLocalRandom.current().nextInt(0, 10);
+
-            switch (roll) {
+        if(selectedRow.pModTable != 0){
-                case 1:
+            int prefixRoll = ThreadLocalRandom.current().nextInt(220,320 + 1);
-                    return ItemBase.getItemBase(vorg_ma_uuids.get(0));
+            ModTableEntry prefix = ModTableEntry.rollTable(selectedRow.pModTable, prefixRoll);
-                case 2:
+            if(prefix != null)
-                    return ItemBase.getItemBase(vorg_ma_uuids.get(1));
+                winnings.addPermanentEnchantment(prefix.action, 0, prefix.level, true);
-                case 3:
-                    return ItemBase.getItemBase(vorg_ma_uuids.get(2));
-                case 4:
-                    return ItemBase.getItemBase(vorg_ma_uuids.get(3));
-                case 5:
-                    return ItemBase.getItemBase(vorg_ma_uuids.get(4));
-                case 6:
-                    return ItemBase.getItemBase(vorg_ma_uuids.get(5));
-                case 7:
-                    return ItemBase.getItemBase(vorg_ma_uuids.get(6));
-                default:
-                    return ItemBase.getItemBase(vorg_ma_uuids.get(7));
-            }
         }
 
-        if(vorg_la_uuids.contains(itemBase.getUUID())) {
+        //determine if the winning item needs a suffix
-            roll = ThreadLocalRandom.current().nextInt(0, 10);
+
-            switch (roll) {
+        if(selectedRow.sModTable != 0){
-                case 1:
+            int suffixRoll = ThreadLocalRandom.current().nextInt(220,320 + 1);
-                    return ItemBase.getItemBase(vorg_la_uuids.get(0));
+            ModTableEntry suffix = ModTableEntry.rollTable(selectedRow.sModTable, suffixRoll);
-                case 2:
+            if (suffix != null)
-                    return ItemBase.getItemBase(vorg_la_uuids.get(1));
+                winnings.addPermanentEnchantment(suffix.action, 0, suffix.level, true);
-                case 3:
-                    return ItemBase.getItemBase(vorg_la_uuids.get(2));
-                case 4:
-                    return ItemBase.getItemBase(vorg_la_uuids.get(3));
-                case 5:
-                    return ItemBase.getItemBase(vorg_la_uuids.get(4));
-                case 6:
-                    return ItemBase.getItemBase(vorg_la_uuids.get(5));
-                case 7:
-                    return ItemBase.getItemBase(vorg_la_uuids.get(6));
-                default:
-                    return ItemBase.getItemBase(vorg_la_uuids.get(7));
-            }
         }
+        winnings.setIsID(true);
 
-        if(vorg_cloth_uuids.contains(itemBase.getUUID())) {
+        //remove gift from inventory
-            roll = ThreadLocalRandom.current().nextInt(0, 10);
-            switch (roll) {
-                case 1:
-                    return ItemBase.getItemBase(vorg_cloth_uuids.get(0));
-                case 2:
-                    return ItemBase.getItemBase(vorg_cloth_uuids.get(1));
-                case 3:
-                    return ItemBase.getItemBase(vorg_cloth_uuids.get(2));
-                case 4:
-                    return ItemBase.getItemBase(vorg_cloth_uuids.get(3));
-                default:
-                    return ItemBase.getItemBase(vorg_cloth_uuids.get(4));
-            }
-        }
 
-        return null;
+        itemMan.consume(gift);
-    }
 
-    public static void DropPresent(Mob mob){
+        //add winnings to player inventory
-        int random = 971049 + ThreadLocalRandom.current().nextInt(24);
-        if (random > 971071)
-            random = 971071;
 
-        ItemBase present = ItemBase.getItemBase(random);
+        Item playerWinnings = winnings.promoteToItem(playerCharacter);
-        if (present != null) {
+        itemMan.addItemToInventory(playerWinnings);
-            MobLoot toAdd = new MobLoot(mob, present, true);
+        itemMan.updateInventory();
-
-            if (toAdd != null)
-                mob.getCharItemManager().addItemToInventory(toAdd);
-        }
-    }
-
-    public static void GenerateStrongholdLoot(Mob mob, boolean commander, boolean epic) {
-
-        mob.getCharItemManager().clearInventory();
-
-        int multiplier = 1;
-        if (commander)
-            multiplier = 2;
-        if(epic)
-            multiplier = 10;
-
-        int high = 125000;
-        int low = 50000;
-        int gold = ThreadLocalRandom.current().nextInt(low, high + 1) * multiplier;
-
-        if (gold > 0) {
-            MobLoot goldAmount = new MobLoot(mob, gold);
-            mob.getCharItemManager().addItemToInventory(goldAmount);
-        }
-
-        //present drop chance for all
-        if (ThreadLocalRandom.current().nextInt(100) < 35)
-            DropPresent(mob);
-
-        //random contract drop chance for all
-        if (ThreadLocalRandom.current().nextInt(100) < 40) {
-            int contractTableID = 250;
-            contractTableID += ThreadLocalRandom.current().nextInt(0, 11);
-            if (contractTableID > 259)
-                contractTableID = 659;
-
-                int id = rollRandomItem(contractTableID);
-                ItemBase ib = ItemBase.getItemBase(id);
-                if (ib != null) {
-                    MobLoot contract = new MobLoot(mob, ib, true);
-
-                    if (contract != null)
-                        mob.getCharItemManager().addItemToInventory(contract);
-                }
-        }
-
-        //special commander drop chances
-        if (commander)
-            GenerateCommanderLoot(mob,false);
-
-        //special epic drop chances
-        if (epic) {
-            GenerateCommanderLoot(mob, true);
-            GenerateCommanderLoot(mob,false);
-        }
-    }
-
-    public static void GenerateCommanderLoot(Mob mob, boolean epic){
-        //present chance
-        if (ThreadLocalRandom.current().nextInt(100) < 25)
-            DropPresent(mob);
-
-        //present chance
-        if (ThreadLocalRandom.current().nextInt(100) < 25)
-            DropPresent(mob);
-
-        //chance for glass
-        if (ThreadLocalRandom.current().nextInt(100) < 75) {
-            int glassID = rollRandomItem(126);
-            ItemBase glassItem = ItemBase.getItemBase(glassID);
-            if (glassItem != null) {
-                MobLoot toAdd2 = new MobLoot(mob, glassItem, true);
-
-                if (toAdd2 != null)
-                    mob.getCharItemManager().addItemToInventory(toAdd2);
-            }
-        }
-
-        //chance for disc
-        if (ThreadLocalRandom.current().nextInt(100) < 75) {
-            int discID = rollRandomItem(3202);
-            ItemBase discItem = ItemBase.getItemBase(discID);
-            if (discItem != null) {
-                MobLoot toAdd3 = new MobLoot(mob, discItem, true);
-
-                if (toAdd3 != null)
-                    mob.getCharItemManager().addItemToInventory(toAdd3);
-            }
-        }
-
-        //chance for stat rune
-        if (ThreadLocalRandom.current().nextInt(100) < 75) {
-            int runeID = rollRandomItem(3201);
-            ItemBase runeItem = ItemBase.getItemBase(runeID);
-            if (runeItem != null) {
-                MobLoot toAdd4 = new MobLoot(mob, runeItem, true);
-
-                if (toAdd4 != null)
-                    mob.getCharItemManager().addItemToInventory(toAdd4);
-            }
-        }
-        if(epic){
-            int contractTableID = 250;
-            contractTableID += ThreadLocalRandom.current().nextInt(0, 11);
-            if (contractTableID > 259)
-                contractTableID = 659;
-
-            int id = rollRandomItem(contractTableID);
-            ItemBase ib = ItemBase.getItemBase(id);
-            if (ib != null) {
-                MobLoot contract = new MobLoot(mob, ib, true);
-
-                if (contract != null)
-                    mob.getCharItemManager().addItemToInventory(contract);
-            }
-        }
     }
 }

src/engine/gameManager/MaintenanceManager.java

@@ -24,7 +24,7 @@ public enum MaintenanceManager {
 
     public static void setMaintDateTime(Building building, LocalDateTime maintDate) {
 
-        building.maintDateTime = maintDate.withHour(1).withMinute(0).withSecond(0);
+        building.maintDateTime = maintDate;
         DbManager.BuildingQueries.updateMaintDate(building);
 
     }
@@ -49,15 +49,19 @@ public enum MaintenanceManager {
 
             if (chargeUpkeep(building) == false)
                 derankList.add(building);
-            else
-                setMaintDateTime(building, LocalDateTime.now().plusDays(7));
         }
+        // Reset maintenance dates for these buildings
+
+        for (Building building : maintList) {
+            setMaintDateTime(building, LocalDateTime.now().plusDays(7));
 
-        for (Building building : derankList) {
-            building.destroyOrDerank(null);
-            if(building.getRank() > 0)
-                setMaintDateTime(building, LocalDateTime.now().plusDays(1));
         }
+        // Derak or destroy buildings that did not
+        // have funds available.
+
+        for (Building building : derankList)
+            building.destroyOrDerank(null);
+
         Logger.info("Structures: " + buildingList.size() + " Maint: " + maintList.size() + " Derank: " + derankList.size());
     }
 
@@ -94,10 +98,6 @@ public enum MaintenanceManager {
                 continue;
             }
 
-            //only ToL pays maintenance
-            if(building.getBlueprint().getBuildingGroup() != null && !building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.TOL))
-                continue;
-
             // No maintenance on banestones omfg
 
             if (building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.BANESTONE))
@@ -122,9 +122,9 @@ public enum MaintenanceManager {
 
 
             //no maintenance if day of week doesnt match
-            //if (LocalDateTime.now().getDayOfWeek().ordinal() != building.maintDateTime.getDayOfWeek().ordinal()) {
+            if (LocalDateTime.now().getDayOfWeek().ordinal() != building.maintDateTime.getDayOfWeek().ordinal()) {
-            //    continue;
+                continue;
-            //}
+            }
             //  Add building to maintenance queue
 
             maintList.add(building);
@@ -186,8 +186,49 @@ public enum MaintenanceManager {
         // If this is an R8 tree, validate that we can
         // cover the resources required
 
+        if (building.getRank() == 8) {
+
+            hasResources = true;
+
+            if (warehouse == null)
+                hasResources = false;
+            else {
+
+                resourceValue = warehouse.getResources().get(Warehouse.stoneIB);
+
+                if (resourceValue < 1500)
+                    hasResources = false;
+
+                resourceValue = warehouse.getResources().get(Warehouse.lumberIB);
+
+                if (resourceValue < 1500)
+                    hasResources = false;
+
+                resourceValue = warehouse.getResources().get(Warehouse.galvorIB);
+
+                if (resourceValue < 5)
+                    hasResources = false;
+
+                resourceValue = warehouse.getResources().get(Warehouse.wormwoodIB);
+
+                if (resourceValue < 5)
+                    hasResources = false;
+
+            }
+        }
+        // Validation completed but has failed.  We can derank
+        // the target building and early exit
+
+        if ((hasFunds == false) ||
+                ((building.getRank() == 8) && !hasResources)) {
+
+            // Add cash back to strongbox for lost rank if the building isn't being destroyed
+            // and it's not an R8 deranking
+
+            if ((building.getRank() > 1) && (building.getRank() < 8)) {
+                building.setStrongboxValue(building.getStrongboxValue() + building.getBlueprint().getRankCost(Math.min(building.getRank(), 7)));
+            }
 
-        if (hasFunds == false) {
             return false; // Early exit for having failed to meet maintenance
         }
 
@@ -212,6 +253,58 @@ public enum MaintenanceManager {
             }
         }
 
+        // Early exit as we're done if we're not an R8 tree
+
+        if (building.getRank() < 8)
+            return true;
+
+        // Now for the resources if it's an R8 tree
+
+        // Withdraw Stone
+
+        resourceValue = warehouse.getResources().get(Warehouse.stoneIB);
+
+        if (DbManager.WarehouseQueries.updateStone(warehouse, resourceValue - 1500) == true) {
+            warehouse.getResources().put(Warehouse.stoneIB, resourceValue - 1500);
+            warehouse.AddTransactionToWarehouse(Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.STONE, 1500);
+        } else {
+            Logger.error("stone update failed for warehouse of UUID:" + warehouse.getObjectUUID());
+            return true;
+        }
+
+        // Withdraw Lumber
+
+        resourceValue = warehouse.getResources().get(Warehouse.lumberIB);
+
+        if (DbManager.WarehouseQueries.updateLumber(warehouse, resourceValue - 1500) == true) {
+            warehouse.getResources().put(Warehouse.lumberIB, resourceValue - 1500);
+            warehouse.AddTransactionToWarehouse(Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.LUMBER, 1500);
+        } else {
+            Logger.error("lumber update failed for warehouse of UUID:" + warehouse.getObjectUUID());
+            return true;
+        }
+
+        // Withdraw Galvor
+
+        resourceValue = warehouse.getResources().get(Warehouse.galvorIB);
+
+        if (DbManager.WarehouseQueries.updateGalvor(warehouse, resourceValue - 5) == true) {
+            warehouse.getResources().put(Warehouse.galvorIB, resourceValue - 5);
+            warehouse.AddTransactionToWarehouse(Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.GALVOR, 5);
+        } else {
+            Logger.error("galvor update failed for warehouse of UUID:" + warehouse.getObjectUUID());
+            return true;
+        }
+
+        resourceValue = warehouse.getResources().get(Warehouse.wormwoodIB);
+
+        if (DbManager.WarehouseQueries.updateWormwood(warehouse, resourceValue - 5) == true) {
+            warehouse.getResources().put(Warehouse.wormwoodIB, resourceValue - 5);
+            warehouse.AddTransactionToWarehouse(Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.WORMWOOD, 5);
+        } else {
+            Logger.error("wyrmwood update failed for warehouse of UUID:" + warehouse.getObjectUUID());
+        }
+
         return true;
     }
 

src/engine/gameManager/MovementManager.java

@@ -68,7 +68,7 @@ public enum MovementManager {
 
         if (toMove.getObjectType().equals(GameObjectType.PlayerCharacter)) {
             if (((PlayerCharacter) toMove).isCasting())
-                ((PlayerCharacter) toMove).update(false);
+                ((PlayerCharacter) toMove).update();
         }
 
 
@@ -96,7 +96,7 @@ public enum MovementManager {
         if (!toMove.isMoving())
             toMove.resetLastSetLocUpdate();
         else
-            toMove.update(false);
+            toMove.update();
 
         // Update movement for the player
 
@@ -116,8 +116,8 @@ public enum MovementManager {
 
         // if inside a building, convert both locations from the building local reference frame to the world reference frame
 
-        if (msg.getTargetID() > 0) {
+        if (msg.getInBuildingUUID() > 0) {
-            Building building = BuildingManager.getBuildingFromCache(msg.getTargetID());
+            Building building = BuildingManager.getBuildingFromCache(msg.getInBuildingUUID());
             if (building != null) {
 
                 Vector3fImmutable convertLocEnd = new Vector3fImmutable(ZoneManager.convertLocalToWorld(building, endLocation));
@@ -128,8 +128,8 @@ public enum MovementManager {
                 //                }
                 //                else {
                 toMove.setInBuilding(msg.getInBuilding());
-                toMove.setInFloorID(msg.getUnknown01());
+                toMove.setInFloorID(msg.getInBuildingFloor());
-                toMove.setInBuildingID(msg.getTargetID());
+                toMove.setInBuildingID(msg.getInBuildingUUID());
                 msg.setStartCoord(ZoneManager.convertWorldToLocal(building, toMove.getLoc()));
 
                 if (toMove.getObjectType() == GameObjectType.PlayerCharacter) {
@@ -174,9 +174,9 @@ public enum MovementManager {
                 msg.setStartCoord(ZoneManager.convertWorldToLocal(Regions.GetBuildingForRegion(toMove.region), toMove.getLoc()));
                 msg.setEndCoord(ZoneManager.convertWorldToLocal(regionBuilding, endLocation));
                 msg.setInBuilding(toMove.region.level);
-                msg.setUnknown01(toMove.region.room);
+                msg.setInBuildingFloor(toMove.region.room);
-                msg.setTargetType(GameObjectType.Building.ordinal());
+                msg.setStartLocType(GameObjectType.Building.ordinal());
-                msg.setTargetID(regionBuilding.getObjectUUID());
+                msg.setInBuildingUUID(regionBuilding.getObjectUUID());
             }
 
         } else {
@@ -185,8 +185,8 @@ public enum MovementManager {
             toMove.setInBuilding(-1);
             msg.setStartCoord(toMove.getLoc());
             msg.setEndCoord(endLocation);
-            msg.setTargetType(0);
+            msg.setStartLocType(0);
-            msg.setTargetID(0);
+            msg.setInBuildingUUID(0);
         }
 
         //checks sync between character and server, if out of sync, teleport player to original position and return.
@@ -233,7 +233,7 @@ public enum MovementManager {
         toMove.cancelOnMove();
 
         //cancel any attacks for manual move.
-        if ((toMove.getObjectType() == GameObjectType.PlayerCharacter) && msg.getUnknown02() == 0)
+        if ((toMove.getObjectType() == GameObjectType.PlayerCharacter) && msg.getInitiatedFromAttack() == 0)
             toMove.setCombatTarget(null);
 
 
@@ -351,7 +351,7 @@ public enum MovementManager {
             ChatManager.chatSystemInfo((PlayerCharacter) ac, "Finished Alt change, setting the end location to " + ac.getEndLoc().getX() + ' ' + ac.getEndLoc().getZ() + " moving=" + ac.isMoving() + " and current location is " + curLoc.getX() + ' ' + curLoc.getZ());
 
         //Send run/walk/sit/stand to tell the client we are flying / landing etc
-        ac.update(false);
+        ac.update();
         ac.stopMovement(ac.getLoc());
         if (ac.isAlive())
             MovementManager.sendRWSSMsg(ac);
@@ -408,7 +408,7 @@ public enum MovementManager {
             if (bonus.getBool(ModType.Stunned, SourceType.None) || bonus.getBool(ModType.CannotMove, SourceType.None))
                 continue;
 
-            member.update(false);
+            member.update();
 
 
             // All checks passed, let's move the player

src/engine/gameManager/NPCManager.java

@@ -5,13 +5,17 @@ import engine.InterestManagement.WorldGrid;
 import engine.math.Quaternion;
 import engine.math.Vector3f;
 import engine.math.Vector3fImmutable;
+import engine.mobileAI.MobAI;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.msg.PetMsg;
 import engine.objects.*;
 import engine.powers.EffectsBase;
+import engine.powers.PowersBase;
+import engine.powers.RuneSkillAdjustEntry;
 import org.pmw.tinylog.Logger;
 
+import javax.smartcardio.ATR;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.concurrent.ThreadLocalRandom;
@@ -23,92 +27,6 @@ public enum NPCManager {
     NPC_MANAGER;
     public static HashMap<Integer, ArrayList<Integer>> _runeSetMap = new HashMap<>();
 
-    public static void LoadAllRuneSets() {
-        _runeSetMap = DbManager.ItemBaseQueries.LOAD_RUNES_FOR_NPC_AND_MOBS();
-    }
-
-    public static void LoadAllBootySets() {
-        LootManager._bootySetMap = DbManager.LootQueries.LOAD_BOOTY_TABLES();
-    }
-
-    public static void applyRuneSetEffects(Mob mob) {
-
-        // Early exit
-
-        if (mob.runeSet == 0)
-            return;
-
-        //Apply all rune effects.
-
-        if (NPCManager._runeSetMap.get(mob.runeSet).contains(252623)) {
-            mob.isPlayerGuard = true;
-        }
-
-        // Only captains have contracts
-
-        if (mob.contract != null || mob.isPlayerGuard)
-            applyEffectsForRune(mob, 252621);
-
-
-        // Apply effects from RuneSet
-
-        if (mob.runeSet != 0)
-            for (int runeID : _runeSetMap.get(mob.runeSet))
-                applyEffectsForRune(mob, runeID);
-
-        // Not sure why but apply Warrior effects for some reason?
-
-        applyEffectsForRune(mob, 2518);
-    }
-
-    public static void applyEffectsForRune(AbstractCharacter character, int runeID) {
-
-        EffectsBase effectsBase;
-        RuneBase sourceRune = RuneBase.getRuneBase(runeID);
-
-        // Race runes are in the runeset but not in runebase for some reason
-
-        if (sourceRune == null)
-            return;
-
-        for (MobBaseEffects mbe : sourceRune.getEffectsList()) {
-
-            effectsBase = PowersManager.getEffectByToken(mbe.getToken());
-
-            if (effectsBase == null) {
-                Logger.info("Mob: " + character.getObjectUUID() + "  EffectsBase Null for Token " + mbe.getToken());
-                continue;
-            }
-
-            //check to upgrade effects if needed.
-            if (character.effects.containsKey(Integer.toString(effectsBase.getUUID()))) {
-
-                if (mbe.getReqLvl() > (int) character.level)
-                    continue;
-
-                Effect eff = character.effects.get(Integer.toString(effectsBase.getUUID()));
-
-                if (eff == null)
-                    continue;
-
-                //Current effect is a higher rank, dont apply.
-                if (eff.getTrains() > mbe.getRank())
-                    continue;
-
-                //new effect is of a higher rank. remove old effect and apply new one.
-                eff.cancelJob();
-                character.addEffectNoTimer(Integer.toString(effectsBase.getUUID()), effectsBase, mbe.getRank(), true);
-            } else {
-
-                if (mbe.getReqLvl() > (int) character.level)
-                    continue;
-
-                character.addEffectNoTimer(Integer.toString(effectsBase.getUUID()), effectsBase, mbe.getRank(), true);
-            }
-
-        }
-    }
-
     public static void dismissNecroPet(Mob necroPet, boolean updateOwner) {
 
         necroPet.setCombatTarget(null);
@@ -127,10 +45,12 @@ public enum NPCManager {
 
         DbManager.removeFromCache(necroPet);
 
-        PlayerCharacter petOwner = necroPet.getOwner();
+
+        PlayerCharacter petOwner = (PlayerCharacter) necroPet.guardCaptain;
 
         if (petOwner != null) {
-            necroPet.setOwner(null);
+
+            necroPet.guardCaptain = null;
             petOwner.setPet(null);
 
             if (updateOwner == false)
@@ -202,78 +122,6 @@ public enum NPCManager {
         playerCharacter.necroPets.clear();
     }
 
-
-    public static void removeSiegeMinions(Mob mobile) {
-
-        for (Mob toRemove : mobile.siegeMinionMap.keySet()) {
-
-            if (mobile.isMoving()) {
-
-                mobile.stopMovement(mobile.getLoc());
-
-                if (toRemove.parentZone != null)
-                    toRemove.parentZone.zoneMobSet.remove(toRemove);
-            }
-
-            try {
-                toRemove.clearEffects();
-            } catch (Exception e) {
-                Logger.error(e.getMessage());
-            }
-
-            if (toRemove.parentZone != null)
-                toRemove.parentZone.zoneMobSet.remove(toRemove);
-
-            WorldGrid.RemoveWorldObject(toRemove);
-            WorldGrid.removeObject(toRemove);
-            DbManager.removeFromCache(toRemove);
-
-            PlayerCharacter petOwner = toRemove.getOwner();
-
-            if (petOwner != null) {
-
-                petOwner.setPet(null);
-                toRemove.setOwner(null);
-
-                PetMsg petMsg = new PetMsg(5, null);
-                Dispatch dispatch = Dispatch.borrow(petOwner, petMsg);
-                DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.PRIMARY);
-            }
-        }
-    }
-
-    public static boolean removeMobileFromBuilding(Mob mobile, Building building) {
-
-        // Remove npc from it's building
-
-        try {
-            mobile.clearEffects();
-        } catch (Exception e) {
-            Logger.error(e.getMessage());
-        }
-
-        if (mobile.parentZone != null)
-            mobile.parentZone.zoneMobSet.remove(mobile);
-
-        if (building != null) {
-            building.getHirelings().remove(mobile);
-            removeSiegeMinions(mobile);
-        }
-
-        // Delete npc from database
-
-        if (DbManager.MobQueries.DELETE_MOB(mobile) == 0)
-            return false;
-
-        // Remove npc from the simulation
-
-        mobile.removeFromCache();
-        DbManager.removeFromCache(mobile);
-        WorldGrid.RemoveWorldObject(mobile);
-        WorldGrid.removeObject(mobile);
-        return true;
-    }
-
     public static void loadAllPirateNames() {
 
         DbManager.NPCQueries.LOAD_PIRATE_NAMES();
@@ -340,10 +188,19 @@ public enum NPCManager {
         else
             buildingSlot = BuildingManager.getAvailableSlot(abstractCharacter.building);
 
-        //if (buildingSlot == -1)
+        // Override slot for siege engines
-            //Logger.error("No available slot for NPC: " + abstractCharacter.getObjectUUID());
 
-        abstractCharacter.building.getHirelings().put(abstractCharacter, buildingSlot);
+        if (abstractCharacter.getObjectType().equals(Enum.GameObjectType.Mob) && ((Mob) abstractCharacter).behaviourType.equals(Enum.MobBehaviourType.SiegeEngine)) {
+            Mob siegeMobile = (Mob) abstractCharacter;
+            buildingSlot = siegeMobile.guardCaptain.minions.size() + 2;
+        }
+
+        if (buildingSlot == -1)
+            Logger.error("No available slot for NPC: " + abstractCharacter.getObjectUUID());
+
+        // Pets are regular mobiles not hirelings (Siege engines)
+        if (abstractCharacter.contract != null)
+            abstractCharacter.building.getHirelings().put(abstractCharacter, buildingSlot);
 
         // Override bind and location for  this npc derived
         // from BuildingManager slot location data.
@@ -370,4 +227,235 @@ public enum NPCManager {
 
         return buildingSlot;
     }
+
+    public static void AssignPatrolPoints(Mob mob) {
+        mob.patrolPoints = new ArrayList<>();
+
+        for (int i = 0; i < 5; ++i) {
+            float patrolRadius = mob.getSpawnRadius();
+
+            if (patrolRadius > 256)
+                patrolRadius = 256;
+
+            if (patrolRadius < 60)
+                patrolRadius = 60;
+
+            Vector3fImmutable newPatrolPoint = Vector3fImmutable.getRandomPointInCircle(mob.getBindLoc(), patrolRadius);
+            mob.patrolPoints.add(newPatrolPoint);
+
+            if (i == 1) {
+                mob.setLoc(newPatrolPoint);
+                mob.endLoc = newPatrolPoint;
+            }
+        }
+    }
+
+    public static void applyGuardStanceModifiers(Mob guard){
+        float damageModifier = 1;
+        float attackRatingModifier = 1;
+        float defenseModifier = 1;
+        float attackSpeedModifier = 1;
+        float powerDamageModifier = 1;
+        //handle stance modifiers for guard mob
+        if(guard.agentType.equals(Enum.AIAgentType.GUARDWALLARCHER)){
+            //apply rogue bonuses
+            attackRatingModifier += 0.5f;
+            defenseModifier += 0.5f;
+            damageModifier += 0.5f;
+            attackSpeedModifier -= 0.36f;
+        }else {
+            Integer contractID;
+            if (guard.agentType.equals(Enum.AIAgentType.GUARDMINION)) {
+                contractID = guard.guardCaptain.contract.getContractID();
+            } else{
+                contractID = guard.contract.getContractID();
+            }
+            if (Enum.MinionType.ContractToMinionMap.get(contractID) != null && Enum.MinionType.ContractToMinionMap.get(contractID).isMage()){
+                //apply mage offensive Stance
+                powerDamageModifier += 0.5f;
+            } else{
+                //apply fighter offensive stance
+                damageModifier += 0.5f;
+                attackSpeedModifier -= 0.36f;
+            }
+        }
+        guard.minDamageHandOne *= damageModifier;
+        guard.minDamageHandTwo *= damageModifier;
+        guard.maxDamageHandOne *= damageModifier;
+        guard.maxDamageHandTwo *= damageModifier;
+        guard.atrHandOne *= attackRatingModifier;
+        guard.atrHandTwo *= attackRatingModifier;
+        guard.defenseRating *= defenseModifier;
+        guard.speedHandOne *= attackSpeedModifier;
+        guard.speedHandTwo *= attackSpeedModifier;
+
+        //TODO figure out how to apply +50% powerdamage to mage guards
+    }
+
+    public static void setDamageAndSpeedForGuard(Mob guard){
+
+        float rankModifier = 1 + (guard.getRank() * 0.1f);
+        int primaryStat = 0;
+        if(guard.equip == null) {
+            guard.minDamageHandOne = (int)((guard.mobBase.getDamageMin()) * rankModifier);
+            guard.maxDamageHandOne = (int)((guard.mobBase.getDamageMax()) * rankModifier);
+            guard.speedHandOne = 30.0f;
+        }else{
+            if(guard.equip.containsKey(1)){
+                //has main hand weapon
+                ItemBase weapon = guard.equip.get(1).getItemBase();
+                if(weapon.isStrBased())
+                    primaryStat = guard.getStatStrCurrent();
+                else
+                    primaryStat = guard.getStatDexCurrent();
+                guard.minDamageHandOne = (int)((guard.mobBase.getDamageMin() + weapon.getMinDamage()) * rankModifier) + primaryStat;
+                guard.maxDamageHandOne = (int)((guard.mobBase.getDamageMax() + weapon.getMaxDamage()) * rankModifier) + primaryStat;
+                guard.speedHandOne = weapon.getSpeed();
+                guard.rangeHandOne = weapon.getRange();
+            } else if(guard.equip.containsKey(2) && !guard.equip.get(2).getItemBase().isShield()){
+                //has off hand weapon
+                ItemBase weapon = guard.equip.get(2).getItemBase();
+                if(weapon.isStrBased())
+                    primaryStat = guard.getStatStrCurrent();
+                else
+                    primaryStat = guard.getStatDexCurrent();
+                guard.minDamageHandTwo = (int)((guard.mobBase.getDamageMin() + weapon.getMinDamage()) * rankModifier) + primaryStat;
+                guard.maxDamageHandTwo = (int)((guard.mobBase.getDamageMax() + weapon.getMaxDamage()) * rankModifier) + primaryStat;
+                guard.speedHandTwo = weapon.getSpeed();
+                guard.rangeHandTwo = weapon.getRange();
+            } else {
+                primaryStat = guard.getStatStrCurrent();
+                guard.minDamageHandOne = (int)((guard.mobBase.getDamageMin()) * rankModifier) + primaryStat;
+                guard.maxDamageHandOne = (int)((guard.mobBase.getDamageMax()) * rankModifier) + primaryStat;
+                guard.speedHandOne = 30.0f;
+                guard.rangeHandOne = 3;
+            }
+        }
+    }
+
+    public static void setDefenseForGuard(Mob guard){
+        int dexterity = guard.getStatDexCurrent();
+        if(dexterity < 1)
+            dexterity = 1;
+        int baseDef = guard.mobBase.getDefenseRating();
+        int armorDefense = 0;
+        for(MobEquipment equipped : guard.equip.values())
+            if(equipped.getItemBase().isArmor() || equipped.getItemBase().isShield())
+                armorDefense += equipped.getItemBase().getDefense();
+        guard.defenseRating = dexterity + baseDef + armorDefense;
+    }
+
+    public static void setAttackRatingForGuard(Mob guard) {
+        int strength = guard.getStatStrCurrent();
+        int baseAtr = guard.mobBase.getAttackRating();
+        if (guard.equip.get(1) != null)
+            guard.atrHandOne = baseAtr + (int) ((strength * 0.5f) + (guard.equip.get(1).getItemBase().getPercentRequired() * 4) + (guard.equip.get(1).getItemBase().getPercentRequired() * 3));
+        else if (guard.equip.get(2) != null && !guard.equip.get(2).getItemBase().isShield())
+            guard.atrHandTwo = baseAtr + (int) ((strength * 0.5f) + (guard.equip.get(2).getItemBase().getPercentRequired() * 4) + (guard.equip.get(2).getItemBase().getPercentRequired() * 3));
+        else
+            guard.atrHandOne = baseAtr;
+    }
+
+    public static void setMaxHealthForGuard(Mob guard){
+        //values derived fom reading memory address for health on client when selecting player guards
+        switch(guard.getRank()){
+            default:
+                guard.healthMax = 750; //rank 1
+                break;
+            case 2:
+                guard.healthMax =  2082;
+                break;
+            case 3:
+                guard.healthMax =  2740;
+                break;
+            case 4:
+                guard.healthMax =  3414;
+                break;
+            case 5:
+                guard.healthMax =  4080;
+                break;
+            case 6:
+                guard.healthMax =  4746;
+                break;
+            case 7:
+                guard.healthMax =  5412;
+                break;
+        }
+    }
+
+    public static void applyMobbaseEffects(Mob mob) {
+        EffectsBase effectsBase;
+        for (MobBaseEffects mbe : mob.mobBase.effectsList) {
+
+            effectsBase = PowersManager.getEffectByToken(mbe.getToken());
+
+            if (effectsBase == null) {
+                Logger.info("Mob: " + mob.getObjectUUID() + "  EffectsBase Null for Token " + mbe.getToken());
+                continue;
+            }
+
+            //check to upgrade effects if needed.
+            if (mob.effects.containsKey(Integer.toString(effectsBase.getUUID()))) {
+
+                if (mbe.getReqLvl() > (int) mob.level)
+                    continue;
+
+                Effect eff = mob.effects.get(Integer.toString(effectsBase.getUUID()));
+
+                if (eff == null)
+                    continue;
+
+                //Current effect is a higher rank, dont apply.
+                if (eff.getTrains() > mbe.getRank())
+                    continue;
+
+                //new effect is of a higher rank. remove old effect and apply new one.
+                eff.cancelJob();
+                mob.addEffectNoTimer(Integer.toString(effectsBase.getUUID()), effectsBase, mbe.getRank(), true);
+            } else {
+
+                if (mbe.getReqLvl() > (int) mob.level)
+                    continue;
+
+                mob.addEffectNoTimer(Integer.toString(effectsBase.getUUID()), effectsBase, mbe.getRank(), true);
+            }
+
+        }
+    }
+
+    public static void applyEquipmentResists(Mob mob){
+        if(mob.equip != null){
+           for(MobEquipment equipped : mob.equip.values()){
+               ItemBase itemBase = equipped.getItemBase();
+               if(itemBase.isHeavyArmor() || itemBase.isLightArmor() || itemBase.isMediumArmor()){
+                   mob.resists.setResist(Enum.DamageType.Crush, mob.resists.getResist(Enum.DamageType.Crush,0) + itemBase.getCrushResist());
+                   mob.resists.setResist(Enum.DamageType.Slash, mob.resists.getResist(Enum.DamageType.Slash,0) + itemBase.getCrushResist());
+                   mob.resists.setResist(Enum.DamageType.Pierce, mob.resists.getResist(Enum.DamageType.Pierce,0) + itemBase.getCrushResist());
+               }
+           }
+        }
+    }
+
+    public static void applyMobbaseSkill(Mob mob) {
+        SkillsBase baseSkill = DbManager.SkillsBaseQueries.GET_BASE_BY_TOKEN(mob.mobBase.getMobBaseStats().getBaseSkill());
+        if(baseSkill != null)
+            mob.getSkills().put(baseSkill.getName(),new CharacterSkill(baseSkill,mob,mob.mobBase.getMobBaseStats().getBaseSkillAmount()));
+    }
+
+    public static void applyRuneSkills(Mob mob, int runeID){
+        //load mob skill adjustments from mobbase rune
+        if(PowersManager._allRuneSkillAdjusts.containsKey(runeID))
+            for(RuneSkillAdjustEntry entry : PowersManager._allRuneSkillAdjusts.get(runeID)) {
+                if(SkillsBase.getFromCache(entry.skill_type) == null)
+                    SkillsBase.putInCache(DbManager.SkillsBaseQueries.GET_BASE_BY_NAME(entry.skill_type));
+                SkillsBase skillBase = SkillsBase.getFromCache(entry.skill_type);
+                if(skillBase == null)
+                    continue;
+                if (entry.level <= mob.level)
+                    if (mob.skills.containsKey(entry.name) == false)
+                        mob.skills.put(entry.skill_type, new CharacterSkill(skillBase, mob, entry.rank));
+                    else
+                        mob.skills.put(entry.skill_type, new CharacterSkill(skillBase, mob, entry.rank + mob.skills.get(entry.skill_type).getNumTrains()));
+            }
+    }
 }

src/engine/gameManager/PowersManager.java

@@ -53,13 +53,10 @@ public enum PowersManager {
     public static HashMap<Integer, AbstractPowerAction> powerActionsByID = new HashMap<>();
     public static HashMap<String, Integer> ActionTokenByIDString = new HashMap<>();
     public static HashMap<String, Integer> AnimationOverrides = new HashMap<>();
-    public static HashMap<Integer, ArrayList<MobPowerEntry>> AllMobPowers;
+    public static HashMap<Integer, ArrayList<RunePowerEntry>> _allRunePowers;
+    public static HashMap<Integer, ArrayList<RuneSkillAdjustEntry>> _allRuneSkillAdjusts;
     private static JobScheduler js;
 
-    private PowersManager() {
-
-    }
-
     public static void initPowersManager(boolean fullPowersLoad) {
 
         if (fullPowersLoad)
@@ -103,6 +100,16 @@ public enum PowersManager {
         }
     }
 
+    public static ArrayList<RunePowerEntry> getPowersForRune(int rune_id) {
+
+        ArrayList<RunePowerEntry> powerEntries = PowersManager._allRunePowers.get(rune_id);
+
+        if (powerEntries == null)
+            powerEntries = new ArrayList<>();
+
+        return powerEntries;
+    }
+
     // This pre-loads all powers and effects
     public static void InitializePowers() {
 
@@ -163,14 +170,6 @@ public enum PowersManager {
     public static void usePower(final PerformActionMsg msg, ClientConnection origin,
                                 boolean sendCastToSelf) {
 
-        PlayerCharacter pc = SessionManager.getPlayerCharacter(origin);
-
-        if(!pc.isFlying()) //cant be sitting if flying
-            CombatManager.toggleSit(false,origin);
-
-        if(pc.isMoving())
-            pc.stopMovement(pc.getMovementLoc());
-
         if (usePowerA(msg, origin, sendCastToSelf)) {
             // Cast failed for some reason, reset timer
 
@@ -179,10 +178,13 @@ public enum PowersManager {
             DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
 
             // Send Fail to cast message
+            PlayerCharacter pc = SessionManager
+                    .getPlayerCharacter(origin);
+
             if (pc != null) {
                 sendPowerMsg(pc, 2, msg);
                 if (pc.isCasting()) {
-                    pc.update(false);
+                    pc.update();
                 }
 
                 pc.setIsCasting(false);
@@ -210,41 +212,6 @@ public enum PowersManager {
 
         boolean CSRCast = false;
 
-        if(msg.getPowerUsedID() == 430628895) {
-
-            boolean failed = false;// group teleport
-            City city = ZoneManager.getCityAtLocation(playerCharacter.loc);
-            if (city == null) {
-                failed = true;
-            }else{
-                Bane bane = city.getBane();
-                if (bane == null) {
-                    failed = true;
-                }else{
-                    if(!bane.getSiegePhase().equals(SiegePhase.WAR)){
-                        failed = true;
-                    }
-                }
-            }
-            if(failed){
-                //check to see if we are at an active mine
-                Zone zone = ZoneManager.findSmallestZone(playerCharacter.loc);
-                if(zone != null){
-                    Mine mine = null;
-                    for(Building building : zone.zoneBuildingSet){
-                        if(building.getBlueprint().getBuildingGroup().equals(BuildingGroup.MINE)){
-                            mine = Mine.getMineFromTower(building.getObjectUUID());
-                        }
-                    }
-                    if(mine != null){
-                        failed = !mine.isActive;
-                    }
-                }
-            }
-
-            if(failed)
-                return false;
-        }
 
         if (MBServerStatics.POWERS_DEBUG) {
             ChatManager.chatSayInfo(
@@ -281,7 +248,6 @@ public enum PowersManager {
 
         // get power
         PowersBase pb = PowersManager.powersBaseByToken.get(msg.getPowerUsedID());
-
         if (pb == null) {
             ChatManager.chatSayInfo(playerCharacter,
                     "This power is not implemented yet.");
@@ -293,35 +259,6 @@ public enum PowersManager {
             // return false;
         }
 
-        //check for movement buffs while flying
-        if(playerCharacter.isFlying()) {
-            switch(pb.token){
-                case 429005674:
-                case 429505739:
-                case 431054700:
-                case 428005600:
-                case 431610080:
-                case 427935608:
-                case 427857146:
-                case 427988218:
-                case 431854842:
-                case 421074170:
-                case 429611355:
-                case 428955899:
-                case 1794395699:
-                case 429428796:
-                case 1514898036:
-                    ChatManager.chatSystemInfo(playerCharacter, "You Cannot Fly While Having A MovementBuff");
-                    //resync stamina
-                    playerCharacter.setStamina(playerCharacter.getStamina(), playerCharacter);
-
-                    // Update all surrounding clients.
-                    TargetedActionMsg cmm = new TargetedActionMsg(playerCharacter);
-                    DispatchMessage.dispatchMsgToInterestArea(playerCharacter, cmm, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
-                    return true;
-            }
-        }
-
         if (playerCharacter.getLastPower() != null)
             return true;
 
@@ -349,12 +286,6 @@ public enum PowersManager {
             msg.setNumTrains(trains);
         }
 
-        switch(pb.token){
-            case 429420458: // BH eyes
-                msg.setNumTrains(msg.getNumTrains() * 2);
-                break;
-        }
-
         // can't go over total trains by player
         if (playerCharacter.getPowers() != null && playerCharacter.getPowers().containsKey(msg.getPowerUsedID())) {
             CharacterPower cp = playerCharacter.getPowers().get(msg.getPowerUsedID());
@@ -446,20 +377,15 @@ public enum PowersManager {
                 float range = pb.getRange();
                 // verify target is in range
 
-                if(pb.token != 429396028) {
-
-                    if (verifyInvalidRange(playerCharacter, target, range))
-                        // (pc.getLoc().distance(target.getLoc()) > pb.getRange()) {
-                        // TODO send message that target is out of range
-                        return true;
-// verify target is valid type
-                    if (!validateTarget(target, playerCharacter, pb))
-                        return true;
-                }else{
-                    pb.isSpell = false;
-                }
 
+                if (verifyInvalidRange(playerCharacter, target, range))
+                    // (pc.getLoc().distance(target.getLoc()) > pb.getRange()) {
+                    // TODO send message that target is out of range
+                    return true;
 
+                // verify target is valid type
+                if (!validateTarget(target, playerCharacter, pb))
+                    return true;
 
 
                 if (AbstractWorldObject.IsAbstractCharacter(target))
@@ -568,6 +494,7 @@ public enum PowersManager {
         // Validity checks passed, move on to casting spell
         //get caster's live counter
         int casterLiveCounter = playerCharacter.getLiveCounter();
+
         // run recycle job for when cast is available again, don't bother adding the timer for CSRs
         if (time > 0) {
             FinishRecycleTimeJob frtj = new FinishRecycleTimeJob(playerCharacter, msg);
@@ -594,7 +521,7 @@ public enum PowersManager {
 
         // make person casting stand up if spell (unless they're casting a chant which does not make them stand up)
         if (pb.isSpell() && !pb.isChant() && playerCharacter.isSit()) {
-            playerCharacter.update(false);
+            playerCharacter.update();
             playerCharacter.setSit(false);
             UpdateStateMsg updateStateMsg = new UpdateStateMsg(playerCharacter);
             DispatchMessage.dispatchMsgToInterestArea(playerCharacter, updateStateMsg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
@@ -602,9 +529,7 @@ public enum PowersManager {
         }
 
         // update cast (use skill) fail condition
-        if(pb.token != 429396028) {
+        playerCharacter.cancelOnCast();
-            playerCharacter.cancelOnCast();
-        }
 
         // update castSpell (use spell) fail condition if spell
         if (pb.isSpell())
@@ -617,12 +542,13 @@ public enum PowersManager {
 
 
         if (time > 100) {
-            playerCharacter.update(false);
+            playerCharacter.update();
             playerCharacter.setIsCasting(true);
         }
 
 
         playerCharacter.setLastMovementState(playerCharacter.getMovementState());
+
         // run timer job to end cast
         if (time < 1) // run immediately
             finishUsePower(copyMsg, playerCharacter, casterLiveCounter, targetLiveCounter);
@@ -787,16 +713,8 @@ public enum PowersManager {
         if (playerCharacter == null || msg == null)
             return;
 
-        if((msg.getPowerUsedID() == 429495514 || msg.getPowerUsedID() == 429407306) && playerCharacter.getRace().getName().toLowerCase().contains("shade")){
-            //msg.setPowerUsedID(407015607);
-            applyPower(playerCharacter,playerCharacter,playerCharacter.loc,429397210,msg.getNumTrains(),false);
-        }
-        if(msg.getPowerUsedID() == 429494441) {//wildkins chase
-            playerCharacter.removeEffectBySource(EffectSourceType.Root,40,true);
-            playerCharacter.removeEffectBySource(EffectSourceType.Snare,40,true);
-        }
         if (playerCharacter.isCasting()) {
-            playerCharacter.update(false);
+            playerCharacter.update();
             playerCharacter.updateStamRegen(-100);
         }
 
@@ -898,16 +816,15 @@ public enum PowersManager {
                 }
                 float range = pb.getRange() + speedRange;
 
-                if(pb.token != 429396028) {
 
-                    if (verifyInvalidRange(playerCharacter, mainTarget, range)) {
+                if (verifyInvalidRange(playerCharacter, mainTarget, range)) {
 
-                        sendPowerMsg(playerCharacter, 8, msg);
+                    sendPowerMsg(playerCharacter, 8, msg);
-                        return;
+                    return;
-                    }
-                    // (pc.getLoc().distance(target.getLoc()) > pb.getRange()) {
-                    // TODO send message that target is out of range
                 }
+                // (pc.getLoc().distance(target.getLoc()) > pb.getRange()) {
+                // TODO send message that target is out of range
+
 
             }
 
@@ -929,8 +846,6 @@ public enum PowersManager {
             return;
         }
 
-        playerCharacter.setHateValue(pb.getHateValue(trains));
-
         //Send Cast Message.
 //		PerformActionMsg castMsg = new PerformActionMsg(msg);
 //		castMsg.setNumTrains(9999);
@@ -981,8 +896,6 @@ public enum PowersManager {
             //Power is aiding a target, handle aggro if combat target is a Mob.
             if (!pb.isHarmful() && target.getObjectType() == GameObjectType.PlayerCharacter) {
                 PlayerCharacter pcTarget = (PlayerCharacter) target;
-                if (!pb.isHarmful())
-                    Mob.HandleAssistedAggro(playerCharacter, pcTarget);
             }
 
             // update target of used power timer
@@ -1323,7 +1236,7 @@ public enum PowersManager {
 
         PlayerCharacter target = SessionManager
                 .getPlayerCharacterByLowerCaseName(msg.getTargetName());
-        if (target == null || target.equals(pc)) {
+        if (target == null || target.equals(pc) || target.isCombat()) {
 
             if (target == null) // Player not found. Send not found message
                 ChatManager.chatInfoError(pc,
@@ -1427,16 +1340,6 @@ public enum PowersManager {
                 else
                     duration = 45000; // Belgosh Summons, 45 seconds
 
-                boolean enemiesNear = false;
-                for(AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(pc.loc,MBServerStatics.CHARACTER_LOAD_RANGE, MBServerStatics.MASK_PLAYER)){
-                    PlayerCharacter playerCharacter = (PlayerCharacter)awo;
-                    if(!playerCharacter.guild.getNation().equals(pc.guild.getNation())){
-                        enemiesNear = true;
-                    }
-                }
-
-                if(enemiesNear && !pc.isInSafeZone())
-                    duration += 60000;
 
                 // Teleport to summoners location
                 FinishSummonsJob fsj = new FinishSummonsJob(source, pc);
@@ -1562,17 +1465,8 @@ public enum PowersManager {
         }
 
         // create list of characters
-        HashSet<AbstractCharacter> trackChars;
+        HashSet<AbstractCharacter> trackChars = RangeBasedAwo.getTrackList(
-        switch(msg.getPowerToken()){
+                allTargets, playerCharacter, maxTargets);
-            case 431511776:
-            case 429578587:
-            case 429503360:
-                trackChars = getTrackList(playerCharacter);
-                break;
-            default:
-                trackChars = RangeBasedAwo.getTrackList(allTargets, playerCharacter, maxTargets);
-                break;
-        }
 
         TrackWindowMsg trackWindowMsg = new TrackWindowMsg(msg);
 
@@ -1585,30 +1479,6 @@ public enum PowersManager {
 
     }
 
-    public static HashSet<AbstractCharacter> getTrackList(PlayerCharacter tracker){
-        HashSet<AbstractCharacter> list = new HashSet<AbstractCharacter>();
-        HashSet<AbstractWorldObject> shortList = WorldGrid.getObjectsInRangePartial(tracker.loc,MBServerStatics.CHARACTER_LOAD_RANGE, MBServerStatics.MASK_PLAYER);
-        HashSet<AbstractWorldObject> fullList = WorldGrid.getObjectsInRangePartial(tracker.loc,1408, MBServerStatics.MASK_PLAYER);
-        ArrayList<Guild> guildsPresent = new ArrayList<>();
-        for(AbstractWorldObject awo : shortList){
-            PlayerCharacter pc = (PlayerCharacter)awo;
-            if(!guildsPresent.contains(pc.guild.getNation())){
-                guildsPresent.add(pc.guild.getNation());
-            }
-        }
-        for(AbstractWorldObject awo : fullList){
-            if(awo.equals(tracker))
-                continue;
-            PlayerCharacter pc = (PlayerCharacter)awo;
-            if(!pc.isAlive())
-                continue;
-            if(guildsPresent.contains(pc.guild.getNation()))
-                list.add(pc);
-        }
-
-        return list;
-    }
-
     private static void sendRecyclePower(int token, ClientConnection origin) {
         RecyclePowerMsg recyclePowerMsg = new RecyclePowerMsg(token);
 
@@ -2322,7 +2192,7 @@ public enum PowersManager {
 
         // set player is not casting for regens
         if (pc.isCasting()) {
-            pc.update(false);
+            pc.update();
         }
         pc.setIsCasting(false);
 
@@ -2374,26 +2244,28 @@ public enum PowersManager {
             defense = 0f;
         // Get hit chance
 
-        //if (pc.getDebug(16)) {
+        if (pc.getDebug(16)) {
-        //    String smsg = "ATR: " + atr + ", Defense: " + defense;
+            String smsg = "ATR: " + atr + ", Defense: " + defense;
-         //   ChatManager.chatSystemInfo(pc, smsg);
+            ChatManager.chatSystemInfo(pc, smsg);
-        //}
+        }
 
-        //int chance;
+        int chance;
 
-        //if (atr > defense || defense == 0)
+        if (atr > defense || defense == 0)
-        //    chance = 94;
+            chance = 94;
-        //else {
+        else {
-        //    float dif = atr / defense;
+            float dif = atr / defense;
-        //    if (dif <= 0.8f)
+            if (dif <= 0.8f)
-        //        chance = 4;
+                chance = 4;
-        //    else
+            else
-        //        chance = ((int) (450 * (dif - 0.8f)) + 4);
+                chance = ((int) (450 * (dif - 0.8f)) + 4);
-        //}
+        }
 
         // calculate hit/miss
+        int roll = ThreadLocalRandom.current().nextInt(100);
 
-        if (CombatManager.LandHit((int)atr,(int)defense)) {
+        boolean disable = true;
+        if (roll < chance) {
             // Hit, check if dodge kicked in
             if (awo instanceof AbstractCharacter) {
                 AbstractCharacter tarAc = (AbstractCharacter) awo;
@@ -2693,9 +2565,7 @@ public enum PowersManager {
     }
 
     public static void cancelOnStun(AbstractCharacter ac) {
-        if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
+
-            //PlayerCharacter.GroundPlayer((PlayerCharacter)ac);
-        }
     }
 
     private static PowersBase getLastPower(AbstractCharacter ac) {

src/engine/gameManager/SimulationManager.java

@@ -10,7 +10,10 @@ package engine.gameManager;
 
 import engine.Enum;
 import engine.Enum.GameObjectType;
-import engine.objects.*;
+import engine.objects.AbstractGameObject;
+import engine.objects.City;
+import engine.objects.PlayerCharacter;
+import engine.objects.Runegate;
 import org.pmw.tinylog.Logger;
 
 import java.sql.Connection;
@@ -30,7 +33,7 @@ public enum SimulationManager {
     SERVERHEARTBEAT;
 
     private static final long CITY_PULSE = 2000;
-    private static final long RUNEGATE_PULSE = 1000;
+    private static final long RUNEGATE_PULSE = 3000;
     private static final long UPDATE_PULSE = 1000;
     private static final long FlIGHT_PULSE = 100;
     public static Duration executionTime = Duration.ofNanos(1);
@@ -113,18 +116,9 @@ public enum SimulationManager {
         }
 
         try {
-            if ((_cityPulseTime != 0) && (System.currentTimeMillis() > _cityPulseTime)) {
+            if ((_cityPulseTime != 0)
-                try {
+                    && (System.currentTimeMillis() > _cityPulseTime))
-                    pulseCities();
+                pulseCities();
-                }catch(Exception e){
-
-                }
-                try {
-                    ArenaManager.pulseArenas();
-                }catch(Exception e){
-
-                }
-            }
         } catch (Exception e) {
             Logger.error(
                     "Fatal error in City Pulse: DISABLED. Error Message : "
@@ -160,7 +154,7 @@ public enum SimulationManager {
 
             if (player == null)
                 continue;
-            player.update(false);
+            player.update();
         }
 
         _updatePulseTime = System.currentTimeMillis() + 500;
@@ -209,12 +203,8 @@ public enum SimulationManager {
             city = (City) cityObject;
             city.onEnter();
         }
-        for(Mine mine : Mine.getMines()){
-            if(mine != null && mine.isActive)
-                mine.onEnter();
-        }
-        _cityPulseTime = System.currentTimeMillis() + CITY_PULSE;
 
+        _cityPulseTime = System.currentTimeMillis() + CITY_PULSE;
     }
 
     /*
@@ -224,10 +214,6 @@ public enum SimulationManager {
     private void pulseRunegates() {
 
         for (Runegate runegate : Runegate._runegates.values()) {
-            for(Portal portal : runegate._portals)
-                if(!portal.isActive())
-                    portal.activate(false);
-
             runegate.collidePortals();
         }
 

src/engine/gameManager/StrongholdManager.java

@@ -1,383 +0,0 @@
-package engine.gameManager;
-
-import engine.Enum;
-import engine.InterestManagement.InterestManager;
-import engine.InterestManagement.WorldGrid;
-import engine.math.Vector2f;
-import engine.math.Vector3f;
-import engine.math.Vector3fImmutable;
-import engine.objects.*;
-import engine.server.MBServerStatics;
-import org.pmw.tinylog.Logger;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.concurrent.ThreadLocalRandom;
-
-public class StrongholdManager {
-
-    public static void processStrongholds() {
-        ArrayList<Mine> mines = Mine.getMines();
-
-
-        //process strongholds selecting 3 randomly to become active
-        int count = 0;
-        while (count < 3) {
-            int random = ThreadLocalRandom.current().nextInt(1, mines.size()) - 1;
-            Mine mine = mines.get(random);
-            if (mine != null) {
-                if (!mine.isActive && !mine.isStronghold) {
-                    StartStronghold(mine);
-                    count++;
-                }
-            }
-        }
-    }
-
-    public static void StartStronghold(Mine mine){
-
-        //remove buildings
-        Building tower = BuildingManager.getBuilding(mine.getBuildingID());
-        if(tower == null)
-            return;
-
-        mine.isStronghold = true;
-        mine.strongholdMobs = new ArrayList<>();
-        mine.oldBuildings = new HashMap<>();
-
-        Zone mineZone = ZoneManager.findSmallestZone(tower.loc);
-        for(Building building : mineZone.zoneBuildingSet){
-            mine.oldBuildings.put(building.getObjectUUID(),building.meshUUID);
-            building.setMeshUUID(407650);
-            building.setMeshScale(new Vector3f(0,0,0));
-            InterestManager.setObjectDirty(building);
-            WorldGrid.updateObject(building);
-        }
-
-        //update tower to become stronghold mesh
-        tower.setMeshUUID(getStrongholdMeshID(mine.getParentZone()));
-        tower.setMeshScale(new Vector3f(1,1,1));
-        InterestManager.setObjectDirty(tower);
-        WorldGrid.updateObject(tower);
-
-        //create elite mobs
-        for(int i = 0; i < mine.capSize * 2; i++){
-            Vector3fImmutable loc = Vector3fImmutable.getRandomPointOnCircle(tower.loc,30);
-            MobBase guardBase = MobBase.getMobBase(getStrongholdGuardianID(tower.meshUUID));
-            Mob guard = Mob.createStrongholdMob(guardBase.getLoadID(), loc, Guild.getErrantGuild(),true,mineZone,null,0, guardBase.getFirstName(),65);
-            if(guard != null){
-                guard.parentZone = mine.getParentZone();
-                guard.bindLoc = loc;
-                guard.setLoc(loc);
-                guard.StrongholdGuardian = true;
-                guard.equipmentSetID = getStrongholdMobEquipSetID(guard);
-                guard.runAfterLoad();
-                guard.setLevel((short)65);
-                guard.setResists(new Resists("Elite"));
-                guard.spawnTime = 1000000000;
-                guard.BehaviourType = Enum.MobBehaviourType.Aggro;
-                mine.strongholdMobs.add(guard);
-                LootManager.GenerateStrongholdLoot(guard,false,false);
-                guard.healthMax  = 12500;
-                guard.setHealth(guard.healthMax);
-                guard.maxDamageHandOne = 1550;
-                guard.minDamageHandOne = 750;
-                guard.atrHandOne = 1800;
-                guard.defenseRating = 2200;
-                guard.setFirstName("Elite Guardian");
-                InterestManager.setObjectDirty(guard);
-                WorldGrid.addObject(guard,loc.x,loc.z);
-                WorldGrid.updateObject(guard);
-                guard.stronghold = mine;
-                guard.mobPowers.clear();
-                guard.mobPowers.put(429399948,20); // find weakness
-            }
-        }
-        //create stronghold commander
-        Vector3fImmutable loc = tower.loc;
-        MobBase commanderBase = MobBase.getMobBase(getStrongholdCommanderID(tower.meshUUID));
-        Mob commander = Mob.createStrongholdMob(commanderBase.getLoadID(), loc,Guild.getErrantGuild(),true,mineZone,null,0, commanderBase.getFirstName(),75);
-        if(commander != null){
-            commander.parentZone = mine.getParentZone();
-            commander.bindLoc = loc;
-            commander.setLoc(loc);
-            commander.StrongholdCommander = true;
-            commander.equipmentSetID = getStrongholdMobEquipSetID(commander);
-            commander.runAfterLoad();
-            commander.setLevel((short)75);
-            commander.setResists(new Resists("Elite"));
-            commander.spawnTime = 1000000000;
-            commander.BehaviourType = Enum.MobBehaviourType.Aggro;
-            commander.mobPowers.clear();
-            commander.mobPowers.put(429032838, 40); // gravechill
-            commander.mobPowers.put(429757701,20); // magebolt
-            commander.mobPowers.put(429121388,20); // blight
-            commander.mobPowers.put(431566891,20); // lightning bolt
-            commander.mobPowers.put(428716075,20); // fire bolt
-            commander.mobPowers.put(429010987,20); // ice bolt
-            mine.strongholdMobs.add(commander);
-            LootManager.GenerateStrongholdLoot(commander,true, false);
-            commander.healthMax = 50000;
-            commander.setHealth(commander.healthMax);
-            commander.maxDamageHandOne = 3500;
-            commander.minDamageHandOne = 1500;
-            commander.atrHandOne = 3500;
-            commander.defenseRating = 3500;
-            commander.setFirstName("Guardian Commander");
-            InterestManager.setObjectDirty(commander);
-            WorldGrid.addObject(commander,loc.x,loc.z);
-            WorldGrid.updateObject(commander);
-            commander.stronghold = mine;
-        }
-
-        mine.isActive = true;
-        tower.setProtectionState(Enum.ProtectionState.PROTECTED);
-        tower.getBounds().setRegions(tower);
-        InterestManager.setObjectDirty(tower);
-        WorldGrid.updateObject(tower);
-        ChatManager.chatSystemChannel(mine.getZoneName() + "'s Stronghold Has Begun!");
-        Logger.info(mine.getZoneName() + "'s Stronghold Has Begun!");
-    }
-
-    public static void EndStronghold(Mine mine){
-
-        //restore the buildings
-        Building tower = BuildingManager.getBuilding(mine.getBuildingID());
-        if(tower == null)
-            return;
-
-        mine.isStronghold = false;
-
-        //get rid of the mobs
-        for(Mob mob : mine.strongholdMobs) {
-            mob.despawn();
-            mob.removeFromCache();
-            DbManager.MobQueries.DELETE_MOB(mob);
-        }
-
-        //restore the buildings
-        Zone mineZone = ZoneManager.findSmallestZone(tower.loc);
-        for(Building building : mineZone.zoneBuildingSet){
-            if(mine.oldBuildings.containsKey(building.getObjectUUID())) {
-                building.setMeshUUID(mine.oldBuildings.get(building.getObjectUUID()));
-                building.setMeshScale(new Vector3f(1, 1, 1));
-                InterestManager.setObjectDirty(building);
-                WorldGrid.updateObject(building);
-            }
-        }
-
-        //update tower to become Mine Tower again
-        tower.setMeshUUID(1500100);
-
-        mine.isActive = false;
-        tower.setProtectionState(Enum.ProtectionState.NPC);
-        tower.getBounds().setRegions(tower);
-        InterestManager.setObjectDirty(tower);
-        WorldGrid.updateObject(tower);
-        ChatManager.chatSystemChannel(mine.getZoneName() + "'s Stronghold Has Concluded!");
-        Logger.info(mine.getZoneName() + "'s Stronghold Has Concluded!");
-    }
-
-    public static int getStrongholdMeshID(Zone parent){
-        while(!parent.isMacroZone()){
-            parent = parent.getParent();
-            if(parent.getName().equalsIgnoreCase("seafloor")){
-                return 0;
-            }
-        }
-        switch(parent.getObjectUUID()){
-            case 197:
-            case 234:
-            case 178:
-            case 122:
-                return 814000; //Frost Giant Hall (ICE)
-            case 968:
-            case 951:
-            case 313:
-            case 331:
-                return 5001500; // Lich Queens Keep (UNDEAD)
-            case 785:
-            case 761:
-            case 717:
-            case 737:
-                return 1306600; // Temple of the Dragon (DESERT)
-            case 353:
-            case 371:
-            case 388:
-            case 532:
-                return 564600; // Undead Lord's Keep (SWAMP)
-            case 550:
-            case 508:
-            case 475:
-            case 418:
-                return 1326600; // elven hall
-            case 437:
-            case 491:
-            case 590:
-            case 569:
-                return 602400;
-            case 824:
-            case 842:
-            case 632:
-                return 1600000; // chaos temple
-        }
-        return 456100; // small stockade
-    }
-
-    public static int getStrongholdGuardianID(int ID){
-        switch(ID){
-            case 814000:
-                return 253004; // Mountain Giant Raider Axe
-            case 5001500:
-                return 253008; // Vampire Spear Warrior
-            case 1306600:
-                return 253007; // Desert Orc Warrior
-            case 564600:
-                return 253010; // Kolthoss Warrior
-            case 1326600:
-                return 253005; //elven warrior
-            case 602400:
-                return 253009; // templar missionary
-            case 1600000:
-                return 253006; // scourger
-        }
-        return 13434; // human sword and board warrior
-    }
-
-    public static int getStrongholdEpicID(int ID){
-        switch(ID){
-            case 814000:
-                return 253023; // Mountain Giant Raider Axe
-            case 5001500:
-                return 253022; // Vampire Spear Warrior
-            case 1306600:
-                return 253021; // Desert Orc Warrior
-            case 564600:
-                return 253018; // Kolthoss Warrior
-            case 1326600:
-                return 253019; //elven warrior
-            case 602400:
-                return 253024; // templar missionary
-            case 1600000:
-                return 253020; // scourger
-        }
-        return 13434; // human sword and board warrior
-    }
-
-    public static int getStrongholdCommanderID(int ID){
-        switch(ID){
-            case 814000:
-                return 253017;
-            case 5001500:
-                return 253012;
-            case 1306600:
-                return 253016; // Desert Orc Xbow
-            case 564600:
-                return 253011; // xbow kolthoss
-            case 1326600:
-                return 253013; //elven bow warrior
-            case 602400:
-                return 253015; // dune giant with xbow
-            case 1600000:
-                return 253014; // barbator
-        }
-        return 13433;
-    }
-
-    public static int getStrongholdMobEquipSetID(Mob mob) {
-        if(mob.StrongholdGuardian){
-            return 6327;
-        }else{
-            return 10790;
-        }
-    }
-
-    public static void CheckToEndStronghold(Mine mine) {
-
-        boolean stillAlive = false;
-        for (Mob mob : mine.strongholdMobs)
-            if (mob.isAlive())
-                stillAlive = true;
-
-        if (!stillAlive) {
-            // Epic encounter
-
-            Building tower = BuildingManager.getBuilding(mine.getBuildingID());
-            if (tower == null)
-                return;
-
-            Zone mineZone = ZoneManager.findSmallestZone(tower.loc);
-
-            Vector3fImmutable loc = tower.loc;
-            MobBase commanderBase = MobBase.getMobBase(getStrongholdEpicID(tower.meshUUID));
-            Mob commander = Mob.createStrongholdMob(commanderBase.getLoadID(), loc, Guild.getErrantGuild(), true, mineZone, null, 0, commanderBase.getFirstName(), 75);
-            if (commander != null) {
-                commander.parentZone = mine.getParentZone();
-                commander.bindLoc = loc;
-                commander.setLoc(loc);
-                commander.StrongholdEpic = true;
-                commander.equipmentSetID = getStrongholdMobEquipSetID(commander);
-                commander.runAfterLoad();
-                commander.setLevel((short) 85);
-                commander.setResists(new Resists("Elite"));
-                commander.spawnTime = 1000000000;
-                commander.BehaviourType = Enum.MobBehaviourType.Aggro;
-                commander.mobPowers.clear();
-                commander.mobPowers.put(429032838, 40); // gravechill
-                commander.mobPowers.put(429757701,40); // magebolt
-                commander.mobPowers.put(429121388,40); // blight
-                commander.mobPowers.put(431566891,40); // lightning bolt
-                commander.mobPowers.put(428716075,40); // fire bolt
-                commander.mobPowers.put(429010987,40); // ice bolt
-                mine.strongholdMobs.add(commander);
-                LootManager.GenerateStrongholdLoot(commander, true, true);
-                commander.healthMax = 250000;
-                commander.setHealth(commander.healthMax);
-                commander.maxDamageHandOne = 5000;
-                commander.minDamageHandOne = 2500;
-                commander.atrHandOne = 5000;
-                commander.defenseRating = 3500;
-                commander.setFirstName("Defender of " + mine.getParentZone().getParent().getName());
-                InterestManager.setObjectDirty(commander);
-                WorldGrid.addObject(commander,loc.x,loc.z);
-                WorldGrid.updateObject(commander);
-                commander.stronghold = mine;
-
-            }
-        }
-    }
-
-    //=====================================NEW STUFF
-
-    public static void generateMaze(){
-        Zone stronghold = ZoneManager.getZoneByUUID(995);
-        ArrayList<Vector3fImmutable> gridLocs = new ArrayList<>();
-        for(int x = -7; x < 8; x++){
-            for(int z = -7; z < 8; z++) {
-            if((x >= -1 || x <= 1) && (z >= -1 || z <= 1))
-                continue;
-            float offsetX = x * 128;
-            float offsetZ = z * 128;
-            Vector3fImmutable sLoc = stronghold.getLoc();
-            Vector3fImmutable loc = new Vector3fImmutable(offsetX,sLoc.y,offsetZ);
-            gridLocs.add(loc);
-            }
-        }
-        for(Vector3fImmutable loc : gridLocs){
-            createBuilding(stronghold,405600,loc);
-        }
-    }
-
-    public static void createBuilding(Zone zone, int blueprint, Vector3fImmutable offset){
-
-        Vector3fImmutable localLoc = ZoneManager.worldToLocal(offset, zone);
-
-        Building building = DbManager.BuildingQueries.
-                CREATE_BUILDING(
-                        zone.getObjectUUID(), 0, "", 1,
-                        localLoc, 1.0f, 0, Enum.ProtectionState.PROTECTED, 0, 1,
-                        null, blueprint, 0, 0);
-        building.setObjectTypeMask(MBServerStatics.MASK_BUILDING);
-        WorldGrid.addObject(building,zone.getLoc().x + offset.x,zone.getLoc().z + offset.z);
-    }
-}

src/engine/gameManager/ZergManager.java

@@ -1,195 +0,0 @@
-package engine.gameManager;
-import engine.objects.Guild;
-public class ZergManager {
-
-    public static float getCurrentMultiplier(int count, int maxCount){
-        switch(maxCount) {
-            case 3: return getMultiplier3Man(count);
-            case 5: return getMultiplier5Man(count);
-            case 10: return getMultiplier10Man(count);
-            case 20: return getMultiplier20Man(count);
-            case 30: return getMultiplier30Man(count);
-            case 40: return getMultiplier40Man(count);
-            default: return 1.0f; //unlimited
-        }
-    }
-    public static float getMultiplier3Man(int count) {
-        if(count < 4)
-            return 1.0f;
-
-        if(count > 6)
-            return 0.0f;
-
-        switch(count){
-            case 4: return 0.63f;
-            case 5: return 0.40f;
-            case 6: return 0.25f;
-            default: return 1.0f;
-        }
-    }
-    public static float getMultiplier5Man(int count) {
-        if(count < 6)
-            return 1.0f;
-
-        if(count > 10)
-            return 0.0f;
-
-        switch(count){
-            case 6: return 0.75f;
-            case 7: return 0.57f;
-            case 8: return 0.44f;
-            case 9: return 0.33f;
-            case 10: return 0.25f;
-            default: return 1.0f;
-        }
-    }
-    public static float getMultiplier10Man(int count) {
-        if(count < 11)
-            return 1.0f;
-
-        if(count > 20)
-            return 0.0f;
-
-        switch(count){
-            case 11: return 0.86f;
-            case 12: return 0.75f;
-            case 13: return 0.65f;
-            case 14: return 0.57f;
-            case 15: return 0.50f;
-            case 16: return 0.44f;
-            case 17: return 0.38f;
-            case 18: return 0.33f;
-            case 19: return 0.29f;
-            case 20: return 0.25f;
-            default: return 1.0f;
-        }
-    }
-    public static float getMultiplier20Man(int count) {
-        if(count < 21)
-            return 1.0f;
-
-        if(count > 40)
-            return 0.0f;
-
-        switch (count)
-        {
-            case 21: return 0.93f;
-            case 22: return 0.86f;
-            case 23: return 0.80f;
-            case 24: return 0.75f;
-            case 25: return 0.70f;
-            case 26: return 0.65f;
-            case 27: return 0.61f;
-            case 28: return 0.57f;
-            case 29: return 0.53f;
-            case 30: return 0.50f;
-            case 31: return 0.47f;
-            case 32: return 0.44f;
-            case 33: return 0.41f;
-            case 34: return 0.38f;
-            case 35: return 0.36f;
-            case 36: return 0.33f;
-            case 37: return 0.31f;
-            case 38: return 0.29f;
-            case 39: return 0.27f;
-            case 40: return 0.25f;
-            default: return 1.0f;
-        }
-
-    }
-    public static float getMultiplier30Man(int count) {
-        if(count < 31)
-            return 1.0f;
-
-        if(count > 60)
-            return 0.0f;
-
-        switch (count)
-        {
-            case 31: return 0.95f;
-            case 32: return 0.91f;
-            case 33: return 0.86f;
-            case 34: return 0.82f;
-            case 35: return 0.79f;
-            case 36: return 0.75f;
-            case 37: return 0.72f;
-            case 38: return 0.68f;
-            case 39: return 0.65f;
-            case 40: return 0.63f;
-            case 41: return 0.60f;
-            case 42: return 0.57f;
-            case 43: return 0.55f;
-            case 44: return 0.52f;
-            case 45: return 0.50f;
-            case 46: return 0.48f;
-            case 47: return 0.46f;
-            case 48: return 0.44f;
-            case 49: return 0.42f;
-            case 50: return 0.40f;
-            case 51: return 0.38f;
-            case 52: return 0.37f;
-            case 53: return 0.35f;
-            case 54: return 0.33f;
-            case 55: return 0.32f;
-            case 56: return 0.30f;
-            case 57: return 0.29f;
-            case 58: return 0.28f;
-            case 59: return 0.26f;
-            case 60: return 0.25f;
-            default: return 1.0f;
-        }
-
-    }
-    public static float getMultiplier40Man(int count) {
-        if(count < 41)
-            return 1.0f;
-
-        if(count > 80)
-            return 0.0f;
-
-        switch (count)
-        {
-            case 41: return 0.96f;
-            case 42: return 0.93f;
-            case 43: return 0.90f;
-            case 44: return 0.86f;
-            case 45: return 0.83f;
-            case 46: return 0.80f;
-            case 47: return 0.78f;
-            case 48: return 0.75f;
-            case 49: return 0.72f;
-            case 50: return 0.70f;
-            case 51: return 0.68f;
-            case 52: return 0.65f;
-            case 53: return 0.63f;
-            case 54: return 0.61f;
-            case 55: return 0.59f;
-            case 56: return 0.57f;
-            case 57: return 0.55f;
-            case 58: return 0.53f;
-            case 59: return 0.52f;
-            case 60: return 0.50f;
-            case 61: return 0.48f;
-            case 62: return 0.47f;
-            case 63: return 0.45f;
-            case 64: return 0.44f;
-            case 65: return 0.42f;
-            case 66: return 0.41f;
-            case 67: return 0.40f;
-            case 68: return 0.38f;
-            case 69: return 0.37f;
-            case 70: return 0.36f;
-            case 71: return 0.35f;
-            case 72: return 0.33f;
-            case 73: return 0.32f;
-            case 74: return 0.31f;
-            case 75: return 0.30f;
-            case 76: return 0.29f;
-            case 77: return 0.28f;
-            case 78: return 0.27f;
-            case 79: return 0.26f;
-            case 80: return 0.25f;
-            default: return 1.0f;
-        }
-    }
-}

src/engine/gameManager/ZoneManager.java

@@ -19,12 +19,14 @@ import engine.objects.Building;
 import engine.objects.City;
 import engine.objects.Zone;
 import engine.server.MBServerStatics;
+import org.pmw.tinylog.Logger;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ThreadLocalRandom;
 
 /*
  * Class contains methods and structures which
@@ -107,6 +109,20 @@ public enum ZoneManager {
 
     }
 
+    // Returns the number of available hotZones
+    // remaining in this cycle (1am)
+
+    public static int availableHotZones() {
+
+        int count = 0;
+
+        for (Zone zone : ZoneManager.macroZones)
+            if (ZoneManager.validHotZone(zone))
+                count = count + 1;
+
+        return count;
+    }
+
     // Resets the  availability of hotZones
     // for this cycle
 
@@ -201,6 +217,63 @@ public enum ZoneManager {
         ZoneManager.playerCityZones.add(zone);
     }
 
+    public static final void generateAndSetRandomHotzone() {
+
+        Zone hotZone;
+        ArrayList<Integer> zoneArray = new ArrayList<>();
+
+        if (ZoneManager.macroZones.isEmpty())
+            return;
+
+        // Reset hotZone availability if none are left.
+
+        if (ZoneManager.availableHotZones() == 0)
+            ZoneManager.resetHotZones();
+
+        for (Zone zone : ZoneManager.macroZones)
+            if (validHotZone(zone))
+                zoneArray.add(zone.getObjectUUID());
+
+        int entryIndex = ThreadLocalRandom.current().nextInt(zoneArray.size());
+
+        hotZone = ZoneManager.getZoneByUUID(zoneArray.get(entryIndex));
+
+        if (hotZone == null) {
+            Logger.error("Hotzone is null");
+            return;
+        }
+
+        ZoneManager.setHotZone(hotZone);
+
+    }
+
+    public static final boolean validHotZone(Zone zone) {
+
+        if (zone.getSafeZone() == (byte) 1)
+            return false; // no safe zone hotzones// if (this.hotzone == null)
+
+        if (zone.getNodes().isEmpty())
+            return false;
+
+        if (zone.equals(ZoneManager.seaFloor))
+            return false;
+
+        //no duplicate hotZones
+
+        if (zone.hasBeenHotzone == true)
+            return false;
+
+        // Enforce min level
+
+        if (zone.minLvl < Integer.parseInt(ConfigManager.MB_HOTZONE_MIN_LEVEL.getValue()))
+            return false;
+
+        if (ZoneManager.hotZone != null)
+            return ZoneManager.hotZone.getObjectUUID() != zone.getObjectUUID();
+
+        return true;
+    }
+
     // Converts world coordinates to coordinates local to a given zone.
 
     public static Vector3fImmutable worldToLocal(Vector3fImmutable worldVector,

src/engine/jobs/EndFearJob.java

@@ -29,7 +29,7 @@ public class EndFearJob extends AbstractEffectJob {
         if (this.target == null || (!(this.target instanceof Mob)))
             return;
 
-        ((Mob) this.target).setFearedObject(null);
+        ((Mob) this.target).fearedObject = null;
     }
 
     @Override
@@ -40,6 +40,6 @@ public class EndFearJob extends AbstractEffectJob {
         if (this.target == null || (!(this.target instanceof Mob)))
             return;
 
-        ((Mob) this.target).setFearedObject(null);
+        ((Mob) this.target).fearedObject = null;
     }
 }

src/engine/jobs/FinishSummonsJob.java

@@ -47,13 +47,13 @@ public class FinishSummonsJob extends AbstractScheduleJob {
             return;
 
         // cannot summon a player in combat
-        //if (this.target.isCombat()) {
+        if (this.target.isCombat()) {
 
-        //    ErrorPopupMsg.sendErrorMsg(this.source, "Cannot summon player in combat.");
+            ErrorPopupMsg.sendErrorMsg(this.source, "Cannot summon player in combat.");
 
-        //    PowersManager.finishRecycleTime(428523680, this.source, false);
+            PowersManager.finishRecycleTime(428523680, this.source, false);
-        //    return;
+            return;
-        //}
+        }
 
         if (this.target.getBonuses() != null && this.target.getBonuses().getBool(ModType.BlockedPowerType, SourceType.SUMMON)) {
             ErrorPopupMsg.sendErrorMsg(this.target, "You have been blocked from receiving summons!");

src/engine/loot/ItemTableEntry.java

@@ -9,12 +9,10 @@
 package engine.loot;
 
 import engine.gameManager.LootManager;
-import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.List;
-import java.util.concurrent.ThreadLocalRandom;
 
 public class ItemTableEntry {
     public int minRoll;
@@ -37,23 +35,11 @@ public class ItemTableEntry {
         List<ItemTableEntry> itemTableEntryList;
 
         itemTableEntryList = LootManager._itemTables.get(itemTable);
-        if(itemTableEntryList != null) {
+
-            for (ItemTableEntry iteration : itemTableEntryList)
+        for (ItemTableEntry iteration : itemTableEntryList)
-                if (roll >= iteration.minRoll && roll <= iteration.maxRoll)
+            if (roll >= iteration.minRoll && roll <= iteration.maxRoll)
-                    itemTableEntry = iteration;
+                itemTableEntry = iteration;
-        }
+
         return itemTableEntry;
     }
-
-    public static Integer getRandomItem(int itemTable) {
-        int id = 0;
-        List<ItemTableEntry> itemTableEntryList;
-
-        itemTableEntryList = LootManager._itemTables.get(itemTable);
-
-        if(itemTableEntryList != null && itemTableEntryList.size() > 1){
-            id =  itemTableEntryList.get(ThreadLocalRandom.current().nextInt(0, itemTableEntryList.size())).cacheID;
-        }
-        return id;
-    }
 }

src/engine/loot/ModTableEntry.java

@@ -33,11 +33,11 @@ public class ModTableEntry {
         List<ModTableEntry> itemTableEntryList;
 
         itemTableEntryList = LootManager._modTables.get(modTablwe);
-        if(itemTableEntryList != null) {
+
-            for (ModTableEntry iteration : itemTableEntryList)
+        for (ModTableEntry iteration : itemTableEntryList)
-                if (roll >= iteration.minRoll && roll <= iteration.maxRoll)
+            if (roll >= iteration.minRoll && roll <= iteration.maxRoll)
-                    modTableEntry = iteration;
+                modTableEntry = iteration;
-        }
+
         return modTableEntry;
     }
 }

src/engine/math/Bounds.java

@@ -220,7 +220,7 @@ public class Bounds {
             //player is inside building region, skip collision check. we only do collision from the outside.
             if (player.region != null && player.region.parentBuildingID == building.getObjectUUID())
                 continue;
-            if (building.getBounds() == null || building.getBounds().colliders == null)
+            if (building.getBounds().colliders == null)
                 continue;
 
             for (Colliders collider : building.getBounds().colliders) {

src/engine/mobileAI/utilities/CombatUtilities.java

@@ -48,7 +48,7 @@ public class CombatUtilities {
     }
 
     public static boolean inRange2D(AbstractWorldObject entity1, AbstractWorldObject entity2, double range) {
-        return entity1.getLoc().distance2D(entity2.getLoc()) < range;
+        return entity1.getLoc().distanceSquared2D(entity2.getLoc()) < range * range;
     }
 
     public static void swingIsBlock(Mob agent, AbstractWorldObject target, int animation) {
@@ -139,22 +139,37 @@ public class CombatUtilities {
     }
 
     public static boolean triggerDefense(Mob agent, AbstractWorldObject target) {
-        int defense = 0;
+        int defenseScore = 0;
-        int atr = agent.getAtrHandOne();
+        int attackScore = agent.getAtrHandOne();
         switch (target.getObjectType()) {
             case PlayerCharacter:
-                defense = ((AbstractCharacter) target).getDefenseRating();
+                defenseScore = ((AbstractCharacter) target).getDefenseRating();
                 break;
             case Mob:
 
                 Mob mob = (Mob) target;
                 if (mob.isSiege())
-                    defense = atr;
+                    defenseScore = attackScore;
                 break;
             case Building:
                 return false;
         }
-        return CombatManager.LandHit(atr,defense);
+
+        int hitChance;
+        if (attackScore > defenseScore || defenseScore == 0)
+            hitChance = 94;
+        else if (attackScore == defenseScore && target.getObjectType() == GameObjectType.Mob)
+            hitChance = 10;
+        else {
+            float dif = attackScore / defenseScore;
+            if (dif <= 0.8f)
+                hitChance = 4;
+            else
+                hitChance = ((int) (450 * (dif - 0.8f)) + 4);
+            if (target.getObjectType() == GameObjectType.Building)
+                hitChance = 100;
+        }
+        return ThreadLocalRandom.current().nextInt(100) > hitChance;
     }
 
     public static boolean triggerBlock(Mob agent, AbstractWorldObject ac) {
@@ -249,19 +264,9 @@ public class CombatUtilities {
                 swingIsBlock(agent, target, passiveAnim);
                 return;
             }
-            if (agent.getEquip().get(1) != null && agent.getEquip().get(2) != null && agent.getEquip().get(2).getItemBase().isShield() == false) {
+
-                //mob is duel wielding and should conduct an attack for each hand
+            swingIsDamage(agent, target, determineDamage(agent), anim);
-                ItemBase weapon1 = agent.getEquip().get(1).getItemBase();
+
-                double range1 = getMaxDmg(weapon1.getMinDamage(), agent, weapon1) - getMinDmg(weapon1.getMinDamage(), agent, weapon1);
-                double damage1 = getMinDmg(weapon1.getMinDamage(), agent, weapon1) + ((ThreadLocalRandom.current().nextFloat() * range1) + (ThreadLocalRandom.current().nextFloat() * range1)) / 2;
-                swingIsDamage(agent, target, (float) damage1, CombatManager.getSwingAnimation(weapon1, null, true));
-                ItemBase weapon2 = agent.getEquip().get(2).getItemBase();
-                double range2 = getMaxDmg(weapon2.getMinDamage(), agent, weapon2) - getMinDmg(weapon2.getMinDamage(), agent, weapon2);
-                double damage2 = getMinDmg(weapon2.getMinDamage(), agent, weapon2) + ((ThreadLocalRandom.current().nextFloat() * range2) + (ThreadLocalRandom.current().nextFloat() * range2)) / 2;
-                swingIsDamage(agent, target, (float) damage2, CombatManager.getSwingAnimation(weapon1, null, false));
-            } else {
-                swingIsDamage(agent, target, determineDamage(agent), anim);
-            }
 
             if (agent.getWeaponPower() != null)
                 agent.getWeaponPower().attack(target, MBServerStatics.ONE_MINUTE);
@@ -304,19 +309,10 @@ public class CombatUtilities {
         if (target == null)
             return 0;
 
-        float damage = 0;
+        int damage = 0;
 
         DamageType dt = getDamageType(agent);
-        if ((agent.agentType.equals(AIAgentType.PET)) == true || agent.isPet() == true || agent.isNecroPet() == true) {
+        damage = ThreadLocalRandom.current().nextInt((int)getMinDmg(agent), (int)getMaxDmg(agent) + 1);
-            damage = calculatePetDamage(agent);
-        } else if (agent.isPlayerGuard() == true) {
-            //damage = calculateGuardDamage(agent);
-            damage = calculateMobDamage(agent);
-        } else if (agent.getLevel() > 80) {
-            damage = calculateEpicDamage(agent);
-        } else {
-            damage = calculateMobDamage(agent);
-        }
         if (AbstractWorldObject.IsAbstractCharacter(target)) {
             if (((AbstractCharacter) target).isSit()) {
                 damage *= 2.5f; //increase damage if sitting
@@ -342,158 +338,16 @@ public class CombatUtilities {
         return dt;
     }
 
-    public static int calculatePetDamage(Mob agent) {
+    public static double getMinDmg(Mob agent) {
-        //damage calc for pet
+        if(agent.equip.get(2) != null && !agent.equip.get(2).getItemBase().isShield())
-        float range;
+            return agent.minDamageHandTwo;
-        float damage;
+        else return agent.minDamageHandOne;
-        float min = 40;
-        float max = 60;
-        float dmgMultiplier = 1 + agent.getBonuses().getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None);
-        double minDmg = getMinDmg(min, agent, null);
-        double maxDmg = getMaxDmg(max, agent, null);
-        dmgMultiplier += agent.getLevel() * 0.1f;
-        range = (float) (maxDmg - minDmg);
-        damage = min + ((ThreadLocalRandom.current().nextFloat() * range) + (ThreadLocalRandom.current().nextFloat() * range)) / 2;
-        return (int) (damage * dmgMultiplier);
     }
 
-    public static int calculateGuardDamage(Mob agent) {
+    public static double getMaxDmg(Mob agent) {
-        //damage calc for guard
+        if(agent.equip.get(2) != null && !agent.equip.get(2).getItemBase().isShield())
-        ItemBase weapon = agent.getEquip().get(1).getItemBase();
+            return agent.maxDamageHandTwo;
-        AbstractWorldObject target = agent.getCombatTarget();
+        else return agent.maxDamageHandOne;
-
-        float dmgMultiplier = 1 + agent.getBonuses().getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None);
-
-        double minDmg = weapon.getMinDamage();
-        double maxDmg = weapon.getMaxDamage();
-        double min = getMinDmg(minDmg, agent, weapon);
-        double max = getMaxDmg(maxDmg, agent, weapon);
-
-        DamageType dt = weapon.getDamageType();
-
-        double range = max - min;
-        double damage = min + ((ThreadLocalRandom.current().nextFloat() * range) + (ThreadLocalRandom.current().nextFloat() * range)) / 2;
-
-        if (AbstractWorldObject.IsAbstractCharacter(target))
-            if (((AbstractCharacter) target).isSit())
-                damage *= 2.5f; //increase damage if sitting
-        if (AbstractWorldObject.IsAbstractCharacter(target))
-            return (int) (((AbstractCharacter) target).getResists().getResistedDamage(agent, (AbstractCharacter) target, dt, (float) damage, 0) * dmgMultiplier);
-        return 0;
-    }
-
-    public static int calculateEpicDamage(Mob agent) {
-        //handle r8 mob damage
-        DamageType dt = DamageType.Crush;
-        AbstractWorldObject target = agent.getCombatTarget();
-        float dmgMultiplier = 1 + agent.getBonuses().getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None);
-        double min = agent.getMinDamageHandOne();
-        double max = agent.getMaxDamageHandOne();
-        if (agent.getEquip().get(1) != null) {
-            if (agent.getEquip().get(1).getItemBase() != null) {
-                dt = agent.getEquip().get(1).getItemBase().getDamageType();
-                min = agent.getMinDamageHandOne();
-                max = agent.getMaxDamageHandOne();
-            } else if (agent.getEquip().get(2).getItemBase() != null && agent.getEquip().get(2).getItemBase().isShield() == false) {
-                dt = agent.getEquip().get(2).getItemBase().getDamageType();
-                min = agent.getMinDamageHandTwo();
-                max = agent.getMaxDamageHandTwo();
-            }
-        }
-
-
-        double range = max - min;
-        double damage = min + ((ThreadLocalRandom.current().nextFloat() * range) + (ThreadLocalRandom.current().nextFloat() * range)) / 2;
-        return (int) (((AbstractCharacter) target).getResists().getResistedDamage(agent, (AbstractCharacter) target, dt, (float) damage, 0) * dmgMultiplier);
-    }
-
-    public static int calculateMobDamage(Mob agent) {
-        ItemBase weapon = null;
-        double minDmg;
-        double maxDmg;
-        DamageType dt;
-
-        //main hand or offhand damage
-
-        if (agent.getEquip().get(1) != null)
-            weapon = agent.getEquip().get(1).getItemBase();
-        else if (agent.getEquip().get(2) != null)
-            weapon = agent.getEquip().get(2).getItemBase();
-
-        if (weapon != null) {
-            minDmg = getMinDmg(weapon.getMinDamage(), agent, weapon);
-            maxDmg = getMaxDmg(weapon.getMaxDamage(), agent, weapon);
-            dt = weapon.getDamageType();
-        } else {
-            minDmg = agent.getMobBase().getDamageMin();
-            maxDmg = agent.getMobBase().getDamageMax();
-            dt = DamageType.Crush;
-        }
-
-        AbstractWorldObject target = agent.getCombatTarget();
-
-        float dmgMultiplier = 1 + agent.getBonuses().getFloatPercentAll(ModType.MeleeDamageModifier, SourceType.None);
-        double range = maxDmg - minDmg;
-        double damage = minDmg + ((ThreadLocalRandom.current().nextFloat() * range) + (ThreadLocalRandom.current().nextFloat() * range)) / 2;
-
-        if (AbstractWorldObject.IsAbstractCharacter(target))
-            if (((AbstractCharacter) target).isSit())
-                damage *= 2.5f; //increase damage if sitting
-        if (AbstractWorldObject.IsAbstractCharacter(target))
-            return (int) (((AbstractCharacter) target).getResists().getResistedDamage(agent, (AbstractCharacter) target, dt, (float) damage, 0) * dmgMultiplier);
-        return 0;
-    }
-
-    public static double getMinDmg(double min, Mob agent, ItemBase weapon) {
-
-        int primary = agent.getStatStrCurrent();
-        int secondary = agent.getStatDexCurrent();
-        int focusLevel = 0;
-        int masteryLevel = 0;
-
-        if (weapon != null) {
-            if (weapon.isStrBased() == true) {
-                primary = agent.getStatStrCurrent();
-                secondary = agent.getStatDexCurrent();
-            } else {
-                primary = agent.getStatDexCurrent();
-                secondary = agent.getStatStrCurrent();
-                if (agent.getSkills().containsKey(weapon.getSkillRequired())) {
-                    focusLevel = (int) agent.getSkills().get(weapon.getSkillRequired()).getModifiedAmount();
-                }
-                if (agent.getSkills().containsKey(weapon.getMastery())) {
-                    masteryLevel = (int) agent.getSkills().get(weapon.getMastery()).getModifiedAmount();
-                }
-            }
-        }
-        return min * (pow(0.0048 * primary + .049 * (primary - 0.75), 0.5) + pow(0.0066 * secondary + 0.064 * (secondary - 0.75), 0.5) + +0.01 * (focusLevel + masteryLevel));
-    }
-
-    public static double getMaxDmg(double max, Mob agent, ItemBase weapon) {
-
-        int primary = agent.getStatStrCurrent();
-        int secondary = agent.getStatDexCurrent();
-        int focusLevel = 0;
-        int masteryLevel = 0;
-
-        if (weapon != null) {
-
-            if (weapon.isStrBased() == true) {
-                primary = agent.getStatStrCurrent();
-                secondary = agent.getStatDexCurrent();
-            } else {
-                primary = agent.getStatDexCurrent();
-                secondary = agent.getStatStrCurrent();
-            }
-
-            if (agent.getSkills().containsKey(weapon.getSkillRequired()))
-                focusLevel = (int) agent.getSkills().get(weapon.getSkillRequired()).getModifiedAmount();
-
-            if (agent.getSkills().containsKey(weapon.getSkillRequired()))
-                masteryLevel = (int) agent.getSkills().get(weapon.getMastery()).getModifiedAmount();
-
-        }
-        return max * (pow(0.0124 * primary + 0.118 * (primary - 0.75), 0.5) + pow(0.0022 * secondary + 0.028 * (secondary - 0.75), 0.5) + 0.0075 * (focusLevel + masteryLevel));
     }
 
 }

src/engine/mobileAI/utilities/MovementUtilities.java

@@ -13,10 +13,10 @@ import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.Enum.ModType;
 import engine.Enum.SourceType;
-import engine.mobileAI.Threads.MobAIThread;
 import engine.exception.MsgSendException;
 import engine.gameManager.MovementManager;
 import engine.math.Vector3fImmutable;
+import engine.mobileAI.Threads.MobAIThread;
 import engine.net.client.msg.MoveToPointMsg;
 import engine.objects.*;
 import org.pmw.tinylog.Logger;
@@ -38,7 +38,7 @@ public class MovementUtilities {
             if (agent.getContract() != null)
                 guardCaptain = agent;
             else
-                guardCaptain = (Mob) agent.npcOwner;
+                guardCaptain = (Mob) agent.guardCaptain;
 
             if (guardCaptain != null) {
                 Building barracks = guardCaptain.building;
@@ -147,7 +147,7 @@ public class MovementUtilities {
         return aiAgent.getLoc().ClosestPointOnLine(aggroTarget.getLoc(), aggroTarget.getEndLoc());
     }
 
-    public static void moveToLocation(Mob agent, Vector3fImmutable newLocation, float offset) {
+    public static void moveToLocation(Mob agent, Vector3fImmutable newLocation, float offset, boolean isWalking) {
         try {
 
             //don't move farther than 30 units from player.
@@ -158,7 +158,7 @@ public class MovementUtilities {
 
             agent.setFaceDir(newLoc.subtract2D(agent.getLoc()).normalize());
 
-            aiMove(agent, newLoc, false);
+            aiMove(agent, newLoc, isWalking);
         } catch (Exception e) {
             Logger.error(e.toString());
         }
@@ -244,10 +244,10 @@ public class MovementUtilities {
         msg.setSourceID(agent.getObjectUUID());
         msg.setStartCoord(startLoc);
         msg.setEndCoord(endLoc);
-        msg.setUnknown01(-1);
+        msg.setInBuildingFloor(-1);
         msg.setInBuilding(-1);
-        msg.setTargetType(0);
+        msg.setStartLocType(0);
-        msg.setTargetID(0);
+        msg.setInBuildingUUID(0);
 
 
         try {

src/engine/net/DispatchMessage.java

@@ -28,7 +28,7 @@ import static engine.net.MessageDispatcher.maxRecipients;
 
 /*
  * Dispatch Message is the main interface to Magicbane's threaded
- * asynch message delivery system.
+ * async message delivery system.
  */
 
 public class DispatchMessage {

src/engine/net/NetMsgFactory.java

@@ -13,8 +13,6 @@ import engine.exception.FactoryBuildException;
 import engine.gameManager.ChatManager;
 import engine.net.client.ClientConnection;
 import engine.net.client.Protocol;
-import engine.net.client.msg.ErrorPopupMsg;
-import engine.net.client.msg.PlaceAssetMsg;
 import engine.objects.PlayerCharacter;
 import engine.server.MBServerStatics;
 import org.joda.time.DateTime;
@@ -96,9 +94,11 @@ public class NetMsgFactory {
                 if (origin instanceof ClientConnection) {
                     PlayerCharacter player = ((ClientConnection) origin).getPlayerCharacter();
                     if (player != null) {
+//						if (MBServerStatics.worldServerName.equals("Grief"))
                         Logger.error("Invalid protocol msg for player " + player.getFirstName() + " : " + opcode + " lastopcode: " + origin.lastProtocol.name() + " Error Code : " + errorCode);
-                        PlaceAssetMsg.sendPlaceAssetError(player.getClientConnection(), 1, "Please Report What You Just Did. Ref Code: " + opcode);
+                    } else
-                    }
+                        Logger.error("Invalid protocol msg  : " + opcode + " lastopcode: " + origin.lastProtocol.name() + " Error Code : " + errorCode);
+
                 }
 
                 return null;

src/engine/net/client/ClientMessagePump.java

@@ -85,7 +85,7 @@ public class ClientMessagePump implements NetMsgHandler {
         if (pc == null)
             return;
 
-        pc.update(false);
+        pc.update();
         if (msg.getSpeed() == 2)
             pc.setWalkMode(false);
         else
@@ -114,7 +114,7 @@ public class ClientMessagePump implements NetMsgHandler {
         if (pc == null)
             return;
 
-        pc.update(false);
+        pc.update();
 
         pc.setSit(msg.toggleSitStand());
 
@@ -560,30 +560,12 @@ public class ClientMessagePump implements NetMsgHandler {
         if (!itemManager.inventoryContains(i))
             return;
 
-        //cannot delete gold
+        if (i.isCanDestroy())
-        if(i.getItemBaseID() == 7)
+            if (itemManager.delete(i) == true) {
-            return;
-
-        if (i.isCanDestroy()) {
-            int goldValue = i.getBaseValue();
-            if (i.getItemBase().isRune())
-                goldValue = 500000;
-
-            if (i.getItemBaseID() == 980066)
-                goldValue = 0;
-
-            if(itemManager.getGoldInventory().getNumOfItems() + goldValue > 10000000)
-                return;
-
-            if (itemManager.delete(i)) {
-                if (goldValue > 0)
-                    itemManager.addGoldToInventory(goldValue, false);
-
-                itemManager.updateInventory();
                 Dispatch dispatch = Dispatch.borrow(sourcePlayer, msg);
                 DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
             }
-        }
+
     }
 
     private static void ackBankWindowOpened(AckBankWindowOpenedMsg msg, ClientConnection origin) {
@@ -661,7 +643,7 @@ public class ClientMessagePump implements NetMsgHandler {
         moveMsg.setStartCoord(sourcePlayer.getLoc());
         moveMsg.setEndCoord(sourcePlayer.getLoc());
         moveMsg.setInBuilding(-1);
-        moveMsg.setUnknown01(-1);
+        moveMsg.setInBuildingFloor(-1);
 
         dispatch = Dispatch.borrow(sourcePlayer, moveMsg);
         DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
@@ -672,8 +654,6 @@ public class ClientMessagePump implements NetMsgHandler {
         JobScheduler.getInstance().scheduleJob(new RefreshGroupJob(sourcePlayer), MBServerStatics.LOAD_OBJECT_DELAY);
     }
 
-
-
     private static void lootWindowRequest(LootWindowRequestMsg msg, ClientConnection origin) throws MsgSendException {
 
         PlayerCharacter pc = SessionManager.getPlayerCharacter(origin);
@@ -1263,8 +1243,6 @@ public class ClientMessagePump implements NetMsgHandler {
 
 
                 cost = sell.getBaseValue();
-                if(sell.getItemBaseID() == 980066)
-                    cost = 0;
 
                 //apply damaged value reduction
                 float durabilityCurrent = sell.getDurabilityCurrent();
@@ -1369,8 +1347,6 @@ public class ClientMessagePump implements NetMsgHandler {
             return;
 
         // test within talking range
-        if(npc.isInSafeZone())
-            npc.sellPercent = 0;
 
         if (sourcePlayer.getLoc().distanceSquared2D(npc.getLoc()) > MBServerStatics.NPC_TALK_RANGE * MBServerStatics.NPC_TALK_RANGE) {
             ErrorPopupMsg.sendErrorPopup(sourcePlayer, 14);
@@ -1382,192 +1358,219 @@ public class ClientMessagePump implements NetMsgHandler {
     }
 
     private static void buyFromNPC(BuyFromNPCMsg msg, ClientConnection origin) {
+
         PlayerCharacter sourcePlayer = SessionManager.getPlayerCharacter(origin);
+
         if (sourcePlayer == null)
             return;
+
         if (origin.buyLock.tryLock()) {
+
             try {
                 CharacterItemManager itemMan = sourcePlayer.getCharItemManager();
-                if (itemMan == null) {
+
+                if (itemMan == null)
                     return;
-                }
+
                 NPC npc = NPC.getFromCache(msg.getNPCID());
-                if (npc == null) {
+
+                if (npc == null)
                     return;
-                }
+
                 Item gold = itemMan.getGoldInventory();
-                if (gold == null) {
+
+                if (gold == null)
                     return;
-                }
+
                 Item buy = null;
+
                 if (msg.getItemType() == GameObjectType.MobEquipment.ordinal()) {
                     ArrayList<MobEquipment> sellInventory = npc.getContract().getSellInventory();
-                    //if(npc.contract.getObjectUUID() == 890){ // default steward
+                    if (sellInventory == null)
-                    //    sellInventory = npc.getSellInventorySteward();
-                    //}
-                    //if(npc.contract.getObjectUUID() == 889){ // default builder
-                    //    sellInventory = npc.getSellInventoryBuilder();
-                    //}
-                    if (sellInventory == null) {
                         return;
-                    }
                     for (MobEquipment me : sellInventory) {
                         if (me.getObjectUUID() == msg.getItemID()) {
                             ItemBase ib = me.getItemBase();
-                            if (ib == null) {
+                            if (ib == null)
                                 return;
-                            }
+
                             //test room available for item
-                            if (!itemMan.hasRoomInventory(ib.getWeight())) {
+                            if (!itemMan.hasRoomInventory(ib.getWeight()))
                                 return;
-                            }
+
                             int cost = me.getMagicValue();
+
                             float bargain = sourcePlayer.getBargain();
-                            switch(npc.getContractID()){
-                                case 1201:
-                                    cost = ItemBase.getDiscPrice(ib.getUUID());
-                                    bargain = 0;
-                                    break;
-                                case 1202:
-                                    cost = ItemBase.getStatPrice(ib.getUUID());
-                                    bargain = 0;
-                                    break;
-                                case 900:
-                                    cost = Warehouse.getCostForResource(ib.getUUID()) * Warehouse.getSellStackSize(ib.getUUID());
-                                    bargain = 0;
-                                    break;
-                            }
-                            float profit;
 
-                            if(npc.isInSafeZone())
+                            float profit = npc.getSellPercent(sourcePlayer) - bargain;
-                                profit = 0;
+
-                            else
+                            if (profit < 1)
-                                profit = npc.getSellPercent(sourcePlayer) - bargain;
+                                profit = 1;
 
 
-                            if(profit > 0)
+                            cost *= profit;
-                                cost *= profit;
+
 
                             if (gold.getNumOfItems() - cost < 0) {
                                 //dont' have enough goldItem exit!
                                 // chatMan.chatSystemInfo(pc, "" + "You dont have enough gold.");
                                 return;
                             }
+
                             Building b = (!npc.isStatic()) ? npc.getBuilding() : null;
+
                             if (b != null && b.getProtectionState().equals(ProtectionState.NPC))
                                 b = null;
                             int buildingDeposit = cost - me.getMagicValue();
-                            if (b != null && (b.getStrongboxValue() + buildingDeposit) > b.getMaxGold() && !b.isOwnerIsNPC()) {
+                            if (b != null && (b.getStrongboxValue() + buildingDeposit) > b.getMaxGold()) {
                                 ErrorPopupMsg.sendErrorPopup(sourcePlayer, 206);
                                 return;
-                            }if(npc.getContractID() == 1502041){
+                            }
-                                me.fromNoob = true;
+
-                            } else if (!itemMan.buyFromNPC(b, cost, buildingDeposit)) {
+                            if (!itemMan.buyFromNPC(b, cost, buildingDeposit)) {
                                 // chatMan.chatSystemInfo(pc, "" + "You Failed to buy the item.");
-                                ChatManager.chatSystemError(sourcePlayer, "Failed To Buy Item");
                                 return;
                             }
-                            if(me.getItemBase().getType().equals(ItemType.RESOURCE) && npc.getContractID() == 900){
+
-                                handleResourcePurchase(me,itemMan,sourcePlayer,ib);
+                            buy = Item.createItemForPlayer(sourcePlayer, ib);
-                            }else {
+
-                                buy = Item.createItemForPlayer(sourcePlayer, ib, me.fromNoob);
+                            if (buy != null) {
-                                if (buy != null) {
+                                me.transferEnchants(buy);
-                                    me.transferEnchants(buy);
+                                itemMan.addItemToInventory(buy);
-                                    itemMan.addItemToInventory(buy);
+                                //itemMan.updateInventory();
-                                    if(npc.contractUUID == 900 && buy.getItemBaseID() == 1705032){
-                                        buy.setNumOfItems(10);
-                                        DbManager.ItemQueries.UPDATE_NUM_ITEMS(buy,buy.getNumOfItems());
-                                    }
-                                    //itemMan.updateInventory();
-                                }
                             }
                         }
                     }
                 } else if (msg.getItemType() == GameObjectType.Item.ordinal()) {
+
                     CharacterItemManager npcCim = npc.getCharItemManager();
+
                     if (npcCim == null)
                         return;
+
                     buy = Item.getFromCache(msg.getItemID());
+
                     if (buy == null)
                         return;
+
                     ItemBase ib = buy.getItemBase();
+
                     if (ib == null)
                         return;
+
                     if (!npcCim.inventoryContains(buy))
                         return;
+
                     //test room available for item
                     if (!itemMan.hasRoomInventory(ib.getWeight()))
                         return;
+
                     //TODO test cost and subtract goldItem
+
                     //TODO CHnage this if we ever put NPc city npcs in buildings.
                     int cost = buy.getBaseValue();
+
                     if (buy.isID() || buy.isCustomValue())
                         cost = buy.getMagicValue();
+
                     float bargain = sourcePlayer.getBargain();
+
                     float profit = npc.getSellPercent(sourcePlayer) - bargain;
+
                     if (profit < 1)
                         profit = 1;
+
                     if (!buy.isCustomValue())
                         cost *= profit;
                     else
                         cost = buy.getValue();
+
+
                     if (gold.getNumOfItems() - cost < 0) {
                         ErrorPopupMsg.sendErrorPopup(sourcePlayer, 128);  // Insufficient Gold
                         return;
                     }
+
                     Building b = (!npc.isStatic()) ? npc.getBuilding() : null;
+
                     if (b != null)
                         if (b.getProtectionState().equals(ProtectionState.NPC))
                             b = null;
+
                     int buildingDeposit = cost;
-                    if (b != null && (b.getStrongboxValue() + buildingDeposit) > b.getMaxGold() && !b.isOwnerIsNPC()) {
+
+                    if (b != null && (b.getStrongboxValue() + buildingDeposit) > b.getMaxGold()) {
                         ErrorPopupMsg.sendErrorPopup(sourcePlayer, 206);
                         return;
                     }
+
                     if (!itemMan.buyFromNPC(b, cost, buildingDeposit)) {
                         ErrorPopupMsg.sendErrorPopup(sourcePlayer, 110);
                         return;
                     }
+
                     if (buy != null)
                         itemMan.buyFromNPC(buy, npc);
+
                 } else if (msg.getItemType() == GameObjectType.MobLoot.ordinal()) {
+
                     CharacterItemManager npcCim = npc.getCharItemManager();
+
                     if (npcCim == null)
                         return;
+
                     buy = MobLoot.getFromCache(msg.getItemID());
+
                     if (buy == null)
                         return;
+
                     ItemBase ib = buy.getItemBase();
+
                     if (ib == null)
                         return;
+
                     if (!npcCim.inventoryContains(buy))
                         return;
+
                     //test room available for item
                     if (!itemMan.hasRoomInventory(ib.getWeight()))
                         return;
+
                     //TODO test cost and subtract goldItem
+
                     //TODO CHnage this if we ever put NPc city npcs in buildings.
+
                     int cost = buy.getMagicValue();
                     cost *= npc.getSellPercent(sourcePlayer);
+
+
                     if (gold.getNumOfItems() - cost < 0) {
                         ErrorPopupMsg.sendErrorPopup(sourcePlayer, 128);  // Insufficient Gold
                         return;
                     }
+
                     Building b = (!npc.isStatic()) ? npc.getBuilding() : null;
+
                     if (b != null && b.getProtectionState().equals(ProtectionState.NPC))
                         b = null;
                     int buildingDeposit = cost;
-                    if (b != null && (b.getStrongboxValue() + buildingDeposit) > b.getMaxGold() && !b.isOwnerIsNPC()) {
+
+                    if (b != null && (b.getStrongboxValue() + buildingDeposit) > b.getMaxGold()) {
                         ErrorPopupMsg.sendErrorPopup(sourcePlayer, 206);
                         return;
                     }
+
                     if (!itemMan.buyFromNPC(b, cost, buildingDeposit))
                         return;
+
                     if (buy != null)
                         itemMan.buyFromNPC(buy, npc);
+
                 } else
                     return;
+
                 if (buy != null) {
+
                     msg.setItem(buy);
                     //send the buy message back to update player
                     //					msg.setItemType(buy.getObjectType().ordinal());
@@ -1576,43 +1579,14 @@ public class ClientMessagePump implements NetMsgHandler {
                     DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
                     itemMan.updateInventory();
                 }
+
             } finally {
                 origin.buyLock.unlock();
             }
         } else {
             ErrorPopupMsg.sendErrorPopup(origin.getPlayerCharacter(), 12); // All production slots taken
         }
-    }
 
-    public static void handleResourcePurchase(MobEquipment me, CharacterItemManager itemMan, PlayerCharacter sourcePlayer, ItemBase ib){
-        boolean stacked = false;
-        int buystack = Warehouse.getSellStackSize(me.getItemBase().getUUID());
-        for(Item item : itemMan.getInventory()){
-            int itemID = item.getItemBaseID();
-            int meID = me.getItemBase().getUUID();
-            if(itemID == meID){
-                if(Warehouse.maxResources.isEmpty())
-                    Warehouse.getMaxResources();
-                int maxStack = Warehouse.maxResources.get(itemID);
-                if(maxStack > item.getNumOfItems() + buystack){
-                    item.setNumOfItems(item.getNumOfItems() + buystack);
-                    stacked = true;
-                    itemMan.updateInventory();
-                    DbManager.ItemQueries.UPDATE_NUM_ITEMS(item,item.getNumOfItems());
-                    break;
-                }
-            }
-        }
-        if(!stacked){
-            Item buy = Item.createItemForPlayer(sourcePlayer, ib, false);
-            if (buy != null) {
-                me.transferEnchants(buy);
-                itemMan.addItemToInventory(buy);
-                buy.setNumOfItems(buystack);
-                DbManager.ItemQueries.UPDATE_NUM_ITEMS(buy,buy.getNumOfItems());
-            }
-        }
-        itemMan.updateInventory();
     }
 
     private static void Repair(RepairMsg msg, ClientConnection origin) {
@@ -1672,24 +1646,14 @@ public class ClientMessagePump implements NetMsgHandler {
             max *= (1 + (durMod * 0.01f));
             if (dur >= max || dur < 1) {
                 //redundancy message to clear item from window in client
-                if (!DbManager.ItemQueries.SET_DURABILITY(toRepair, dur))
-                    return;
                 toRepair.setDurabilityCurrent(max);
                 msg.setupRepairAck(max - dur);
                 dispatch = Dispatch.borrow(player, msg);
                 DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
                 return;
             }
-
+            //TODO get cost to repair
-            int cost = ((int)((toRepair.getMagicValue()/max*(max - dur)) + (npc.getSpecialPrice() * npc.buyPercent))) + (int)(npc.getSpecialPrice() * (max - dur));
+            int cost = (int) ((max - dur) * 80.1);
-
-            //int pointsToRepair = max - dur;
-            //int magicValue = toRepair.getMagicValue();
-            //if(magicValue == 0)
-            //    magicValue = 1;
-            //int calculatedValue = toRepair.getDurabilityMax() * magicValue;
-            //float costPerPoint = (magicValue / max) * ( 1 + npc.buyPercent);
-            //cost = (int)(pointsToRepair * costPerPoint) + npc.getSpecialPrice();
             Building b = (!npc.isStatic()) ? npc.getBuilding() : null;
 
             if (b != null)
@@ -1928,9 +1892,6 @@ public class ClientMessagePump implements NetMsgHandler {
                 case POWER:
                     PowersManager.usePower((PerformActionMsg) msg, origin, false);
                     break;
-                case REQUESTMELEEATTACK:
-                    CombatManager.setAttackTarget((AttackCmdMsg) msg, origin);
-                    break;
                 case READYTOENTER:
                     break;
                 case OPENVAULT:

src/engine/net/client/Protocol.java

@@ -173,7 +173,7 @@ public enum Protocol {
     REPAIROBJECT(0x782219CE, RepairMsg.class, null), //Repair Window Req/Ack, RepairObject item Req/Ack
     REQUESTCONTENTS(0xA786B0A2, LootWindowRequestMsg.class, null), // MoveObjectToContainer Window Request
     REQUESTGUILDLIST(0x85DCC6D7, ReqGuildListMsg.class, RequestGuildListHandler.class),
-    REQUESTMELEEATTACK(0x98C71545, AttackCmdMsg.class, null), // Attack
+    REQUESTMELEEATTACK(0x98C71545, AttackCmdMsg.class, AttackCmdMsgHandler.class), // Attack
     REQUESTMEMBERLIST(0x3235E5EA, GuildControlMsg.class, GuildControlHandler.class), // Part of Promote/Demote, Also Player History
     REQUESTTOOPENBANK(0xF26E453F, null, null), // RequestToOpenBankMsg
     REQUESTTOTRADE(0x4D84259B, TradeRequestMsg.class, null), // Trade Request

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

@@ -11,7 +11,6 @@ import engine.objects.GuildStatusController;
 import engine.objects.Mine;
 import engine.objects.PlayerCharacter;
 import engine.objects.Resource;
-import org.pmw.tinylog.Logger;
 
 /*
  * @Author:
@@ -36,28 +35,26 @@ public class ArcMineChangeProductionMsgHandler extends AbstractClientMsgHandler
 
         //TODO verify this against the warehouse?
 
-        if (!GuildStatusController.isInnerCouncil(playerCharacter.getGuildStatus())) // is this only GL?
+        if (GuildStatusController.isInnerCouncil(playerCharacter.getGuildStatus()) == false) // is this only GL?
             return true;
 
         Mine mine = Mine.getMine(changeProductionMsg.getMineID());
 
-        if (mine == null) {
+        if (mine == null)
-            Logger.error("Player Character: " + playerCharacter.getName() + " Tried To Change Mine: " + changeProductionMsg.getMineID() + " and Mine was Null");
             return true;
-        }
+
         //make sure mine belongs to guild
 
-        if (mine.getOwningGuild().isEmptyGuild() || mine.getOwningGuild().getObjectUUID() != playerCharacter.getGuild().getObjectUUID())
+        if (mine.getOwningGuild().isEmptyGuild() ||
+                mine.getOwningGuild().getObjectUUID() != playerCharacter.getGuild().getObjectUUID())
             return true;
 
         //make sure valid resource
 
         Resource resource = Resource.resourceByHash.get(changeProductionMsg.getResourceHash());
 
-        if (resource == null) {
+        if (resource == null)
-            Logger.error("Player Character: " + playerCharacter.getName() + " Tried To Change Mine: " + changeProductionMsg.getMineID() + " and Resource was Null");
             return true;
-        }
 
         //update resource
 

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

@@ -0,0 +1,86 @@
+package engine.net.client.handlers;
+
+import engine.Enum;
+import engine.exception.MsgSendException;
+import engine.gameManager.BuildingManager;
+import engine.gameManager.CombatManager;
+import engine.net.client.ClientConnection;
+import engine.net.client.msg.AttackCmdMsg;
+import engine.net.client.msg.ClientNetMsg;
+import engine.net.client.msg.TargetedActionMsg;
+import engine.objects.*;
+
+/*
+ * @Author:
+ * @Summary: Processes application protocol message which keeps
+ * client's tcp connection open.
+ */
+
+public class AttackCmdMsgHandler extends AbstractClientMsgHandler {
+
+    public AttackCmdMsgHandler() {
+        super(AttackCmdMsg.class);
+    }
+
+    @Override
+    protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException {
+
+        PlayerCharacter playerCharacter = origin.getPlayerCharacter();
+
+        // Member variable declaration
+
+        AttackCmdMsg msg;
+
+        // Member variable assignment
+
+        msg = (AttackCmdMsg) baseMsg;
+
+        if (TargetedActionMsg.un2cnt == 60 || TargetedActionMsg.un2cnt == 70)
+            return true;
+
+        if (playerCharacter == null)
+            return true;
+
+        AbstractWorldObject target = null;
+        Enum.GameObjectType targetType;
+
+        targetType = Enum.GameObjectType.values()[msg.getTargetType()];
+
+        switch(targetType){
+            case Mob:
+                target = Mob.getMob(msg.getTargetID());
+                break;
+            case PlayerCharacter:
+                target = PlayerCharacter.getPlayerCharacter(msg.getTargetID());
+                break;
+            case Building:
+                target = BuildingManager.getBuilding(msg.getTargetID());
+                break;
+            case NPC:
+                target = NPC.getNPC(msg.getTargetID());
+                break;
+        }
+        if(target == null) {
+            playerCharacter.setCombatTarget(null);
+            return true; // cannot attack a null target
+        }
+        //set sources target
+
+        playerCharacter.setCombatTarget(target);
+
+        //put in combat if not already
+
+        if (!playerCharacter.isCombat())
+            CombatManager.toggleCombat(true, origin);
+
+        //make character stand if sitting
+
+        if (playerCharacter.isSit())
+            CombatManager.toggleSit(false, origin);
+
+        CombatManager.AttackTarget(playerCharacter, target);
+
+        return true;
+    }
+
+}

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

@@ -47,16 +47,13 @@ public class ChangeAltitudeHandler extends AbstractClientMsgHandler {
         if (pc.region != null && !pc.region.isOutside())
             return false;
 
+
         // Find out if we already have an altitude timer running and if so
         // do not process more alt change requests
 
-        pc.updateFlight();
-
         if (pc.getTakeOffTime() != 0)
             return false;
 
-        pc.setTakeOffTime(System.currentTimeMillis());
-
 
         // remove all movement timers and jobs
         //TODO: test if they can fly
@@ -70,7 +67,7 @@ public class ChangeAltitudeHandler extends AbstractClientMsgHandler {
         if (pc.getAltitude() == 0 && !msg.up())
             return true;
 
-        pc.update(false);
+        pc.update();
         pc.stopMovement(pc.getLoc());
         msg.setStartAlt(pc.getAltitude());
         if (msg.up()) {
@@ -135,7 +132,7 @@ public class ChangeAltitudeHandler extends AbstractClientMsgHandler {
         }
 
         if (msg.up()) {
-            pc.update(false);
+            pc.update();
             pc.setDesiredAltitude(targetAlt);
             pc.setTakeOffTime(System.currentTimeMillis());
         } else {
@@ -161,7 +158,7 @@ public class ChangeAltitudeHandler extends AbstractClientMsgHandler {
             } else
                 pc.setDesiredAltitude(targetAlt);
 
-            pc.update(false);
+            pc.update();
 
 
             pc.setTakeOffTime(System.currentTimeMillis());

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

@@ -63,7 +63,7 @@ public class CityDataHandler extends AbstractClientMsgHandler {
 
         // If the hotZone has changed then update the client's map accordingly.
 
-        if (playerCharacter.getTimestamps().containsKey("hotzoneupdate") && playerCharacter.getTimeStamp("hotzoneupdate") <= ZoneManager.hotZoneLastUpdate.toEpochMilli() && ZoneManager.hotZone != null) {
+        if (playerCharacter.getTimeStamp("hotzoneupdate") <= ZoneManager.hotZoneLastUpdate.toEpochMilli() && ZoneManager.hotZone != null) {
             HotzoneChangeMsg hotzoneChangeMsg = new HotzoneChangeMsg(Enum.GameObjectType.Zone.ordinal(), ZoneManager.hotZone.getObjectUUID());
             dispatch = Dispatch.borrow(playerCharacter, hotzoneChangeMsg);
             DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);

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

@@ -62,7 +62,7 @@ public class DestroyBuildingHandler extends AbstractClientMsgHandler {
         if (city != null)
             bane = city.getBane();
 
-        if (bane != null){// && bane.getSiegePhase() == Enum.SiegePhase.WAR) {
+        if (bane != null && bane.getSiegePhase() == Enum.SiegePhase.WAR) {
             ErrorPopupMsg.sendErrorPopup(pc, 171);
             return true;
         }

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

@@ -102,7 +102,7 @@ public class GroupInviteResponseHandler extends AbstractClientMsgHandler {
 
             // Run Keyclone Audit
 
-            //KEYCLONEAUDIT.audit(player, group);
+            KEYCLONEAUDIT.audit(player, group);
 
             return true;
         }

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

@@ -61,7 +61,7 @@ public class HirelingServiceMsgHandler extends AbstractClientMsgHandler {
                     return true;
 
 
-                npc.setSpecialPrice(msg.repairCost);
+                npc.setRepairCost(msg.repairCost);
                 ManageNPCMsg outMsg = new ManageNPCMsg(npc);
                 Dispatch dispatch = Dispatch.borrow(player, msg);
 

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

@@ -360,11 +360,6 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
                 targetItem.recycle(vendor);
                 vendor.removeItemFromForge(targetItem);
 
-                //refund the gold for cancelled item
-                if(vendor.building.getStrongboxValue() + targetItem.getItemBase().getBaseValue() < 15000000){
-                    vendor.building.setStrongboxValue(vendor.building.getStrongboxValue() + targetItem.getItemBase().getBaseValue());
-                }
-
                 // Refresh vendor's inventory to client
 
                 outMsg = new ManageNPCMsg(vendor);

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

@@ -62,23 +62,16 @@ public class MOTDEditHandler extends AbstractClientMsgHandler {
                 return true;
             }
 
-            if (type == 1) { // Guild MOTD
+            if (type == 1) // Guild MOTD
                 msg.setMessage(guild.getMOTD());
-                guild.updateDatabase();
+            else if (type == 3) // IC MOTD
-            }else if (type == 3) { // IC MOTD
                 msg.setMessage(guild.getICMOTD());
-                guild.updateDatabase();
+            else if (type == 0) { // Nation MOTD
-            }else if (type == 0) { // Nation MOTD
                 Guild nation = guild.getNation();
                 if (nation == null || !nation.isNation()) {
                     ErrorPopupMsg.sendErrorMsg(playerCharacter, "You do not have such authority!");
                     return true;
                 }
-                nation.setNMOTD(msg.getMessage());
-                nation.updateDatabase();
-                for(Guild sub : nation.getSubGuildList()){
-                    sub.setNMOTD(nation.getNMOTD());
-                }
                 msg.setMessage(nation.getMOTD());
             }
             dispatch = Dispatch.borrow(playerCharacter, msg);

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

@@ -17,7 +17,6 @@ import engine.powers.PowersBase;
 import engine.server.MBServerStatics;
 
 import java.util.ArrayList;
-import java.util.Objects;
 
 /*
  * @Author:
@@ -106,7 +105,7 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
 
         // Validate player can obtain blessing
 
-        if (!GuildStatusController.isGuildLeader(player.getGuildStatus())) {
+        if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false) {
             ErrorPopupMsg.sendErrorPopup(player, 173); // You must be the leader of a guild to receive a blessing
             return;
         }
@@ -127,12 +126,12 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
 
         realm = RealmMap.getRealmForCity(city);
 
-        if (!realm.getCanBeClaimed()) {
+        if (realm.getCanBeClaimed() == false) {
             ErrorPopupMsg.sendErrorPopup(player, 180); // This territory cannot be ruled by anyone
             return;
         }
 
-        if (realm.isRuled()) {
+        if (realm.isRuled() == true) {
             ErrorPopupMsg.sendErrorPopup(player, 178); // This territory is already claimed
             return;
         }
@@ -143,12 +142,12 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
 
     }
 
-    private static void requestBoon(PlayerCharacter player, NPC npc) {
+    private static void requestBoon(MerchantMsg msg, ClientConnection origin, PlayerCharacter player, NPC npc) {
 
         Building shrineBuilding;
         Shrine shrine;
 
-        if (!npc.getGuild().getNation().equals(player.getGuild().getNation()))
+        if (npc.getGuild() != player.getGuild())
             return;
 
         shrineBuilding = npc.getBuilding();
@@ -156,7 +155,7 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
         if (shrineBuilding == null)
             return;
 
-        if (shrineBuilding.getBlueprint() != null && !shrineBuilding.getBlueprint().getBuildingGroup().equals(engine.Enum.BuildingGroup.SHRINE))
+        if (shrineBuilding.getBlueprint() != null && shrineBuilding.getBlueprint().getBuildingGroup() != engine.Enum.BuildingGroup.SHRINE)
             return;
 
         if (shrineBuilding.getRank() == -1)
@@ -172,9 +171,11 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
             return;
         }
 
+        //already haz boon.
+
         if (player.containsEffect(shrine.getShrineType().getPowerToken())) {
-            //remove old boon to apply new one, allows boon refreshing
+            ErrorPopupMsg.sendErrorPopup(player, 199);
-            player.effects.remove(PowersManager.getPowerByToken(shrine.getShrineType().getPowerToken()).name);
+            return;
         }
 
         if (!Shrine.canTakeFavor(player, shrine))
@@ -190,31 +191,16 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
             return;
         }
 
-        int trains = 0;
+        int rank = shrine.getRank();
-        switch(npc.getRank()){
+        //R8 trees always get atleast rank 2 boons. rank uses index, where 0 is first place, 1 is second, etc...
-            case 1:
+        if (shrineBuilding.getCity() != null && shrineBuilding.getCity().getTOL() != null && shrineBuilding.getCity().getTOL().getRank() == 8)
-                trains = 10;
+            if (rank != 0)
-                break;
+                rank = 1;
-            case 2:
+        int trains = 40 - (rank * 10);
-                trains = 15;
+        if (trains < 0)
-                break;
+            trains = 0;
-            case 3:
-                trains = 20;
-                break;
-            case 4:
-                trains = 25;
-                break;
-            case 5:
-                trains = 30;
-                break;
-            case 6:
-                trains = 35;
-                break;
-            case 7:
-                trains = 40;
-                break;
-        }
 
+        //System.out.println(trains);
         PowersManager.applyPower(player, player, player.getLoc(), shrinePower.getToken(), trains, false);
         ChatManager.chatGuildInfo(player.getGuild(), player.getName() + " has recieved a boon costing " + 1 + " point of favor.");
         shrineBuilding.addEffectBit(1000000 << 2);
@@ -274,85 +260,60 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
             }
         }
 
-        if (targetCity == null){
+        if (targetCity == null)
-            Mine mineTele = null;
+            return;
-            for(Mine mine : Mine.getMinesToTeleportTo(player)){
+
-                if(mine.getObjectUUID() == msg.getCityID()){
+        //verify level required to teleport or repledge
-                    mineTele = mine;
+
-                }
+        Guild toGuild = targetCity.getGuild();
-            }
+
-            if(mineTele == null){
+        if (toGuild != null)
+            if (isTeleport) {
+                if (player.getLevel() < toGuild.getTeleportMin() || player.getLevel() > toGuild.getTeleportMax())
+                    return;
+            } else if (player.getLevel() < toGuild.getRepledgeMin() || player.getLevel() > toGuild.getRepledgeMax())
                 return;
-            }else {
-                int time = MBServerStatics.TELEPORT_TIME_IN_SECONDS;
-                msg.setTeleportTime(time);
-                Building tower = Mine.getTower(mineTele);
-                if (tower == null)
-                    return;
-                Vector3fImmutable teleportLoc = Vector3fImmutable.getRandomPointOnCircle(tower.getLoc(), 10);
-                ChatManager.chatSystemInfo(player, "You Will Teleport To " + mineTele.getParentZone().getParent().getName() + "'s Mine In " + time +  " Seconds.");
-                if (time > 0) {
-                    //TODO add timer to teleport
-                    TeleportJob tj = new TeleportJob(player, npc, teleportLoc, origin, true);
-                    JobScheduler.getInstance().scheduleJob(tj, time * 1000);
-                }
-            }
-        }else{
-            //finish porting to a city
-            //verify level required to teleport or repledge
 
-            Guild toGuild = targetCity.getGuild();
+        boolean joinedGuild = false;
 
-            if (toGuild != null)
+        //if repledge, reguild the player
-                if (isTeleport) {
-                    if (player.getLevel() < toGuild.getTeleportMin() || player.getLevel() > toGuild.getTeleportMax())
-                        return;
-                } else if (player.getLevel() < toGuild.getRepledgeMin() || player.getLevel() > toGuild.getRepledgeMax())
-                    return;
 
-            boolean joinedGuild = false;
+        if (!isTeleport)
+            joinedGuild = GuildManager.joinGuild(player, targetCity.getGuild(), targetCity.getObjectUUID(), GuildHistoryType.JOIN);
 
-            //if repledge, reguild the player
+        int time;
 
-            if (!isTeleport)
+        if (!isTeleport) //repledge
-                joinedGuild = GuildManager.joinGuild(player, targetCity.getGuild(), targetCity.getObjectUUID(), GuildHistoryType.JOIN);
+            time = MBServerStatics.REPLEDGE_TIME_IN_SECONDS;
+        else
+            time = MBServerStatics.TELEPORT_TIME_IN_SECONDS;
 
-            int time;
+        //resend message
+        msg.setTeleportTime(time);
 
-            if (!isTeleport) //repledge
+        if ((!isTeleport && joinedGuild) || (isTeleport)) {
-                time = MBServerStatics.REPLEDGE_TIME_IN_SECONDS;
-            else
-                time = MBServerStatics.TELEPORT_TIME_IN_SECONDS;
 
-            //resend message
+            dispatch = Dispatch.borrow(player, msg);
-            msg.setTeleportTime(time);
+            DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
-
-            if ((!isTeleport && joinedGuild) || (isTeleport)) {
-
-                dispatch = Dispatch.borrow(player, msg);
-                DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
-            }
-
-            //teleport player to city
-
-            Vector3fImmutable teleportLoc;
-
-            if (targetCity.getTOL().getRank() == 8)
-                teleportLoc = targetCity.getTOL().getStuckLocation();
-            else
-                teleportLoc = Vector3fImmutable.getRandomPointOnCircle(targetCity.getTOL().getLoc(), MBServerStatics.TREE_TELEPORT_RADIUS);
-
-            if (time > 0) {
-                //TODO add timer to teleport
-                TeleportJob tj = new TeleportJob(player, npc, teleportLoc, origin, true);
-                JobScheduler.getInstance().scheduleJob(tj, time * 1000);
-            } else if (joinedGuild) {
-                player.teleport(teleportLoc);
-                player.setSafeMode();
-            }
         }
 
+        //teleport player to city
 
+        Vector3fImmutable teleportLoc;
+
+        if (targetCity.getTOL().getRank() == 8)
+            teleportLoc = targetCity.getTOL().getStuckLocation();
+        else
+            teleportLoc = Vector3fImmutable.getRandomPointOnCircle(targetCity.getTOL().getLoc(), MBServerStatics.TREE_TELEPORT_RADIUS);
+
+        if (time > 0) {
+            //TODO add timer to teleport
+            TeleportJob tj = new TeleportJob(player, npc, teleportLoc, origin, true);
+            JobScheduler.getInstance().scheduleJob(tj, time * 1000);
+        } else if (joinedGuild) {
+            player.teleport(teleportLoc);
+            player.setSafeMode();
+        }
     }
 
     private static PowersBase getPowerforHermit(NPC npc) {
@@ -459,7 +420,7 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
                 if (isHermit(npc))
                     requestHermitBlessing(msg, origin, player, npc);
                 else
-                    requestBoon(player, npc);
+                    requestBoon(msg, origin, player, npc);
                 break;
             case 15:
                 LeaderboardMessage lbm = new LeaderboardMessage();

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

@@ -8,7 +8,6 @@ import engine.gameManager.BuildingManager;
 import engine.gameManager.DbManager;
 import engine.gameManager.NPCManager;
 import engine.gameManager.SessionManager;
-import engine.math.Vector3fImmutable;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -16,9 +15,6 @@ import engine.net.client.msg.*;
 import engine.objects.*;
 import org.pmw.tinylog.Logger;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
 /*
  * @Author:
  * @Summary: Processes application protocol message which
@@ -27,8 +23,6 @@ import java.util.HashMap;
 
 public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
 
-    public static HashMap<Integer, ArrayList<Integer>> _minionsByCaptain = null;
-
     public MinionTrainingMsgHandler() {
         super(MinionTrainingMessage.class);
     }
@@ -38,9 +32,9 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
 
         MinionTrainingMessage minionMsg = (MinionTrainingMessage) baseMsg;
 
-        PlayerCharacter player = SessionManager.getPlayerCharacter(origin);
+        PlayerCharacter playerCharacter = SessionManager.getPlayerCharacter(origin);
 
-        if (player == null)
+        if (playerCharacter == null)
             return true;
 
         if (minionMsg.getNpcType() == Enum.GameObjectType.NPC.ordinal()) {
@@ -50,23 +44,24 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
             if (npc == null)
                 return true;
 
-            Building b = BuildingManager.getBuildingFromCache(minionMsg.getBuildingID());
+            Building building = BuildingManager.getBuildingFromCache(minionMsg.getBuildingID());
 
-            if (b == null)
+            if (building == null)
                 return true;
 
             //clear minion
 
             if (npc.minionLock.writeLock().tryLock()) {
+
                 try {
                     if (minionMsg.getType() == 2) {
 
                         Mob toRemove = Mob.getFromCache(minionMsg.getUUID());
 
-                        if (!npc.getSiegeMinionMap().containsKey(toRemove))
+                        if (!npc.minions.contains(toRemove.getObjectUUID()))
                             return true;
 
-                        npc.getSiegeMinionMap().remove(toRemove);
+                        npc.minions.remove(Integer.valueOf(toRemove.getObjectUUID()));
 
                         WorldGrid.RemoveWorldObject(toRemove);
 
@@ -74,33 +69,35 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
                             toRemove.getParentZone().zoneMobSet.remove(toRemove);
 
                         DbManager.removeFromCache(toRemove);
-                        PlayerCharacter petOwner = toRemove.getOwner();
 
-                        if (petOwner != null) {
+                        if(toRemove.guardCaptain.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
-                            petOwner.setPet(null);
+                            PlayerCharacter petOwner = (PlayerCharacter) toRemove.guardCaptain;
-                            toRemove.setOwner(null);
+
-                            PetMsg petMsg = new PetMsg(5, null);
+                            if (petOwner != null) {
-                            Dispatch dispatch = Dispatch.borrow(petOwner, petMsg);
+                                petOwner.setPet(null);
-                            DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
+
+                                toRemove.guardCaptain = null;
+                                PetMsg petMsg = new PetMsg(5, null);
+                                Dispatch dispatch = Dispatch.borrow(petOwner, petMsg);
+                                DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
+                            }
                         }
 
-                        // we Found the move to remove, lets break the for loop so it doesnt look for more.
+                        ManageCityAssetsMsg mca1 = new ManageCityAssetsMsg(playerCharacter, building);
-
-                        ManageCityAssetsMsg mca1 = new ManageCityAssetsMsg(player, b);
                         mca1.actionType = 3;
-                        mca1.setTargetType(b.getObjectType().ordinal());
+                        mca1.setTargetType(building.getObjectType().ordinal());
-                        mca1.setTargetID(b.getObjectUUID());
+                        mca1.setTargetID(building.getObjectUUID());
 
                         mca1.setTargetType3(npc.getObjectType().ordinal());
                         mca1.setTargetID3(npc.getObjectUUID());
-                        mca1.setAssetName1(b.getName());
+                        mca1.setAssetName1(building.getName());
                         mca1.setUnknown54(1);
 
-                        Dispatch dispatch = Dispatch.borrow(player, mca1);
+                        Dispatch dispatch = Dispatch.borrow(playerCharacter, mca1);
                         DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
 
                         ManageNPCMsg mnm = new ManageNPCMsg(npc);
-                        dispatch = Dispatch.borrow(player, mnm);
+                        dispatch = Dispatch.borrow(playerCharacter, mnm);
                         DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
 
                         //Add Minion
@@ -115,7 +112,7 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
                         if (npc.getContractID() == 842)
                             maxSlots = 1;
 
-                        if (npc.getSiegeMinionMap().size() == maxSlots)
+                        if (npc.minions.size() == maxSlots)
                             return true;
 
                         int mobBase;
@@ -146,47 +143,15 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
                         if (mobBase == 0)
                             return true;
 
-                        Mob siegeMob = Mob.createSiegeMob(npc, mobBase, npc.getGuild(), zone, b.getLoc(), (short) 1);
+                        Mob siegeMob = Mob.createSiegeMinion(npc, mobBase);
 
                         if (siegeMob == null)
                             return true;
-
-                        if (siegeMob != null) {
-
-                            siegeMob.setSpawnTime(60 * 15);
-                            Building building = BuildingManager.getBuilding(((MinionTrainingMessage) baseMsg).getBuildingID());
-
-                            siegeMob.building = building;
-                            siegeMob.parentZone = zone;
-
-                            // Slot siege minion
-                            // Can be either corner tower or bulwark.
-
-                            int slot;
-
-                            if (building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.ARTYTOWER))
-                                slot = 2;
-                            else
-                                slot = ((NPC) siegeMob.npcOwner).getSiegeMinionMap().get(siegeMob) + 1;  // First slot is for the captain
-
-                            BuildingLocation slotLocation = BuildingManager._slotLocations.get(building.meshUUID).get(slot);
-                            siegeMob.bindLoc = building.getLoc().add(slotLocation.getLocation());
-
-                            // Rotate slot position by the building rotation
-
-                            siegeMob.bindLoc = Vector3fImmutable.rotateAroundPoint(building.getLoc(), siegeMob.bindLoc, building.getBounds().getQuaternion().angleY);
-
-                            siegeMob.loc = new Vector3fImmutable(siegeMob.bindLoc);
-                            siegeMob.endLoc = new Vector3fImmutable(siegeMob.bindLoc);
-
-                            zone.zoneMobSet.add(siegeMob);
-                            siegeMob.setLoc(siegeMob.bindLoc);
-                        }
                     }
 
                     ManageNPCMsg mnm = new ManageNPCMsg(npc);
                     mnm.setMessageType(1);
-                    Dispatch dispatch = Dispatch.borrow(player, mnm);
+                    Dispatch dispatch = Dispatch.borrow(playerCharacter, mnm);
                     DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
 
                 } finally {
@@ -214,13 +179,13 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
 
                         Mob toRemove = Mob.getFromCache(minionMsg.getUUID());
 
-                        if (!npc.getSiegeMinionMap().containsKey(toRemove))
+                        if (!npc.minions.contains(toRemove.getObjectUUID()))
                             return true;
 
-                        if (!DbManager.MobQueries.REMOVE_FROM_GUARDS(npc.getObjectUUID(), toRemove.getMobBaseID(), npc.getSiegeMinionMap().get(toRemove)))
+                        if (!DbManager.MobQueries.REMOVE_GUARD_MINION(npc.getObjectUUID(), toRemove.firstName))
                             return true;
 
-                        npc.getSiegeMinionMap().remove(toRemove);
+                        npc.minions.remove(Integer.valueOf(toRemove.getObjectUUID()));
 
                         WorldGrid.RemoveWorldObject(toRemove);
 
@@ -228,17 +193,22 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
                             toRemove.getParentZone().zoneMobSet.remove(toRemove);
 
                         DbManager.removeFromCache(toRemove);
-                        PlayerCharacter petOwner = toRemove.getOwner();
 
-                        if (petOwner != null) {
+                        if (toRemove.agentType.equals(Enum.AIAgentType.SIEGEENGINE)) {
-                            petOwner.setPet(null);
+
-                            toRemove.setOwner(null);
+                            PlayerCharacter trebOwner = (PlayerCharacter) toRemove.guardCaptain;
-                            PetMsg petMsg = new PetMsg(5, null);
+
-                            Dispatch dispatch = Dispatch.borrow(petOwner, petMsg);
+                            if (trebOwner != null) {
-                            DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
+                                trebOwner.setPet(null);
+
+                                toRemove.guardCaptain = null;
+                                PetMsg petMsg = new PetMsg(5, null);
+                                Dispatch dispatch = Dispatch.borrow(trebOwner, petMsg);
+                                DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
+                            }
                         }
 
-                        ManageCityAssetsMsg mca1 = new ManageCityAssetsMsg(player, building);
+                        ManageCityAssetsMsg mca1 = new ManageCityAssetsMsg(playerCharacter, building);
                         mca1.actionType = 3;
                         mca1.setTargetType(building.getObjectType().ordinal());
                         mca1.setTargetID(building.getObjectUUID());
@@ -248,11 +218,11 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
                         mca1.setAssetName1(building.getName());
                         mca1.setUnknown54(1);
 
-                        Dispatch dispatch = Dispatch.borrow(player, mca1);
+                        Dispatch dispatch = Dispatch.borrow(playerCharacter, mca1);
                         DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
 
                         ManageNPCMsg mnm = new ManageNPCMsg(npc);
-                        dispatch = Dispatch.borrow(player, mnm);
+                        dispatch = Dispatch.borrow(playerCharacter, mnm);
                         DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
 
                         //Add Minion
@@ -288,7 +258,7 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
                                 break;
                         }
 
-                        if (npc.getSiegeMinionMap().size() == maxSlots)
+                        if (npc.minions.size() == maxSlots)
                             return true;
 
                         int mobBase = npc.getMobBaseID();
@@ -298,14 +268,14 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
 
                         String pirateName = NPCManager.getPirateName(mobBase);
 
-                        if (!DbManager.MobQueries.ADD_TO_GUARDS(npc.getObjectUUID(), mobBase, pirateName, npc.getSiegeMinionMap().size() + 1))
+                        Mob toCreate = Mob.createGuardMinion(npc, npc.getLevel(), pirateName);
-                            return true;
-
-                        Mob toCreate = Mob.createGuardMob(npc, npc.getGuild(), zone, building.getLoc(), npc.getLevel(), pirateName);
 
                         if (toCreate == null)
                             return true;
 
+                        if (!DbManager.MobQueries.ADD_GUARD_MINION(npc.getObjectUUID(), pirateName))
+                            return true;
+
                         if (toCreate != null) {
                             toCreate.setDeathTime(System.currentTimeMillis());
                             toCreate.parentZone.zoneMobSet.add(toCreate);
@@ -314,7 +284,7 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
 
                     ManageNPCMsg mnm = new ManageNPCMsg(npc);
                     mnm.setMessageType(1);
-                    Dispatch dispatch = Dispatch.borrow(player, mnm);
+                    Dispatch dispatch = Dispatch.borrow(playerCharacter, mnm);
                     DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
 
                 } catch (Exception e) {

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

@@ -9,12 +9,14 @@
 
 package engine.net.client.handlers;
 
+import engine.Enum;
 import engine.exception.MsgSendException;
+import engine.gameManager.BuildingManager;
 import engine.gameManager.MovementManager;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.MoveToPointMsg;
-import engine.objects.PlayerCharacter;
+import engine.objects.*;
 
 public class MoveToPointHandler extends AbstractClientMsgHandler {
 
@@ -26,13 +28,11 @@ public class MoveToPointHandler extends AbstractClientMsgHandler {
     protected boolean _handleNetMsg(ClientNetMsg baseMsg,
                                     ClientConnection origin) throws MsgSendException {
         MoveToPointMsg msg = (MoveToPointMsg) baseMsg;
-
+        PlayerCharacter pc = origin.getPlayerCharacter();
-        PlayerCharacter pc = (origin != null) ? (origin.getPlayerCharacter()) : null;
+        if(pc == null)
-        if (pc == null)
+            return true;
-            return false;
 
         MovementManager.movement(msg, pc);
         return true;
     }
-
 }

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

@@ -421,12 +421,31 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                                 itemMan.consume(item);
                             }
                             break;
+                        //ANNIVERSERY GIFT
                         case 31:
+                            // *** Disabled for now: Needs bootyset created
+
+                            //if (ib.getUUID() == 971012) {
+                            //    int random = ThreadLocalRandom.current().nextInt(ItemBase.AnniverseryGifts.size());
+                            //    int annyID = ItemBase.AnniverseryGifts.get(random);
+
+                            //    ItemBase annyIB = ItemBase.getItemBase(annyID);
+                            //    if (annyIB != null) {
+                            //        Item gift = MobLoot.createItemForPlayer(player, annyIB);
+                            //        if (gift != null) {
+                            //            itemMan.addItemToInventory(gift);
+                            //            itemMan.consume(item);
+                            //        }
+                            //    }
+                            //    break;
+                            //}
+
                             LootManager.peddleFate(player,item);
                             break;
 
                         case 30: //water bucket
                         case 8: //potions, tears of saedron
+
                         case 5: //runes, petition, warrant, scrolls
                             if (uuid > 3000 && uuid < 3050) { //Discipline Runes
                                 if (ApplyRuneMsg.applyRune(uuid, origin, player)) {
@@ -443,12 +462,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                                     itemMan.consume(item);
                                 }
                                 break;
-                            } else if (uuid > 252122 && uuid < 252137) { //blood runes
+                            } else if (uuid > 252122 && uuid < 252128) { //mastery runes
-                                if (ApplyRuneMsg.applyRune(uuid, origin, player)) {
-                                    itemMan.consume(item);
-                                }
-                                break;
-                            } else if (uuid > 252128 && uuid < 252128) { //mastery runes
                                 if (ApplyRuneMsg.applyRune(uuid, origin, player)) {
                                     itemMan.consume(item);
                                 }
@@ -514,6 +528,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                                     }
 
                                     // Send piss bucket animation
+
                                     VisualUpdateMessage vum = new VisualUpdateMessage(player, 16323);
                                     vum.configure();
                                     DispatchMessage.sendToAllInRange(player, vum);
@@ -528,9 +543,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
 
                             dispatch = Dispatch.borrow(player, msg);
                             DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
-                            if(!item.getItemBase().getType().equals(ItemType.POTION)) {
+                            player.cancelOnSpell();
-                                player.cancelOnSpell();
-                            }
                             break;
                         default: //shouldn't be here, consume item
                             dispatch = Dispatch.borrow(player, msg);

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

@@ -7,7 +7,6 @@ import engine.Enum.ProfitType;
 import engine.exception.MsgSendException;
 import engine.gameManager.BuildingManager;
 import engine.gameManager.DbManager;
-import engine.gameManager.NPCManager;
 import engine.gameManager.SessionManager;
 import engine.math.FastMath;
 import engine.math.Vector3fImmutable;
@@ -37,7 +36,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         super(OrderNPCMsg.class);
     }
 
-    public static void processRedeedMob(Mob mob, Building building, ClientConnection origin) {
+    public static void processRedeedHireling(AbstractCharacter hireling, Building building, ClientConnection origin) {
 
         PlayerCharacter player;
         Contract contract;
@@ -48,33 +47,28 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         player = SessionManager.getPlayerCharacter(origin);
         itemMan = player.getCharItemManager();
 
-        contract = mob.getContract();
+        contract = hireling.contract;
 
         if (!player.getCharItemManager().hasRoomInventory((short) 1)) {
             ErrorPopupMsg.sendErrorPopup(player, 21);
             return;
         }
 
-        if (!building.getHirelings().containsKey(mob))
+        if (!building.getHirelings().containsKey(hireling))
             return;
 
-        if (!NPCManager.removeMobileFromBuilding(mob, building)) {
+        BuildingManager.removeHireling(building, hireling);
-            PlaceAssetMsg.sendPlaceAssetError(player.getClientConnection(), 1, "A Serious error has occurred. Please post details for to ensure transaction integrity");
-            return;
-        }
-
-        building.getHirelings().remove(mob);
 
         itemBase = ItemBase.getItemBase(contract.getContractID());
 
         if (itemBase == null) {
-            Logger.error("Could not find Contract for npc: " + mob.getObjectUUID());
+            Logger.error("Could not find Contract for npc: " + hireling.getObjectUUID());
             return;
         }
 
         boolean itemWorked = false;
 
-        item = new Item(itemBase, player.getObjectUUID(), Enum.OwnerType.PlayerCharacter, (byte) ((byte) mob.getRank() - 1), (byte) ((byte) mob.getRank() - 1), (short) 1, (short) 1, true, false, Enum.ItemContainerType.INVENTORY, (byte) 0, new ArrayList<>(), "");
+        item = new Item(itemBase, player.getObjectUUID(), Enum.OwnerType.PlayerCharacter, (byte) ((byte) hireling.getRank() - 1), (byte) ((byte) hireling.getRank() - 1), (short) 1, (short) 1, true, false, Enum.ItemContainerType.INVENTORY, (byte) 0, new ArrayList<>(), "");
         item.setNumOfItems(1);
         item.containerType = Enum.ItemContainerType.INVENTORY;
 
@@ -212,10 +206,6 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
                 return;
             }
 
-            for (AbstractCharacter guard : building.getHirelings().keySet()) {
-                if (guard.getObjectType() == GameObjectType.Mob)
-                    ((Mob) guard).setPatrolPointIndex(0);
-            }
         } else if (building.getPatrolPoints() != null)
             ClearPatrolPoints(building.getObjectUUID());
 
@@ -223,10 +213,6 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
             AddSentryPoints(building.getObjectUUID(), orderNpcMsg.getSentryPoints());
         } else if (building.getSentryPoints() != null)
             ClearSentryPoints(building.getObjectUUID());
-
-        //		Dispatch dispatch = Dispatch.borrow(pc, msg);
-        //		DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
-
     }
 
     private static void processUpgradeNPC(PlayerCharacter player, AbstractCharacter abstractCharacter) {
@@ -290,28 +276,6 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         }
     }
 
-    private static synchronized void processRedeedNPC(AbstractCharacter abstractCharacter, Building building, ClientConnection origin) {
-
-        // Member variable declaration
-
-        switch (abstractCharacter.getObjectType()) {
-            case NPC:
-                NPC npc = (NPC) abstractCharacter;
-
-                Building cityBuilding = npc.getBuilding();
-
-                if (cityBuilding == null)
-                    return;
-
-                BuildingManager.processRedeedNPC(npc, npc.building, origin);
-                break;
-            case Mob:
-                Mob mob = (Mob) abstractCharacter;
-                processRedeedMob(mob, mob.building, origin);
-                break;
-        }
-    }
-
     private static boolean AddPatrolPoints(int buildingID, ArrayList<Vector3fImmutable> patrolPoints) {
 
         Building building = BuildingManager.getBuildingFromCache(buildingID);
@@ -502,7 +466,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
                     if (BuildingManager.PlayerCanControlNotOwner(building, player) == false)
                         return true;
 
-                    processRedeedNPC(npc, building, origin);
+                    processRedeedHireling(npc, building, origin);
                     return true;
                 //MB TODO HANDLE all profits.
                 case 7:
@@ -541,7 +505,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
 
         } else if (orderNPCMsg.getObjectType() == GameObjectType.Mob.ordinal()) {
 
-            mob = Mob.getFromCacheDBID(orderNPCMsg.getNpcUUID());
+            mob = Mob.getMob(orderNPCMsg.getNpcUUID());
 
             if (mob == null)
                 return true;
@@ -570,10 +534,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
                     if (building.getHirelings().containsKey(mob) == false)
                         return true;
 
-                    if (NPCManager.removeMobileFromBuilding(mob, building) == false) {
+                    BuildingManager.removeHireling(building, mob);
-                        PlaceAssetMsg.sendPlaceAssetError(player.getClientConnection(), 1, "A Serious error has occurred. Please post details for to ensure transaction integrity");
-                        return true;
-                    }
 
                     ManageCityAssetsMsg manageCityAssetsMsg = new ManageCityAssetsMsg();
                     manageCityAssetsMsg.actionType = SVR_CLOSE_WINDOW;
@@ -608,7 +569,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
                     if (BuildingManager.PlayerCanControlNotOwner(building, player) == false)
                         return true;
 
-                    processRedeedNPC(mob, building, origin);
+                    processRedeedHireling(mob, building, origin);
                     return true;
                 //MB TODO HANDLE all profits.
                 case 7:

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

@@ -135,8 +135,7 @@ public class TaxCityMsgHandler extends AbstractClientMsgHandler {
 
         msg = (TaxCityMsg) baseMsg;
 
-        //realm taxing disabled
+        ViewTaxes(msg, player);
-        //ViewTaxes(msg, player);
 
 
         return true;

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

@@ -10,7 +10,6 @@
 package engine.net.client.msg;
 
 import engine.Enum;
-import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
 import engine.net.*;
 import engine.net.client.ClientConnection;
@@ -71,118 +70,62 @@ public class ApplyRuneMsg extends ClientNetMsg {
     }
 
     public static boolean applyRune(int runeID, ClientConnection origin, PlayerCharacter playerCharacter) {
+
         RuneBase rb = RuneBase.getRuneBase(runeID);
         Dispatch dispatch;
+
         if (playerCharacter == null || origin == null || rb == null) {
             return false;
         }
-        int raceID = playerCharacter.getRaceID();
+
         //Check race is met
         ConcurrentHashMap<Integer, Boolean> races = rb.getRace();
-        if(runeID != 3007 && runeID != 3014) {//bounty hunter and huntsman
+        if (races.size() > 0) {
-            if (races.size() > 0) {
+            int raceID = playerCharacter.getRaceID();
-                boolean valid = false;
+            boolean valid = false;
-                for (int validID : races.keySet()) {
+            for (int validID : races.keySet()) {
-                    if (validID == raceID) {
+                if (validID == raceID) {
-                        valid = true;
-                        break;
-                    }
-                }
-                if(runeID == 3040)
                     valid = true;
-
+                    break;
-                if(runeID == 3049)
-                    valid = true;
-
-                if(raceID == 1999){
-                    switch(runeID){
-                        case 2514:
-                        case 3036:
-                        case 3033:
-                        case 3001:
-                        case 3002:
-                        case 3003:
-                        case 3004:
-                        case 3008:
-                        case 3009:
-                        case 3013:
-                        case 3016:
-                        case 3017:
-                        case 3018:
-                        case 3020:
-                        case 3021:
-                        case 3030:
-                        case 3031:
-                        case 3037:
-                        case 3045:
-                        case 3046:
-                        case 3047:
-                        case 3048:
-                        case 3049:
-                            valid = true;
-                            break;
-                    }
-                }
-                if (!valid) {
-                    return false;
                 }
             }
-            //Check base class is met
+            if (!valid) {
-            ConcurrentHashMap<Integer, Boolean> baseClasses = rb.getBaseClass();
-            if (baseClasses.size() > 0) {
-                int baseClassID = playerCharacter.getBaseClassID();
-                boolean valid = false;
-                for (int validID : baseClasses.keySet()) {
-                    if (validID == baseClassID) {
-                        valid = true;
-                        break;
-                    }
-                }
-                if(runeID == 3040)
-                    valid = true;
-                if(runeID == 3036 && raceID == 1999)
-                    valid = true;
-                if(runeID == 3033 && raceID == 1999)
-                    valid = true;
-                if(runeID == 3035 && baseClassID == 2501)
-                    valid = true;
-                if (!valid) {
-                    return false;
-                }
-            }
-            //Check promotion class is met
-            ConcurrentHashMap<Integer, Boolean> promotionClasses = rb.getPromotionClass();
-            if (promotionClasses.size() > 0) {
-                int promotionClassID = playerCharacter.getPromotionClassID();
-                int baseClassID = playerCharacter.getBaseClassID();
-                boolean valid = false;
-                for (int validID : promotionClasses.keySet()) {
-                    if (validID == promotionClassID) {
-                        valid = true;
-                        break;
-                    }
-                }
-                if(runeID == 3040)
-                    valid = true;
-                if(runeID == 3004 && (playerCharacter.getPromotionClassID() == 2505 || playerCharacter.getPromotionClassID() == 2510))
-                    valid = true;
-                if(runeID == 3036 && raceID == 1999)
-                    valid = true;
-                if(runeID == 3033 && raceID == 1999)
-                    valid = true;
-                if(runeID == 3028 && (raceID == 2013 || raceID == 2014) && playerCharacter.getBaseClassID() == 2501)
-                    valid = true;
-                if(runeID == 3035 && baseClassID == 2501)
-                    valid = true;
-                if (!valid) {
-                    return false;
-                }
-            }
-        } else{
-            if(playerCharacter.getPromotionClassID() == 2519){//priest
                 return false;
             }
         }
+
+        //Check base class is met
+        ConcurrentHashMap<Integer, Boolean> baseClasses = rb.getBaseClass();
+        if (baseClasses.size() > 0) {
+            int baseClassID = playerCharacter.getBaseClassID();
+            boolean valid = false;
+            for (int validID : baseClasses.keySet()) {
+                if (validID == baseClassID) {
+                    valid = true;
+                    break;
+                }
+            }
+            if (!valid) {
+                return false;
+            }
+        }
+
+        //Check promotion class is met
+        ConcurrentHashMap<Integer, Boolean> promotionClasses = rb.getPromotionClass();
+        if (promotionClasses.size() > 0) {
+            int promotionClassID = playerCharacter.getPromotionClassID();
+            boolean valid = false;
+            for (int validID : promotionClasses.keySet()) {
+                if (validID == promotionClassID) {
+                    valid = true;
+                    break;
+                }
+            }
+            if (!valid) {
+                return false;
+            }
+        }
+
         //Check disciplines are met
         ArrayList<CharacterRune> runes = playerCharacter.getRunes();
         ConcurrentHashMap<Integer, Boolean> disciplines = rb.getDiscipline();
@@ -196,6 +139,7 @@ public class ApplyRuneMsg extends ClientNetMsg {
                 }
             }
         }
+
         int discCount = 0;
         for (CharacterRune cr : runes) {
             int runeBaseID = cr.getRuneBaseID();
@@ -208,35 +152,28 @@ public class ApplyRuneMsg extends ClientNetMsg {
                 return false;
             }
         }
+
         //Check level is met
         if (playerCharacter.getLevel() < rb.getLevelRequired()) {
             return false;
         }
+
         int strTotal = 0;
         int dexTotal = 0;
         int conTotal = 0;
         int intTotal = 0;
         int spiTotal = 0;
         int cost = 0;
+
         //Check any attributes are met
         ArrayList<RuneBaseAttribute> attrs = rb.getAttrs();
+
         if (rb.getAttrs() != null)
             for (RuneBaseAttribute rba : attrs) {
                 int attrID = rba.getAttributeID();
                 int mod = rba.getModValue();
                 switch (attrID) {
                     case MBServerStatics.RUNE_COST_ATTRIBUTE_ID:
-                        switch (rb.getName()) {
-                            case "Born of the Ethyri":
-                            case "Born of the Taripontor":
-                            case "Born of the Gwendannen":
-                            case "Born of the Invorri":
-                            case "Born of the Irydnu":
-                            case "Scion of the Dar Khelegeur":
-                            case "Scion of the Gwaridorn":
-                            case "Scion of the Twathedilion":
-                                mod = 0;
-                        }
                         if (mod > playerCharacter.getUnusedStatPoints()) {
                             return false;
                         }
@@ -289,64 +226,25 @@ public class ApplyRuneMsg extends ClientNetMsg {
                         break;
                 }
             }
+
         //Check if max number runes already reached
         if (runes.size() > 12) {
-            ChatManager.chatSystemInfo(playerCharacter,"You Have Too Many Runes Applied");
             return false;
         }
-        switch (rb.getName()) {
+
-            case "Born of the Ethyri":
-            case "Born of the Taripontor":
-            case "Born of the Gwendannen":
-            case "Born of the Invorri":
-            case "Born of the Irydnu":
-                for (CharacterRune charRune : playerCharacter.getRunes()) {
-                    RuneBase rb2 = charRune.getRuneBase();
-                    switch (rb2.getName()) {
-                        case "Born of the Ethyri":
-                        case "Born of the Taripontor":
-                        case "Born of the Gwendannen":
-                        case "Born of the Invorri":
-                        case "Born of the Irydnu":
-                            ChatManager.chatSystemError(playerCharacter, "You Have Already Applied A Blood Rune");
-                            return false;
-                    }
-                }
-                break;
-            case "Scion of the Dar Khelegeur":
-            case "Scion of the Gwaridorn":
-            case "Scion of the Twathedilion":
-                for (CharacterRune charRune : playerCharacter.getRunes()) {
-                    RuneBase rb2 = charRune.getRuneBase();
-                    switch (rb2.getName()) {
-                        case "Scion of the Dar Khelegeur":
-                        case "Scion of the Gwaridorn":
-                        case "Scion of the Twathedilion":
-                            ChatManager.chatSystemError(playerCharacter, "You Have Already Applied A Blood Rune");
-                            return false;
-                    }
-                }
-                break;
-        }
         //if discipline, check number applied
         if (isDiscipline(runeID)) {
-            switch(playerCharacter.getRank()){
+            if (playerCharacter.getLevel() < 70) {
-                case 1:
+                if (discCount > 2) {
-                case 2:
+                    return false;
-                case 3:
+                }
-                case 4:
+            } else {
-                case 5:
+                if (discCount > 3) {
-                case 6:
+                    return false;
-                    if(discCount > 3)
+                }
-                        return false;
-                    break;
-                case 7:
-                case 8:
-                    if(discCount > 5)
-                        return false;
-                    break;
             }
         }
+
         //Everything succeeded. Let's apply the rune
         //Attempt add rune to database
         CharacterRune runeWithoutID = new CharacterRune(rb, playerCharacter.getObjectUUID());
@@ -360,6 +258,7 @@ public class ApplyRuneMsg extends ClientNetMsg {
         if (cr == null) {
             return false;
         }
+
         //remove any overridden runes from player
         ArrayList<Integer> overwrite = rb.getOverwrite();
         CharacterRune toRemove = null;
@@ -368,10 +267,13 @@ public class ApplyRuneMsg extends ClientNetMsg {
                 toRemove = playerCharacter.removeRune(overwriteID);
             }
         }
+
         //add rune to player
         playerCharacter.addRune(cr);
+
         // recalculate all bonuses/formulas/skills/powers
         playerCharacter.recalculate();
+
         //if overwriting a stat rune, add any amount granted from previous rune.
         if (toRemove != null) {
             RuneBase rbs = toRemove.getRuneBase();
@@ -397,35 +299,30 @@ public class ApplyRuneMsg extends ClientNetMsg {
                 if (dif > 0 && spiTotal < (int) playerCharacter.statSpiMax) {
                     playerCharacter.addSpi(dif);
                 }
+
                 // recalculate all bonuses/formulas/skills/powers
                 playerCharacter.recalculate();
             }
         }
-        switch (rb.getName()) {
+
-            case "Born of the Ethyri":
-            case "Born of the Taripontor":
-            case "Born of the Gwendannen":
-            case "Born of the Invorri":
-            case "Born of the Irydnu":
-            case "Scion of the Dar Khelegeur":
-            case "Scion of the Gwaridorn":
-            case "Scion of the Twathedilion":
-                cost = 0;
-                break;
-        }
         if (cost > 0) {
             ModifyStatMsg msm = new ModifyStatMsg((0 - cost), 0, 3);
             dispatch = Dispatch.borrow(playerCharacter, msm);
             DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
         }
+
         //send apply rune message to client
         ApplyRuneMsg arm = new ApplyRuneMsg(playerCharacter.getObjectType().ordinal(), playerCharacter.getObjectUUID(), runeID, cr.getObjectType().ordinal(), cr.getObjectUUID(), false);
         dispatch = Dispatch.borrow(playerCharacter, arm);
         DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
+
+
         //alert them of success
         ErrorPopupMsg.sendErrorPopup(playerCharacter, 160);
+
         //reapply bonuses
         playerCharacter.applyBonuses();
+
         return true;
     }
 

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

@@ -112,12 +112,6 @@ public class BuyFromNPCWindowMsg extends ClientNetMsg {
 
             if (contract != null)
                 sellInventory = contract.getSellInventory();
-            //if(npc.contract.getObjectUUID() == 890){ // default steward
-            //    sellInventory = npc.getSellInventorySteward();
-           // }
-            //if(npc.contract.getObjectUUID() == 889){ // default builder
-           //     sellInventory = npc.getSellInventoryBuilder();
-           // }
         }
 
         if (man != null)

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

@@ -104,10 +104,8 @@ public class CityDataMsg extends ClientNetMsg {
         }
 
         temp.putInt(mineList.size());
-        for (Mine mine : mineList) {
+        for (Mine mine : mineList)
-            if(mine.getParentZone() != null && !mine.getParentZone().isContinent())
+            Mine.serializeForClientMsg(mine, temp);
-                Mine.serializeForClientMsg(mine, temp);
-        }
         temp.put((byte) 0); // PAD
     }
 
@@ -180,10 +178,8 @@ public class CityDataMsg extends ClientNetMsg {
                 }
 
                 writer.putInt(mineList.size());
-                for (Mine mine : mineList) {
+                for (Mine mine : mineList)
-                    if(mine.getParentZone() != null && !mine.getParentZone().isContinent())
+                    Mine.serializeForClientMsg(mine, writer);
-                        Mine.serializeForClientMsg(mine, writer);
-                }
             } else
                 writer.putInt(0);
         } catch (Exception e) {

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

@@ -275,7 +275,7 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
 
                 writer.putString(npcHire.getName());
                 writer.putInt(1);
-                writer.putInt(0);
+                writer.putInt(Blueprint.getNpcMaintCost(npcHire.getRank()));
                 if (npcHire.getObjectType() == GameObjectType.NPC)
                     writer.putInt(((NPC) npcHire).getContract().getIconID()); // Was 60
                 else if (npcHire.getObjectType() == GameObjectType.Mob) {
@@ -392,9 +392,9 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
             writer.putInt(bane.getSiegePhase().ordinal()); //1 challenge //2 standoff //3 war
             writer.put((byte) 0);
 
-            //if (!bane.isAccepted() && this.assetManager.getGuild() == banedCity.getGuild() && GuildStatusController.isInnerCouncil(this.assetManager.getGuildStatus()))
+            if (!bane.isAccepted() && this.assetManager.getGuild() == banedCity.getGuild() && GuildStatusController.isInnerCouncil(this.assetManager.getGuildStatus()))
-            //    writer.put((byte) 1); //canSetTime
+                writer.put((byte) 1); //canSetTime
-            //else
+            else
                 writer.put((byte) 0);
 
             DateTime placedOn = bane.getLiveDate();
@@ -485,19 +485,36 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
 
             writer.putInt(building.getRank());
 
-            writer.putInt(1); // Gold only
+            // Maintenance costs include resource if
+            // this structure is an R8 tree
+
+            if (building.getRank() == 8)
+                writer.putInt(5); // Resources included
+            else
+                writer.putInt(1); // Gold only
 
             writer.putInt(2308551); //Gold
             if (building.getBlueprint() == null)
                 writer.putInt(0);
             else
-                writer.putInt(building.getBlueprint().getMaintCost()); //  maint cost
+                writer.putInt(building.getBlueprint().getMaintCost(building.getRank())); //  maint cost
+
+            if (building.getRank() == 8) {
+                writer.putInt(74856115); // Stone
+                writer.putInt(1500); //  maint cost
+                writer.putInt(-1603256692); // Lumber
+                writer.putInt(1500); //  maint cost
+                writer.putInt(-1596311545); // Galvor
+                writer.putInt(5); //  maint cost
+                writer.putInt(1532478436); // Wormwood
+                writer.putInt(5); //  maint cost
+            }
 
             LocalDateTime maintDate = building.maintDateTime;
 
             if (maintDate == null)
                 maintDate = LocalDateTime.now();
-            writer.putLocalDateTime(maintDate); // current time
+            writer.putLocalDateTime(LocalDateTime.now()); // current time
 
             // utc offset?
             writer.putInt((int) java.time.Duration.between(LocalDateTime.now(), maintDate).getSeconds()); // Seconds to maint date

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

@@ -27,7 +27,6 @@ import org.pmw.tinylog.Logger;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -96,7 +95,7 @@ public class ManageNPCMsg extends ClientNetMsg {
         writer.putString("A weapon suited to laying siege");
     }
 
-    private static void serializeGuardList(ByteBufferWriter writer, int minion) {
+    private static void serializeGuardList(ByteBufferWriter writer, int minion, Mob captain) {
 
         writer.putInt(1);
 
@@ -106,7 +105,7 @@ public class ManageNPCMsg extends ClientNetMsg {
         writer.putInt(minion);
         writer.putInt(1);
         writer.putInt(minion);
-        writer.putInt(1);
+        writer.putInt(captain.getRank());//minion rank
         writer.put((byte) 0);
 
         writer.putInt(600); //roll time
@@ -343,14 +342,17 @@ public class ManageNPCMsg extends ClientNetMsg {
                         writer.putInt(0); //runemaster list
 
                         //artillery captain list
-                        ConcurrentHashMap<Mob, Integer> siegeMinions = npc.getSiegeMinionMap();
+
-                        writer.putInt(1 + siegeMinions.size());
+                        writer.putInt(1 + npc.minions.size());
                         serializeBulwarkList(writer, 1); //Trebuchet
                         //serializeBulwarkList(writer, 2); //Ballista
 
-                        if (siegeMinions != null && siegeMinions.size() > 0)
+                        if (npc.minions != null && npc.minions.size() > 0)
+
+                            for (Integer minionUUID : npc.minions) {
+
+                                Mob mob = Mob.getMob(minionUUID);
 
-                            for (Mob mob : siegeMinions.keySet()) {
                                 this.unknown83 = mob.getObjectUUID();
                                 writer.putInt(2);
                                 writer.putInt(mob.getObjectType().ordinal());
@@ -366,7 +368,7 @@ public class ManageNPCMsg extends ClientNetMsg {
                                 long timeLife = upgradeTime - curTime;
 
                                 if (upgradeTime * 1000 > System.currentTimeMillis()) {
-                                    if (mob.npcOwner.isAlive()) {
+                                    if (mob.guardCaptain.isAlive()) {
                                         writer.put((byte) 0);//shows respawning timer
                                         writer.putInt(mob.spawnTime);
                                         writer.putInt(mob.spawnTime);
@@ -503,7 +505,7 @@ public class ManageNPCMsg extends ClientNetMsg {
                         writer.putInt(0);
                         writer.putString("Repair items");
                         writer.putString("percent");
-                        writer.putInt(npc.getSpecialPrice()); //cost for repair
+                        writer.putInt(npc.getRepairCost()); //cost for repair
                         writer.putInt(0);
 
                         ArrayList<Integer> modPrefixList = npc.getModTypeTable();
@@ -557,7 +559,7 @@ public class ManageNPCMsg extends ClientNetMsg {
 
                 } else if (this.targetType == GameObjectType.Mob.ordinal()) {
 
-                    mobA = Mob.getFromCacheDBID(this.targetID);
+                    mobA = Mob.getMob(this.targetID);
 
                     if (mobA == null) {
                         Logger.error("Missing Mob of ID " + this.targetID);
@@ -666,14 +668,15 @@ public class ManageNPCMsg extends ClientNetMsg {
                         writer.putInt(0); //runemaster list
 
                         //artillery captain list
-                        ConcurrentHashMap<Mob, Integer> siegeMinions = mobA.getSiegeMinionMap();
 
-                        writer.putInt(siegeMinions.size() + 1);
+                        writer.putInt(mobA.minions.size() + 1);
-                        serializeGuardList(writer, mobA.getContract().getContractID()); //Guard
 
-                        if (siegeMinions != null && siegeMinions.size() > 0)
+                        serializeGuardList(writer, mobA.getContract().getContractID(), mobA); //Guard
 
-                            for (Mob mob : siegeMinions.keySet()) {
+                        if (mobA.minions != null && mobA.minions.size() > 0)
+
+                            for (Integer minionUUID : mobA.minions) {
+                                Mob mob = Mob.getMob(minionUUID);
                                 this.unknown83 = mob.getObjectUUID();
                                 writer.putInt(2);
                                 writer.putInt(mob.getObjectType().ordinal());
@@ -689,7 +692,7 @@ public class ManageNPCMsg extends ClientNetMsg {
                                 long timeLife = upgradeTime - curTime;
 
                                 if (upgradeTime * 1000 > System.currentTimeMillis()) {
-                                    if (mob.npcOwner.isAlive()) {
+                                    if (mob.guardCaptain.isAlive()) {
                                         writer.put((byte) 0);//shows respawning timer
                                         writer.putInt(mob.spawnTime);
                                         writer.putInt(mob.spawnTime);

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

@@ -10,6 +10,7 @@
 package engine.net.client.msg;
 
 import engine.Enum.GameObjectType;
+import engine.gameManager.BuildingManager;
 import engine.gameManager.ZoneManager;
 import engine.math.Vector3fImmutable;
 import engine.net.AbstractConnection;
@@ -21,19 +22,19 @@ import engine.objects.Building;
 
 public class MoveToPointMsg extends ClientNetMsg {
 
-    private int sourceType;
+    private int sourceType; //ordinal of the character type that sent this message 54=PlayerCharacter
-    private int sourceID;
+    private int sourceID; // uuid of the source character of this message
-    private float startLat;
+    private float startLat; //start loc of move message (offset if inside a building not world loc)
-    private float startLon;
+    private float startLon; //start loc of move message (offset if inside a building not world loc)
-    private float startAlt;
+    private float startAlt; //start loc of move message (offset if inside a building not world loc)
-    private float endLat;
+    private float endLat; //end loc of move message (offset if inside a building not world loc)
-    private float endLon;
+    private float endLon; //end loc of move message (offset if inside a building not world loc)
-    private float endAlt;
+    private float endAlt; //end loc of move message (offset if inside a building not world loc)
-    private int targetType;
+    private int startLocType; // enum ordinal of the object player is inside 0=nothing 8=building
-    private int targetID;
+    private int inBuildingUUID; // uuid of the building character is currently inside
-    private int inBuilding; // 0=true, -1=false 0/1/2 = floor you are on
+    private int inBuilding; // is inside a building 0=true -1=false
-    private int unknown01;
+    private int inBuildingFloor; // floor of building character is currently in -1=not inside building 0/1/2/3 = floor number
-    private byte unknown02;
+    private byte initiatedByAttack; // move message sent as a result of move to target to attack 0=false 1=true
     private byte unknown03;
 
     /**
@@ -54,11 +55,11 @@ public class MoveToPointMsg extends ClientNetMsg {
         this.endLat = msg.endLat;
         this.endLon = msg.endLon;
         this.endAlt = msg.endAlt;
-        this.targetType = msg.targetType;
+        this.startLocType = msg.startLocType;
-        this.targetID = msg.targetID;
+        this.inBuildingUUID = msg.inBuildingUUID;
         this.inBuilding = msg.inBuilding;
-        this.unknown01 = msg.unknown01;
+        this.inBuildingFloor = msg.inBuildingFloor;
-        this.unknown02 = msg.unknown02;
+        this.initiatedByAttack = msg.initiatedByAttack;
         this.unknown03 = msg.unknown03;
     }
 
@@ -73,11 +74,11 @@ public class MoveToPointMsg extends ClientNetMsg {
         this.endLat = building.getLoc().x;
         this.endLon = building.getLoc().z;
         this.endAlt = building.getLoc().y;
-        this.targetType = 0;
+        this.startLocType = 0;
-        this.targetID = 0;
+        this.inBuildingUUID = 0;
         this.inBuilding = -1;
-        this.unknown01 = -1;
+        this.inBuildingFloor = -1;
-        this.unknown02 = 0;
+        this.initiatedByAttack = 0;
         this.unknown03 = 0;
     }
 
@@ -108,11 +109,11 @@ public class MoveToPointMsg extends ClientNetMsg {
         writer.putFloat(this.endAlt);
         writer.putFloat(this.endLon);
 
-        writer.putInt(this.targetType);
+        writer.putInt(this.startLocType);
-        writer.putInt(this.targetID);
+        writer.putInt(this.inBuildingUUID);
 
         writer.putInt(this.inBuilding);
-        writer.putInt(this.unknown01);
+        writer.putInt(this.inBuildingFloor);
 
         writer.put((byte) 0);
         writer.put((byte) 0);
@@ -135,13 +136,13 @@ public class MoveToPointMsg extends ClientNetMsg {
         this.endAlt = reader.getFloat();
         this.endLon = reader.getFloat();
 
-        this.targetType = reader.getInt();
+        this.startLocType = reader.getInt();
-        this.targetID = reader.getInt();
+        this.inBuildingUUID = reader.getInt();
 
         this.inBuilding = reader.getInt();
-        this.unknown01 = reader.getInt();
+        this.inBuildingFloor = reader.getInt();
 
-        this.unknown02 = reader.get();
+        this.initiatedByAttack = reader.get();
         this.unknown03 = reader.get();
     }
 
@@ -209,20 +210,20 @@ public class MoveToPointMsg extends ClientNetMsg {
         this.endAlt = value;
     }
 
-    public int getTargetType() {
+    public int getStartLocType() {
-        return this.targetType;
+        return this.startLocType;
     }
 
-    public void setTargetType(int value) {
+    public void setStartLocType(int value) {
-        this.targetType = value;
+        this.startLocType = value;
     }
 
-    public int getTargetID() {
+    public int getInBuildingUUID() {
-        return this.targetID;
+        return this.inBuildingUUID;
     }
 
-    public void setTargetID(int value) {
+    public void setInBuildingUUID(int value) {
-        this.targetID = value;
+        this.inBuildingUUID = value;
     }
 
     public int getInBuilding() {
@@ -233,12 +234,8 @@ public class MoveToPointMsg extends ClientNetMsg {
         this.inBuilding = value;
     }
 
-    public int getUnknown01() {
+    public void setInBuildingFloor(int value) {
-        return this.unknown01;
+        this.inBuildingFloor = value;
-    }
-
-    public void setUnknown01(int value) {
-        this.unknown01 = value;
     }
 
     public void setStartCoord(Vector3fImmutable value) {
@@ -254,8 +251,8 @@ public class MoveToPointMsg extends ClientNetMsg {
     }
 
     public void clearTarget() {
-        this.targetType = 0;
+        this.startLocType = 0;
-        this.targetID = 0;
+        this.inBuildingUUID = 0;
     }
 
     public void setPlayer(AbstractCharacter ac) {
@@ -263,10 +260,10 @@ public class MoveToPointMsg extends ClientNetMsg {
         this.sourceID = ac.getObjectUUID();
         this.setStartCoord(ac.getLoc());
         this.setEndCoord(ac.getEndLoc());
-        this.targetType = 0;
+        this.startLocType = 0;
-        this.targetID = 0;
+        this.inBuildingUUID = 0;
         this.inBuilding = ac.getInBuilding();
-        this.unknown01 = ac.getInFloorID();
+        this.inBuildingFloor = ac.getInFloorID();
 
     }
 
@@ -274,10 +271,10 @@ public class MoveToPointMsg extends ClientNetMsg {
         if (target == null) {
             this.setStartCoord(ac.getLoc());
             this.setEndCoord(ac.getEndLoc());
-            this.targetType = 0;
+            this.startLocType = 0;
-            this.targetID = 0;
+            this.inBuildingUUID = 0;
             this.inBuilding = -1;
-            this.unknown01 = -1;
+            this.inBuildingFloor = -1;
         } else {
             Vector3fImmutable convertLocStart = ZoneManager.convertWorldToLocal(target, ac.getLoc());
             Vector3fImmutable convertLocEnd = convertLocStart;
@@ -286,10 +283,10 @@ public class MoveToPointMsg extends ClientNetMsg {
 
             this.setStartCoord(convertLocStart);
             this.setEndCoord(convertLocEnd);
-            this.targetType = GameObjectType.Building.ordinal();
+            this.startLocType = GameObjectType.Building.ordinal();
-            this.targetID = target.getObjectUUID();
+            this.inBuildingUUID = target.getObjectUUID();
             this.inBuilding = ac.getInBuilding();
-            this.unknown01 = ac.getInFloorID();
+            this.inBuildingFloor = ac.getInFloorID();
         }
 
     }
@@ -298,7 +295,11 @@ public class MoveToPointMsg extends ClientNetMsg {
         return unknown03;
     }
 
-    public int getUnknown02() {
+    public int getInitiatedFromAttack() {
-        return unknown02;
+        return initiatedByAttack;
+    }
+
+    public int getInBuildingFloor() {
+        return this.inBuildingFloor;
     }
 }

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

@@ -11,7 +11,6 @@ package engine.net.client.msg;
 
 
 import engine.gameManager.ConfigManager;
-import engine.gameManager.DbManager;
 import engine.net.AbstractConnection;
 import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;
@@ -54,45 +53,18 @@ public class ServerInfoMsg extends ClientNetMsg {
 
         writer.putInt(WorldServer.worldMapID);
         writer.putString(ConfigManager.MB_WORLD_NAME.getValue());
-        int TotalTrees = 21;
+        if (LoginServer.population < MBServerStatics.LOW_POPULATION)
-        int currentR8Trees = DbManager.CityQueries.GET_CAPITAL_CITY_COUNT();
+            writer.putInt(0); //Land Rush
-
+        else if (LoginServer.population < MBServerStatics.NORMAL_POPULATION)
-        switch(currentR8Trees){
+            writer.putInt(1); //Low pop
-            case 0:
+        else if (LoginServer.population < MBServerStatics.HIGH_POPULATION)
-            case 1:
+            writer.putInt(2); //Normal pop
-            case 2:
+        else if (LoginServer.population < MBServerStatics.VERY_OVERPOPULATED_POPULATION)
-            case 3:
+            writer.putInt(3); //High Pop
-            case 4:
+        else if (LoginServer.population < MBServerStatics.FULL_POPULATION)
-                writer.putInt(0); //Land Rush
+            writer.putInt(4); //Very overpopulated pop
-                break;
+        else
-            case 5:
+            writer.putInt(5); //Full pop
-            case 6:
-            case 7:
-            case 8:
-                writer.putInt(1); //Low pop
-                break;
-            case 9:
-            case 10:
-            case 11:
-            case 12:
-                writer.putInt(2); //Normal pop
-                break;
-            case 13:
-            case 14:
-            case 15:
-            case 16:
-                writer.putInt(3); //High Pop
-                break;
-            case 17:
-            case 18:
-            case 19:
-            case 20:
-                writer.putInt(4); //Very overpopulated pop
-                break;
-            default:
-                writer.putInt(5); //Full pop
-                break;
-        }
     }
 
     /**

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

@@ -16,9 +16,7 @@ import engine.net.ByteBufferReader;
 import engine.net.ByteBufferWriter;
 import engine.net.client.Protocol;
 import engine.objects.City;
-import engine.objects.Mine;
 import engine.objects.PlayerCharacter;
-import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
 
@@ -26,7 +24,6 @@ import java.util.ArrayList;
 public class TeleportRepledgeListMsg extends ClientNetMsg {
 
     ArrayList<City> cities;
-    ArrayList<Mine> mines;
     private PlayerCharacter player;
     private boolean isTeleport;
 
@@ -80,19 +77,10 @@ public class TeleportRepledgeListMsg extends ClientNetMsg {
 
     public void configure() {
 
-        if (isTeleport) {
+        if (isTeleport)
             cities = City.getCitiesToTeleportTo(player);
-            try {
+        else
-                mines = Mine.getMinesToTeleportTo(player);
-                if(mines == null)
-                    mines = new ArrayList<>();
-            }catch(Exception e){
-                Logger.error("Unable To Load Mines For Teleport: " + e.getMessage());
-            }
-        }else {
             cities = City.getCitiesToRepledgeTo(player);
-            mines = new ArrayList<>();
-        }
     }
 
     /**
@@ -108,14 +96,10 @@ public class TeleportRepledgeListMsg extends ClientNetMsg {
         for (int i = 0; i < 3; i++)
             writer.putInt(0);
 
-        writer.putInt(cities.size() + mines.size());
+        writer.putInt(cities.size());
 
         for (City city : cities)
             City.serializeForClientMsg(city, writer);
-
-        for(Mine mine : mines)
-            Mine.serializeForClientMsgTeleport(mine, writer);
-
     }
 
     public PlayerCharacter getPlayer() {

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

@@ -114,36 +114,26 @@ public class VendorDialogMsg extends ClientNetMsg {
 
         VendorDialog vd = null;
         Contract contract = npc.getContract();
-        if(npc.contractUUID == 1502043){
-            vd = Contract.HandleArenaMaster(msg.unknown03,npc,playerCharacter);
-            msg.updateMessage(3, vd);
-        }else if(npc.contractUUID == 1502040){ //enrollment officer
-            //PlayerCharacter.unboxPlayer(playerCharacter);
-            vd = Contract.HandleEnrollmentOfficer(msg.unknown03,npc,playerCharacter);
-            msg.updateMessage(3, vd);
-        }else if(contract.getContractID() == 1502042){
-           vd = Contract.HandleBaneCommanderOptions(msg.unknown03, npc, playerCharacter);
-           msg.updateMessage(3, vd);
-        }else {
 
-            if (contract == null)
+        if (contract == null)
+            vd = VendorDialog.getHostileVendorDialog();
+        else if (npc.getBuilding() != null) {
+            if (BuildingManager.IsPlayerHostile(npc.getBuilding(), playerCharacter))
                 vd = VendorDialog.getHostileVendorDialog();
-            else if (npc.getBuilding() != null) {
+            else
-                if (npc.getBuilding() != null && BuildingManager.IsPlayerHostile(npc.getBuilding(), playerCharacter))
-                    vd = VendorDialog.getHostileVendorDialog();
-                else
-                    vd = contract.getVendorDialog();
-            } else
                 vd = contract.getVendorDialog();
-            if (vd == null)
+        } else
-                vd = VendorDialog.getHostileVendorDialog();
+            vd = contract.getVendorDialog();
+        if (vd == null)
+            vd = VendorDialog.getHostileVendorDialog();
+
         if (msg.messageType == 1 || msg.unknown03 == vd.getObjectUUID()) {
             msg.updateMessage(3, vd);
         } else {
             if (VendorDialogMsg.handleSpecialCase(msg, npc, playerCharacter, vd, origin))
                 return;
-        }
+
-            //vd = VendorDialog.getVendorDialog(msg.unknown03);
+            vd = VendorDialog.getVendorDialog(msg.unknown03);
             msg.updateMessage(3, vd);
         }
 
@@ -558,59 +548,26 @@ public class VendorDialogMsg extends ClientNetMsg {
 
         // verify race valid for profession
         Race race = pc.getRace();
-        if(race.getRaceRuneID() == 1999) {
+        if (race == null || !promo.isAllowedRune(race.getToken())) {
-            boolean valid = false;
-        switch(promoID){
-            case 2504:
-            case 2505:
-            case 2506:
-            case 2507:
-            case 2510:
-            case 2511:
-            case 2512:
-            case 2514:
-            case 2515:
-            case 2517:
-            case 2518:
-            case 2519:
-            case 2520:
-            case 2521:
-            case 2523:
-                valid = true;
-                break;
-        }
-
-        if(!valid)
-            return;
-
-        }
-        else {
-
-            if (race == null || !promo.isAllowedRune(race.getToken())) {
-                // TODO send client promotion error
-                return;
-            }
-        }
-        // verify baseclass valid for profession
-        BaseClass bc = pc.getBaseClass();
-        if (bc == null) {
             // TODO send client promotion error
             return;
         }
-        if(!promo.isAllowedRune(bc.getToken())){
+
-            if(!bc.getName().equals("Rogue") && !promo.getName().equals("Druid"))
+        // verify baseclass valid for profession
-                return;
+        BaseClass bc = pc.getBaseClass();
+        if (bc == null || !promo.isAllowedRune(bc.getToken())) {
+            // TODO send client promotion error
+            return;
         }
 
-        if(race.getRaceRuneID() != 1999) {
+        // verify gender
-            // verify gender
+        if (promoID == 2511 && pc.isMale()) // Fury
-            if (promoID == 2511 && pc.isMale()) // Fury
+            return;
-                return;
+        if (promoID == 2512 && pc.isMale()) // Huntress
-            if (promoID == 2512 && pc.isMale()) // Huntress
+            return;
-                return;
+        if (promoID == 2517 && !pc.isMale()) // Warlock
-            if (promoID == 2517 && !pc.isMale()) // Warlock
+            return;
-                return;
+
-        }
         // Everything valid. Let's promote
         pc.setPromotionClass(promo.getObjectUUID());
 

src/engine/objects/AbstractCharacter.java

@@ -14,10 +14,7 @@ import engine.Enum.*;
 import engine.InterestManagement.InterestManager;
 import engine.InterestManagement.WorldGrid;
 import engine.exception.SerializationException;
-import engine.gameManager.CombatManager;
+import engine.gameManager.*;
-import engine.gameManager.ConfigManager;
-import engine.gameManager.MovementManager;
-import engine.gameManager.PowersManager;
 import engine.job.AbstractJob;
 import engine.job.JobContainer;
 import engine.job.JobScheduler;
@@ -39,6 +36,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -52,8 +50,8 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     public int contractUUID;
     public Contract contract;
 
-    protected String firstName;
+    public String firstName;
-    protected String lastName;
+    public String lastName;
     protected short statStrCurrent;
     protected short statDexCurrent;
     protected short statConCurrent;
@@ -71,7 +69,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     public Guild guild;
     protected byte runningTrains;
     protected ConcurrentHashMap<Integer, CharacterPower> powers;
-    protected ConcurrentHashMap<String, CharacterSkill> skills;
+    public ConcurrentHashMap<String, CharacterSkill> skills;
     // Variables NOT to be stored in db
     protected boolean sit = false;
     protected boolean walkMode;
@@ -88,19 +86,19 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     protected AtomicFloat mana = new AtomicFloat();
     protected float manaMax;                                            // Health/Mana/Stamina
     protected AtomicBoolean isAlive = new AtomicBoolean(true);
-    protected Resists resists = new Resists("Genric");
+    public Resists resists = new Resists("Genric");
     protected ConcurrentHashMap<String, JobContainer> timers;
     protected ConcurrentHashMap<String, Long> timestamps;
     public int atrHandOne;
-    protected int atrHandTwo;
+    public int atrHandTwo;
     public int minDamageHandOne;
     public int maxDamageHandOne;
-    protected int minDamageHandTwo;
+    public int minDamageHandTwo;
-    protected int maxDamageHandTwo;
+    public int maxDamageHandTwo;
-    protected float rangeHandOne;
+    public float rangeHandOne;
-    protected float rangeHandTwo;
+    public float rangeHandTwo;
-    protected float speedHandOne;
+    public float speedHandOne;
-    protected float speedHandTwo;
+    public float speedHandTwo;
     public int defenseRating;
     protected boolean isActive; // <-Do not use this for deleting character!
     protected float altitude = 0; // 0=on terrain, 1=tier 1, 2=tier 2, etc.
@@ -117,16 +115,35 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     protected boolean movingUp = false;
     private float desiredAltitude = 0;
     private long takeOffTime = 0;
-    private float hateValue = 0;
     private long lastHateUpdate = 0;
-    private boolean collided = false;
     private byte aoecntr = 0;
 
+    public int hidden = 0; // current rank of hide/sneak/invis
+    public CopyOnWriteArrayList<Integer> minions = new CopyOnWriteArrayList();
+
     public AbstractCharacter() {
         super();
+        this.firstName = "";
+        this.lastName = "";
 
-        this.powers = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
+        this.statStrCurrent = (short) 0;
-        this.skills = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
+        this.statDexCurrent = (short) 0;
+        this.statConCurrent = (short) 0;
+        this.statIntCurrent = (short) 0;
+        this.statSpiCurrent = (short) 0;
+
+        this.unusedStatPoints = (short) 0;
+
+        this.level = (short) 0; // TODO get this from MobsBase later
+        this.exp = 1;
+        this.walkMode = true;
+        this.bindLoc = Vector3fImmutable.ZERO;
+        this.faceDir = Vector3fImmutable.ZERO;
+
+        this.runningTrains = (byte) 0;
+
+        this.skills = new ConcurrentHashMap<>();
+        this.powers = new ConcurrentHashMap<>();
         this.initializeCharacter();
 
     }
@@ -214,8 +231,6 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         this.skills = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
         this.initializeCharacter();
 
-        // Dangerous to use THIS in a constructor!!!
-        this.charItemManager = new CharacterItemManager(this);
     }
 
     /**
@@ -258,8 +273,6 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         this.powers = new ConcurrentHashMap<>();
         this.initializeCharacter();
 
-        // Dangerous to use THIS in a constructor!!!
-        this.charItemManager = new CharacterItemManager(this);
     }
 
     /**
@@ -291,8 +304,6 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         this.powers = new ConcurrentHashMap<>();
         initializeCharacter();
 
-        // Dangerous to use THIS in a constructor!!!
-        this.charItemManager = new CharacterItemManager(this);
     }
 
     /**
@@ -342,9 +353,6 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         this.powers = new ConcurrentHashMap<>();
 
         this.initializeCharacter();
-
-        // Dangerous to use THIS in a constructor!!!
-        this.charItemManager = new CharacterItemManager(this);
     }
 
     public static int getBankCapacity() {
@@ -496,13 +504,8 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         boolean canFly = false;
         PlayerBonuses bonus = flyer.getBonuses();
 
-        if (bonus != null && !bonus.getBool(ModType.NoMod, SourceType.Fly) && bonus.getBool(ModType.Fly, SourceType.None) && flyer.isAlive()) {
+        if (bonus != null && !bonus.getBool(ModType.NoMod, SourceType.Fly) && bonus.getBool(ModType.Fly, SourceType.None) && flyer.isAlive())
             canFly = true;
-        }
-        if(flyer.effects.containsKey("MoveBuff")){
-            canFly = false;
-        }
-
 
         return canFly;
 
@@ -1101,6 +1104,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     }
 
     public final void setCombatTarget(final AbstractWorldObject value) {
+
         if(this.getObjectTypeMask() == 2050) {//MOB?
             if (value == null) {
                 if (this.isCombat()) {
@@ -1118,7 +1122,9 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
                 }
             }
         }
+
         this.combatTarget = value;
+
     }
 
     public final ConcurrentHashMap<String, JobContainer> getTimers() {
@@ -1192,15 +1198,10 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         }
     }
 
-    public final float modifyHealth(float value, final AbstractCharacter attacker, final boolean fromCost) {
+    public final float modifyHealth(
-
+            final float value,
-        if(attacker != null && attacker.getObjectType().equals(GameObjectType.PlayerCharacter)){
+            final AbstractCharacter attacker,
-            value *= ((PlayerCharacter)attacker).ZergMultiplier;
+            final boolean fromCost) {
-        } // 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
 
         try {
 
@@ -1240,11 +1241,29 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
                     CombatManager.handleRetaliate(this, attacker);
                 }
 
+                if(this.getObjectType().equals(GameObjectType.Mob)){
+                    //handle hate value addition
+                    Mob target = (Mob)this;
+                    if (attacker.getObjectType().equals(GameObjectType.PlayerCharacter)) {
+                        target.playerAgroMap.put(attacker.getObjectUUID(), target.playerAgroMap.get(attacker.getObjectUUID()) + value);
+                        if (target.isPlayerGuard()){
+                            if(target.guardedCity != null && target.guardedCity.cityOutlaws.contains(attacker.getObjectUUID()) == false)
+                                target.guardedCity.cityOutlaws.add(attacker.getObjectUUID());
+                        }
+                    }
+                } else if(this.getObjectType().equals(GameObjectType.PlayerCharacter)){
+                    City playerCity = ZoneManager.getCityAtLocation(this.loc);
+                    if(playerCity != null){
+                        if(!attacker.getGuild().getNation().equals(playerCity.getGuild().getNation()))
+                            if(!playerCity.getGuild().getNation().getAllyList().contains(attacker.getGuild().getNation()))
+                                if(!playerCity.cityOutlaws.contains(attacker.getObjectUUID()))
+                                    playerCity.cityOutlaws.add(attacker.getObjectUUID());
+                    }
+                }
                 return newHealth - oldHealth;
             } finally {
                 this.healthLock.writeLock().unlock();
             }
-
         } catch (InterruptedException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
@@ -1264,19 +1283,11 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     }
 
     public final float modifyMana(
-            float value,
+            final 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.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;
         }
@@ -1311,19 +1322,11 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     }
 
     public final float modifyStamina(
-            float value,
+            final 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.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;
         }
@@ -1784,29 +1787,6 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
         this.inBuildingID = inBuildingID;
     }
 
-    public float getHateValue() {
-        if (this.hateValue <= 0) {
-            this.hateValue = 0;
-            return hateValue;
-        }
-
-        if (this.lastHateUpdate == 0) {
-            this.lastHateUpdate = System.currentTimeMillis();
-            return this.hateValue;
-        }
-        long duration = System.currentTimeMillis() - this.lastHateUpdate;
-        //convert duration to seconds and multiply Hate Delimiter.
-        float modAmount = duration / 1000 * MBServerStatics.PLAYER_HATE_DELIMITER;
-        this.hateValue -= modAmount;
-        this.lastHateUpdate = System.currentTimeMillis();
-        return this.hateValue;
-    }
-
-    public void setHateValue(float hateValue) {
-        this.lastHateUpdate = System.currentTimeMillis();
-        this.hateValue = hateValue;
-    }
-
     public int getInFloorID() {
         return inFloorID;
     }
@@ -1840,7 +1820,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     }
 
     //updates
-    public void update(Boolean newSystem) {
+    public void update() {
     }
 
     public void updateRegen() {
@@ -1860,16 +1840,16 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
             try {
                 switch (updateType) {
                     case ALL:
-                        update(false);
+                        update();
                         break;
                     case REGEN:
                         updateRegen();
                         break;
                     case LOCATION:
-                        update(false);
+                        update();
                         break;
                     case MOVEMENTSTATE:
-                        update(false);
+                        update();
                         break;
                     case FLIGHT:
                         updateFlight();

src/engine/objects/AbstractIntelligenceAgent.java

@@ -9,6 +9,7 @@
 
 package engine.objects;
 
+import ch.claude_martin.enumbitset.EnumBitSet;
 import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.Enum.ModType;
@@ -32,6 +33,19 @@ public abstract class AbstractIntelligenceAgent extends AbstractCharacter {
     public boolean assist = false;
     public Enum.AIAgentType agentType = Enum.AIAgentType.MOBILE;
 
+    public AbstractCharacter guardCaptain;
+    public EnumBitSet<Enum.MonsterType> notEnemy = EnumBitSet.noneOf(Enum.MonsterType.class);
+    public EnumBitSet<Enum.MonsterType> enemy = EnumBitSet.noneOf(Enum.MonsterType.class);
+    ;
+    public Enum.MobBehaviourType behaviourType;
+    public ArrayList<Vector3fImmutable> patrolPoints;
+    public int lastPatrolPointIndex = 0;
+    public long stopPatrolTime = 0;
+    public City guardedCity;
+
+    public AbstractIntelligenceAgent() {
+        super();
+    }
 
     public AbstractIntelligenceAgent(ResultSet rs) throws SQLException {
         super(rs);
@@ -87,7 +101,8 @@ public abstract class AbstractIntelligenceAgent extends AbstractCharacter {
             this.agentType = Enum.AIAgentType.CHARMED;
 
         if (this.getObjectType().equals(GameObjectType.Mob)) {
-            ((Mob) this).setOwner(owner);
+
+            ((Mob) this).guardCaptain = owner;
         }
     }
 
@@ -110,14 +125,6 @@ public abstract class AbstractIntelligenceAgent extends AbstractCharacter {
         return 0;
     }
 
-    public PlayerCharacter getOwner() {
-
-        if (this.getObjectType().equals(GameObjectType.Mob))
-            return this.getOwner();
-
-        return null;
-    }
-
     public boolean getSafeZone() {
 
         ArrayList<Zone> allIn = ZoneManager.getAllZonesIn(this.getLoc());
@@ -156,9 +163,11 @@ public abstract class AbstractIntelligenceAgent extends AbstractCharacter {
                 this.setCombatTarget(null);
             }
 
-            //clear owner
+            // clear owner and set not alive
 
-            PlayerCharacter owner = this.getOwner();
+            this.isAlive.set(false);
+
+            PlayerCharacter owner = (PlayerCharacter) this.guardCaptain;
 
             //close pet window
 
@@ -174,7 +183,7 @@ public abstract class AbstractIntelligenceAgent extends AbstractCharacter {
                     owner.setPet(null);
 
                 if (this.getObjectType().equals(GameObjectType.Mob))
-                    ((Mob) this).setOwner(null);
+                    this.guardCaptain = null;
             }
 
 

src/engine/objects/AbstractWorldObject.java

@@ -270,7 +270,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
             this.effects.remove(name);
             if (this.getObjectType().equals(GameObjectType.PlayerCharacter))
                 if (name.equals("Flight")) {
-                    ((PlayerCharacter) this).update(false);
+                    ((PlayerCharacter) this).update();
                     PlayerCharacter.GroundPlayer((PlayerCharacter) this);
                 }
         }
@@ -357,7 +357,9 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
             Mob mob = (Mob) this;
             if (mob.isSiege()) {
                 if (mob.isPet()) {
-                    PlayerCharacter petOwner = mob.getOwner();
+
+
+                    PlayerCharacter petOwner = (PlayerCharacter) mob.guardCaptain;
                     if (petOwner != null && source.equals(EffectSourceType.Effect)) {
                         petOwner.dismissPet();
                         return;
@@ -385,7 +387,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
                     if (source.equals("Flight")) {
                         //ground player
                         if (this.getObjectType().equals(GameObjectType.PlayerCharacter)) {
-                            ((PlayerCharacter) this).update(false);
+                            ((PlayerCharacter) this).update();
                             PlayerCharacter.GroundPlayer((PlayerCharacter) this);
                         }
                     }
@@ -414,7 +416,7 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
                 if (source.equals("Flight")) {
                     //ground player
                     if (this.getObjectType().equals(GameObjectType.PlayerCharacter)) {
-                        ((PlayerCharacter) this).update(false);
+                        ((PlayerCharacter) this).update();
                         PlayerCharacter.GroundPlayer((PlayerCharacter) this);
                     }
                 }

src/engine/objects/Arena.java

@@ -1,82 +0,0 @@
-package engine.objects;
-
-import engine.InterestManagement.WorldGrid;
-import engine.gameManager.ArenaManager;
-import engine.gameManager.ChatManager;
-import engine.gameManager.MovementManager;
-import engine.math.Vector3fImmutable;
-import engine.server.MBServerStatics;
-
-import java.util.HashSet;
-
-public class Arena {
-    public PlayerCharacter player1;
-    public PlayerCharacter player2;
-    public Long startTime;
-    public Vector3fImmutable loc;
-
-    public Arena(){
-
-    }
-    public Boolean disqualify() {
-        HashSet<AbstractWorldObject> inRange = WorldGrid.getObjectsInRangePartial(this.loc, 250f, MBServerStatics.MASK_PLAYER);
-        HashSet<AbstractWorldObject> warningRange = WorldGrid.getObjectsInRangePartial(this.loc, 500f, MBServerStatics.MASK_PLAYER);
-        for(AbstractWorldObject obj : warningRange){
-            PlayerCharacter pc = (PlayerCharacter)obj;
-            if(pc.equals(this.player1) || pc.equals(this.player2))
-                continue;
-
-            ChatManager.chatSystemInfo(pc, "WARNING!! You are entering an arena zone!");
-        }
-        //boot out all non competitors
-        for(AbstractWorldObject obj : inRange){
-            if(obj.equals(this.player1))
-                continue;
-
-            if(obj.equals(this.player2))
-                continue;
-
-            PlayerCharacter intruder = (PlayerCharacter)obj;
-            MovementManager.translocate(intruder,new Vector3fImmutable(88853,32,45079),Regions.GetRegionForTeleport(new Vector3fImmutable(88853,32,45079)));
-        }
-
-        if (!inRange.contains(this.player1) && inRange.contains(this.player2)) {
-            ArenaManager.endArena(this,this.player2,this.player1,"Player Has Left Arena");
-            return true;
-        } else if (!inRange.contains(this.player2) && inRange.contains(this.player1)) {
-            ArenaManager.endArena(this,this.player1,this.player2,"Player Has Left Arena");
-            return true;
-        }else if (!inRange.contains(this.player2) && !inRange.contains(this.player1)) {
-            ArenaManager.endArena(this,null,null,"Both Parties Have Left The Arena");
-            return true;
-        }
-        return false;
-    }
-
-    public Boolean checkToComplete(){
-
-        if(this.startTime == null)
-            this.startTime = System.currentTimeMillis();
-
-        if(System.currentTimeMillis() - this.startTime < 10000L)
-            return false;
-
-        if(this.disqualify())
-            return true;
-
-        if(!this.player1.isAlive() && this.player2.isAlive()){
-            ArenaManager.endArena(this,this.player2,this.player1,"Player Has Died");
-            return true;
-        } else if(this.player1.isAlive() && !this.player2.isAlive()){
-            ArenaManager.endArena(this,this.player1,this.player2,"Player Has Died");
-            return true;
-        } else if(!this.player1.isAlive() && !this.player2.isAlive()){
-            ArenaManager.endArena(this,null,null,"Both Players Have Died");
-            return true;
-        } else if(this.startTime + 300000L < System.currentTimeMillis()){
-            ArenaManager.endArena(this,null,null,"Time Has Elapsed");
-            return true;
-        }
-        return false;
-    }
-}

src/engine/objects/Bane.java

@@ -14,19 +14,19 @@ import engine.Enum.ProtectionState;
 import engine.Enum.SiegePhase;
 import engine.Enum.SiegeResult;
 import engine.InterestManagement.HeightMap;
-import engine.InterestManagement.InterestManager;
 import engine.InterestManagement.WorldGrid;
 import engine.db.archive.BaneRecord;
 import engine.db.archive.DataWarehouse;
-import engine.gameManager.*;
+import engine.gameManager.BuildingManager;
+import engine.gameManager.ChatManager;
+import engine.gameManager.DbManager;
+import engine.gameManager.ZoneManager;
 import engine.job.JobScheduler;
 import engine.jobs.ActivateBaneJob;
 import engine.jobs.BaneDefaultTimeJob;
 import engine.math.Vector3fImmutable;
-import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
-import engine.net.client.msg.CityDataMsg;
 import engine.net.client.msg.PlaceAssetMsg;
 import engine.net.client.msg.chat.ChatSystemMsg;
 import engine.server.MBServerStatics;
@@ -37,7 +37,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashSet;
 import java.util.concurrent.ConcurrentHashMap;
 
 public final class Bane {
@@ -49,10 +48,6 @@ public final class Bane {
     private DateTime placementDate = null;
     private DateTime liveDate = null;
     private BaneDefaultTimeJob defaultTimeJob;
-    public boolean timeSet = false;
-    public boolean daySet = false;
-    public boolean capSet = false;
-    public int capSize = 10;
 
     // Internal cache for banes
     private ActivateBaneJob activateBaneJob;
@@ -69,12 +64,6 @@ public final class Bane {
         this.ownerUUID = rs.getInt("ownerUUID");
         this.stoneUUID = rs.getInt("stoneUUID");
 
-        this.timeSet = rs.getInt("time_set") == 1;
-        this.daySet = rs.getInt("day_set") == 1;
-        this.capSet = rs.getInt("cap_set") == 1;
-        this.capSize = rs.getInt("cap_size");
-
-
         sqlDateTime = rs.getTimestamp("placementDate");
 
         if (sqlDateTime != null)
@@ -111,11 +100,12 @@ public final class Bane {
                 abtj = new ActivateBaneJob(cityUUID);
                 JobScheduler.getInstance().scheduleJob(abtj, this.liveDate.getMillis());
                 this.activateBaneJob = abtj;
+
                 break;
         }
 
-        //add bane commander NPC
+        if (this.liveDate == null)
-        //summonBaneCommander(this);
+            setDefaultTime();
     }
 
     public static boolean summonBanestone(PlayerCharacter player, ClientConnection origin, int rank) {
@@ -276,58 +266,9 @@ public final class Bane {
         BaneRecord baneRecord = BaneRecord.borrow(bane, Enum.RecordEventType.PENDING);
         DataWarehouse.pushToWarehouse(baneRecord);
 
-        //add bane commander NPC
-        summonBaneCommander(bane);
-
-        try {
-            //update map for all players online
-            for (PlayerCharacter playerCharacter : SessionManager.getAllActivePlayerCharacters()) {
-                CityDataMsg cityDataMsg = new CityDataMsg(SessionManager.getSession(playerCharacter), false);
-                cityDataMsg.updateMines(true);
-                cityDataMsg.updateCities(true);
-                Dispatch dispatch = Dispatch.borrow(playerCharacter, cityDataMsg);
-                DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
-            }
-        }catch(Exception e){
-
-        }
-
         return true;
     }
 
-    public static void summonBaneCommander(Bane bane){
-        Vector3fImmutable spawnLoc = Vector3fImmutable.getRandomPointOnCircle(bane.getStone().loc,6);
-        NPC baneCommander;
-        int commanderuuid = DbManager.NPCQueries.BANE_COMMANDER_EXISTS(bane.getStone().getObjectUUID());
-
-        if(commanderuuid == 0) {
-            //add bane commander NPC
-            int contractID = 1502042;
-            baneCommander = NPC.createNPC("Bane Commander", contractID, spawnLoc, bane.getCity().getGuild(), ZoneManager.findSmallestZone(bane.getStone().loc), (short) 70, bane.getStone());
-            try {
-                NPCManager.slotCharacterInBuilding(baneCommander);
-            }catch(Exception e){
-
-            }
-            WorldGrid.addObject(baneCommander,spawnLoc.x,spawnLoc.z);
-            WorldGrid.updateObject(baneCommander);
-        }
-        else
-        {
-            baneCommander = NPC.getNPC(commanderuuid);
-        }
-        //try {
-        //    NPCManager.slotCharacterInBuilding(baneCommander);
-        //}catch (Exception e){
-            //swallow it
-        //}
-        baneCommander.runAfterLoad();
-        //baneCommander.setLoc(spawnLoc);
-        InterestManager.setObjectDirty(baneCommander);
-
-        baneCommander.updateLocation();
-    }
-
     public static Bane getBane(int cityUUID) {
 
         Bane outBane;
@@ -440,12 +381,8 @@ public final class Bane {
         defaultTime = defaultTime.minuteOfHour().setCopy(0);
         defaultTime = defaultTime.secondOfMinute().setCopy(0);
 
-        if (currentTime.isAfter(timeToSetDefault)){
+        if (currentTime.isAfter(timeToSetDefault))
-            DbManager.BaneQueries.SET_BANE_CAP_NEW(20,this.getCityUUID());
+            this.setLiveDate(defaultTime);
-            DbManager.BaneQueries.SET_BANE_TIME_NEW(9,this.getCityUUID());
-            DbManager.BaneQueries.SET_BANE_DAY_NEW(3,this.getCityUUID());
-        }
-            //this.setLiveDate(defaultTime);
         else {
 
             if (this.defaultTimeJob != null)
@@ -511,16 +448,6 @@ public final class Bane {
             return false;
         }
 
-        //Remove bane commander NPC
-        if(!baneStone.getHirelings().isEmpty()) {
-            NPC npc = (NPC)baneStone.getHirelings().keySet().stream().findFirst().orElse(null);
-            if(npc != null) {
-                DbManager.NPCQueries.DELETE_NPC(npc);
-                DbManager.removeFromCache(npc);
-                WorldGrid.RemoveWorldObject(npc);
-                WorldGrid.removeObject(npc);
-            }
-        }
         // Remove object from simulation
 
         baneStone.removeFromCache();
@@ -542,9 +469,6 @@ public final class Bane {
         return liveDate;
     }
 
-    public void setLiveDate_NEW(DateTime baneTime) {
-
-    }
     public void setLiveDate(DateTime baneTime) {
 
         if (DbManager.BaneQueries.SET_BANE_TIME(baneTime, this.getCity().getObjectUUID())) {
@@ -720,63 +644,4 @@ public final class Bane {
         return cityUUID;
     }
 
-    public void applyZergBuffs(){
-        City city = this.getCity();
-        if(city == null)
-            return;
-
-        city.onEnter();
-
-        ArrayList<Integer> attackers = new ArrayList<>();
-        ArrayList<Integer> defenders = new ArrayList<>();
-        Guild attackNation = this.getOwner().getGuild().getNation();
-        Guild defendNation = this.getCity().getGuild().getNation();
-        HashSet<AbstractWorldObject> inSiegeRange = WorldGrid.getObjectsInRangePartial(city.getTOL().loc,1750f,1);
-        for(AbstractWorldObject obj : inSiegeRange){
-            int uuid = obj.getObjectUUID();
-            PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
-            if(player == null)
-                continue;
-            Guild playerNation = player.guild.getNation();
-            //separate the players into categories
-            if(playerNation.equals(defendNation))
-                defenders.add(uuid);
-            else if(playerNation.equals(attackNation))
-                attackers.add(uuid);
-            else
-                MovementManager.translocate(player,Vector3fImmutable.getRandomPointOnCircle(ZoneManager.getZoneByUUID(656).getLoc(),30f),Regions.GetRegionForTeleport(ZoneManager.getZoneByUUID(656).getLoc()));
-        }
-        int attackerSize = 0;
-        int defenderSize = 0;
-        for(int uuid : city.baneAttendees.keySet()){
-            PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
-            if(player == null)
-                continue;
-            if(player.guild.getNation().equals(defendNation))
-                defenderSize += 1;
-            else if(player.guild.getNation().equals(attackNation))
-                attackerSize += 1;
-        }
-
-        //apply zerg mechanic for attackers
-        float attackerMultiplier = ZergManager.getCurrentMultiplier(attackerSize,this.capSize);
-        float defenderMultiplier = ZergManager.getCurrentMultiplier(defenderSize,this.capSize);
-        for(int uuid : attackers){
-            PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
-            if(inSiegeRange.contains(player)) //player is still physically here, needs updated multiplier
-                player.ZergMultiplier = attackerMultiplier;
-            else
-                player.ZergMultiplier = 1.0f;
-        }
-
-        for(int uuid : defenders){
-            PlayerCharacter player = PlayerCharacter.getPlayerCharacter(uuid);
-            if(inSiegeRange.contains(player)) //player is still physically here, needs updated multiplier
-                player.ZergMultiplier = defenderMultiplier;
-            else
-                player.ZergMultiplier = 1.0f;
-        }
-
-    }
-
 }

src/engine/objects/Blueprint.java

@@ -17,7 +17,6 @@ import org.pmw.tinylog.Logger;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.HashMap;
-import java.util.Objects;
 
 /*  @Summary - Blueprint class is used for determining
  characteristics of instanced player owned
@@ -61,12 +60,13 @@ public class Blueprint {
         this.name = rs.getString("MeshName");
         this.icon = rs.getInt("Icon");
         this.buildingGroup = BuildingGroup.valueOf(rs.getString("BuildingGroup"));
+        this.maxRank = rs.getInt("MaxRank");
         this.maxSlots = rs.getInt("MaxSlots");
         this.rank1UUID = rs.getInt("Rank1UUID");
         this.rank3UUID = rs.getInt("Rank3UUID");
         this.rank7UUID = rs.getInt("Rank7UUID");
         this.destroyedUUID = rs.getInt("DestroyedUUID");
-this.maxRank = rs.getInt("MaxRank");
+
     }
 
     // Accessors
@@ -108,10 +108,8 @@ this.maxRank = rs.getInt("MaxRank");
                 maxShrines = 2;
                 break;
             case 7:
-                maxShrines = 3;
-                break;
             case 8:
-                maxShrines = 4;
+                maxShrines = 3;
                 break;
             default:
                 maxShrines = 0;
@@ -169,48 +167,20 @@ this.maxRank = rs.getInt("MaxRank");
     // based upon the building's current rank
 
     public static int getNpcMaintCost(int rank) {
-        return 0;
+        int maintCost = Integer.MAX_VALUE;
+
+        maintCost = (9730 * rank) + 1890;
+
+        return maintCost;
     }
 
     public int getMaxRank() {
-        BuildingGroup bg = this.buildingGroup;
-        switch(bg){
-            case AMAZONHALL:
-            case CATHEDRAL:
-            case GREATHALL:
-            case KEEP:
-            case THIEFHALL:
-            case TEMPLEHALL:
-            case WIZARDHALL:
-            case ELVENHALL:
-            case ELVENSANCTUM:
-            case IREKEIHALL:
-            case FORESTHALL:
-                return 1;
-        }
         return maxRank;
     }
 
     public int getMaxSlots() {
         if (this.buildingGroup != null && this.buildingGroup.equals(BuildingGroup.BARRACK))
             return 1;
-        if (this.buildingGroup != null && this.buildingGroup.equals(BuildingGroup.TOL))
-            return 4;
-        BuildingGroup bg = this.buildingGroup;
-        switch(bg){
-            case AMAZONHALL:
-            case CATHEDRAL:
-            case GREATHALL:
-            case KEEP:
-            case THIEFHALL:
-            case TEMPLEHALL:
-            case WIZARDHALL:
-            case ELVENHALL:
-            case ELVENSANCTUM:
-            case IREKEIHALL:
-            case FORESTHALL:
-                return 3;
-        }
         return maxSlots;
     }
 
@@ -342,23 +312,9 @@ this.maxRank = rs.getInt("MaxRank");
             return 0;
 
         // Early exit for buildings with single or no slots
-        if (this.maxSlots <= 1 && !this.buildingGroup.equals(BuildingGroup.TOL))
-            return maxSlots;
 
-        BuildingGroup bg = this.buildingGroup;
+        if (this.maxSlots <= 1)
-        switch(bg.name()) {
+            return maxSlots;
-            case "AMAZONHALL":
-            case "CATHEDRAL":
-            case "GREATHALL":
-            case "THIEFHALL":
-            case "TEMPLEHALL":
-            case "WIZARDHALL":
-            case "ELVENHALL":
-            case "ELVENSANCTUM":
-            case "IREKEIHALL":
-            case "FORESTHALL":
-                return 3;
-        }
 
         if (this.maxRank == 1 && currentRank == 1)
             return getMaxSlots();
@@ -371,22 +327,20 @@ this.maxRank = rs.getInt("MaxRank");
                 break;
             case 3:
             case 4:
-                availableSlots = 2;
-                break;
             case 5:
             case 6:
+                availableSlots = 2;
+                break;
             case 7:
                 availableSlots = 3;
                 break;
             case 8:
-                availableSlots = 4;
+                availableSlots = 1;
                 break;
             default:
                 availableSlots = 0;
                 break;
         }
-        if(this.buildingGroup != null && this.buildingGroup.equals(BuildingGroup.TOL))
-            availableSlots += 1;
 
         return availableSlots;
     }
@@ -649,14 +603,26 @@ this.maxRank = rs.getInt("MaxRank");
         return this.blueprintUUID;
     }
 
-    public int getMaintCost() {
+    public int getMaintCost(int rank) {
 
         int maintCost = Integer.MAX_VALUE;
 
-        if(this.buildingGroup.equals(BuildingGroup.TOL)){
+        switch (this.buildingGroup) {
-            return 3000000;
+            case TOL:
-        }else{
+            case BARRACK:
-            return 0;
+                maintCost = (61500 * rank) + 19500;
+                break;
+            case SPIRE:
+                maintCost = (4800 * rank) + 1200;
+                break;
+            default:
+                if (maxRank == 1)
+                    maintCost = 22500;
+                else
+                    maintCost = (15900 * rank) + 3300;
+                break;
         }
+
+        return maintCost;
     }
 }

src/engine/objects/Building.java

@@ -182,22 +182,6 @@ public class Building extends AbstractWorldObject {
                 this.setHealth(healthMax);
             }
 
-            if(!this.ownerIsNPC){
-                //add extra HP for city walls of R8 trees
-                City city = ZoneManager.getCityAtLocation(this.loc);
-                if(city != null){
-                    Building ToL = city.getTOL();
-                    if(ToL != null){
-                        if(ToL.rank == 8){
-                            float currentHealth = this.health.get();
-                            float newHealth = (currentHealth/this.healthMax) * (this.healthMax * 1.1f);
-                            this.healthMax *= 1.1f;
-                            this.setHealth(newHealth);
-                        }
-                    }
-                }
-            }
-
             // Null out blueprint if not needed (npc building)
 
             if (blueprintUUID == 0)
@@ -553,6 +537,18 @@ public class Building extends AbstractWorldObject {
         if (value < 0)
             Mine.SendMineAttackMessage(this);
 
+        City playerCity = ZoneManager.getCityAtLocation(this.loc);
+        if(playerCity != null){
+            if(this.getGuild().getNation().equals(playerCity.getTOL().getGuild().getNation())){
+                //friendly building has been attacked, add attacker to city outlaw list
+                if(!playerCity.cityOutlaws.contains(attacker.getObjectUUID()) && attacker.getObjectType().equals(GameObjectType.PlayerCharacter))
+                    playerCity.cityOutlaws.add(attacker.getObjectUUID());
+                    for(Mob guard : playerCity.getParent().zoneMobSet)
+                        if(guard.combatTarget == null)
+                            guard.setCombatTarget(attacker);
+            }
+        }
+
         return newHealth - oldHealth;
 
 
@@ -796,9 +792,24 @@ public class Building extends AbstractWorldObject {
 
     public int getMaintCost() {
 
-        if(this.getBlueprint() != null && this.getBlueprint().getBuildingGroup().equals(BuildingGroup.TOL))
+        int maintCost = 0;
-            return 3000000;
+
-        else return 0;
+        // Add cost for building structure
+
+        maintCost += this.getBlueprint().getMaintCost(rank);
+
+        // Add costs associated with hirelings
+
+        for (AbstractCharacter npc : this.hirelings.keySet()) {
+
+            if (npc.getObjectType() != GameObjectType.NPC)
+                continue;
+
+
+            maintCost += Blueprint.getNpcMaintCost(npc.getRank());
+        }
+
+        return maintCost;
     }
 
     public final void submitOpenDoorJob(int doorID) {
@@ -837,10 +848,6 @@ public class Building extends AbstractWorldObject {
         return this.meshScale;
     }
 
-    public void setMeshScale(Vector3f scale) {
-        this.meshScale = scale;
-    }
-
     public final int getMeshUUID() {
         return this.meshUUID;
     }

src/engine/objects/CharacterItemManager.java

@@ -610,8 +610,6 @@ public class CharacterItemManager {
         if (i == null)
             return false;
 
-        i.stripCastableEnchants();
-
         if (!this.doesCharOwnThisItem(i.getObjectUUID()))
             return false;
 
@@ -1056,7 +1054,6 @@ public class CharacterItemManager {
         // add to Bank
         this.bank.add(i);
         i.addToCache();
-        i.stripCastableEnchants();
 
         calculateWeights();
 
@@ -1205,7 +1202,6 @@ public class CharacterItemManager {
 
         calculateWeights();
 
-        i.stripCastableEnchants();
         return true;
     }
 
@@ -2013,7 +2009,6 @@ public class CharacterItemManager {
                     if (item.getItemBase().getType().equals(ItemType.GOLD)) {
                         int amt = item.getNumOfItems();
                         item.setNumOfItems(0);
-                        item.stripCastableEnchants();
                         MobLoot ml = new MobLoot(this.absCharacter, amt);
                         ml.zeroItem();
                         ml.containerType = Enum.ItemContainerType.INVENTORY;

src/engine/objects/CharacterSkill.java

@@ -223,7 +223,7 @@ public class CharacterSkill extends AbstractGameObject {
         this.numTrains.set(0);
         this.ownerUID = pc.getObjectUUID();
         calculateBaseAmount();
-        calculateModifiedAmount();
+        calculateModifiedAmount(false);
         this.skillType = CharacterSkills.GetCharacterSkillByToken(this.skillsBase.getToken());
     }
 
@@ -238,7 +238,7 @@ public class CharacterSkill extends AbstractGameObject {
         this.ownerUID = pc.getObjectUUID();
         this.trained = true;
         calculateBaseAmount();
-        calculateModifiedAmount();
+        calculateModifiedAmount(false);
         this.skillType = CharacterSkills.GetCharacterSkillByToken(this.skillsBase.getToken());
 
     }
@@ -254,7 +254,7 @@ public class CharacterSkill extends AbstractGameObject {
         this.numTrains.set(rs.getShort("trains"));
         this.ownerUID = pc.getObjectUUID();
         calculateBaseAmount();
-        calculateModifiedAmount();
+        calculateModifiedAmount(false);
         this.skillType = CharacterSkills.GetCharacterSkillByToken(this.skillsBase.getToken());
     }
 
@@ -264,8 +264,9 @@ public class CharacterSkill extends AbstractGameObject {
         this.numTrains.set(trains);
         this.ownerUID = mob.getObjectUUID();
         this.isMobOwner = true;
-        calculateMobBaseAmount();
+        boolean isGuard = mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN) || mob.agentType.equals(Enum.AIAgentType.GUARDMINION);
-        calculateModifiedAmount();
+        calculateMobBaseAmount(isGuard);
+        calculateModifiedAmount(isGuard);
         this.skillType = CharacterSkills.GetCharacterSkillByToken(this.skillsBase.getToken());
     }
 
@@ -277,7 +278,7 @@ public class CharacterSkill extends AbstractGameObject {
         this.ownerUID = rs.getInt("CharacterID");
         //		this.owner = DbManager.PlayerCharacterQueries.GET_PLAYER_CHARACTER(rs.getInt("CharacterID"));
         calculateBaseAmount();
-        calculateModifiedAmount();
+        calculateModifiedAmount(false);
         this.skillType = CharacterSkills.GetCharacterSkillByToken(this.skillsBase.getToken());
     }
 
@@ -370,7 +371,7 @@ public class CharacterSkill extends AbstractGameObject {
             String name = it.next();
             CharacterSkill cs = skills.get(name);
             if (cs != null)
-                cs.calculateModifiedAmount();
+                cs.calculateModifiedAmount(false);
 
         }
 
@@ -756,7 +757,7 @@ public class CharacterSkill extends AbstractGameObject {
 
             //recalculate this skill
             calculateBaseAmount();
-            calculateModifiedAmount();
+            calculateModifiedAmount(false);
 
             //see if any new skills or powers granted
             pc.calculateSkills();
@@ -848,7 +849,7 @@ public class CharacterSkill extends AbstractGameObject {
             if (recalculate) {
                 //recalculate this skill
                 calculateBaseAmount();
-                calculateModifiedAmount();
+                calculateModifiedAmount(false);
 
                 //see if any skills or powers removed
                 pc.calculateSkills();
@@ -887,7 +888,7 @@ public class CharacterSkill extends AbstractGameObject {
             if (recalculate) {
                 //recalculate this skill
                 calculateBaseAmount();
-                calculateModifiedAmount();
+                calculateModifiedAmount(false);
 
                 //see if any skills or powers removed
                 pc.calculateSkills();
@@ -992,9 +993,6 @@ public class CharacterSkill extends AbstractGameObject {
 
         //Get Base skill for unmodified stats
         float base = 7f;
-        if(this.skillsBase.getToken() == -660435875){
-            base = 0;
-        }
         float statMod = 0.5f;
         if (this.skillsBase.getStrMod() > 0)
             statMod += (float) this.skillsBase.getStrMod() * (float) (int) ((PlayerCharacter) CharacterSkill.GetOwner(this)).statStrBase / 100f;
@@ -1012,40 +1010,41 @@ public class CharacterSkill extends AbstractGameObject {
             statMod = 600f;
         base += CharacterSkill.baseSkillValues[(int) statMod];
 
-        if (base + bonus < 1f && this.skillsBase.getToken() != -660435875)
+        if (base + bonus < 1f)
             this.baseAmountBeforeMods = 1f;
         else
             this.baseAmountBeforeMods = base + bonus;
         this.modifiedAmountBeforeMods = Math.round(this.baseAmountBeforeMods + calculateAmountAfterTrains());
     }
 
-    public void calculateMobBaseAmount() {
+    public void calculateMobBaseAmount(boolean isGuard) {
-        if (CharacterSkill.GetOwner(this) == null) {
+        if(!isGuard) {
-            Logger.error("owner not found for owner uuid : " + this.ownerUID);
+            if (CharacterSkill.GetOwner(this) == null) {
-            this.baseAmount = 1;
+                Logger.error("owner not found for owner uuid : " + this.ownerUID);
-            this.modifiedAmount = 1;
+                this.baseAmount = 1;
-            return;
+                this.modifiedAmount = 1;
-        }
+                return;
+            }
 
-        if (this.skillsBase == null) {
+            if (this.skillsBase == null) {
-            Logger.error("SkillsBase not found for skill " + this.getObjectUUID());
+                Logger.error("SkillsBase not found for skill " + this.getObjectUUID());
-            this.baseAmount = 1;
+                this.baseAmount = 1;
-            this.modifiedAmount = 1;
+                this.modifiedAmount = 1;
-            return;
+                return;
+            }
         }
-
         //Get any rune bonus
         float bonus = 0f;
         //TODO SKILLS RUNES
-
-        if (CharacterSkill.GetOwner(this).getBonuses() != null) {
-            //Get bonuses from runes
-            bonus = CharacterSkill.GetOwner(this).getBonuses().getSkillBonus(this.skillsBase.sourceType);
-        }
-
-        //Get Base skill for unmodified stats
         float base = 7f;
         float statMod = 0.5f;
+        if (CharacterSkill.GetOwner(this) != null && CharacterSkill.GetOwner(this).getBonuses() != null) {
+            //Get bonuses from runes
+            bonus = CharacterSkill.GetOwner(this).getBonuses().getSkillBonus(this.skillsBase.sourceType);
+
+        //Get Base skill for unmodified stats
+
+
         if (this.skillsBase.getStrMod() > 0)
             statMod += (float) this.skillsBase.getStrMod() * (float) ((Mob) CharacterSkill.GetOwner(this)).getMobBase().getMobBaseStats().getBaseStr() / 100f;
         if (this.skillsBase.getDexMod() > 0)
@@ -1060,6 +1059,7 @@ public class CharacterSkill extends AbstractGameObject {
             statMod = 1f;
         else if (statMod > 600)
             statMod = 600f;
+        }
         base += CharacterSkill.baseSkillValues[(int) statMod];
 
         if (base + bonus < 1f)
@@ -1069,63 +1069,60 @@ public class CharacterSkill extends AbstractGameObject {
         this.modifiedAmountBeforeMods = (int) (this.baseAmountBeforeMods + calculateAmountAfterTrains());
     }
 
-    public void calculateModifiedAmount() {
+    public void calculateModifiedAmount(boolean isGuard) {
-        if (CharacterSkill.GetOwner(this) == null || this.skillsBase == null) {
+        if(!isGuard) {
-            Logger.error("owner or SkillsBase not found for skill " + this.getObjectUUID());
+            if (CharacterSkill.GetOwner(this) == null || this.skillsBase == null) {
-            this.baseAmount = 1;
+                Logger.error("owner or SkillsBase not found for skill " + this.getObjectUUID());
-            this.modifiedAmount = 1;
+                this.baseAmount = 1;
-            return;
+                this.modifiedAmount = 1;
+                return;
+            }
         }
-
         //Get any rune bonus
         float bonus = 0f;
-        if (CharacterSkill.GetOwner(this).getBonuses() != null) {
+        float base = 7f;
+        float statMod = 0.5f;
+        if (CharacterSkill.GetOwner(this) != null && CharacterSkill.GetOwner(this).getBonuses() != null) {
             //Get bonuses from runes
             bonus = CharacterSkill.GetOwner(this).getBonuses().getSkillBonus(this.skillsBase.sourceType);
-        }
 
-        //Get Base skill for modified stats
+
-        //TODO this fomula needs verified
+            //Get Base skill for modified stats
-        float base = 7f;
+            //TODO this fomula needs verified
-        if(this.skillsBase.getToken() == -660435875){
+
-            base = 0;
+            if (this.skillsBase.getStrMod() > 0)
-        }
+                statMod += (float) this.skillsBase.getStrMod() * (float) CharacterSkill.GetOwner(this).getStatStrCurrent() / 100f;
-        float statMod = 0.5f;
+            if (this.skillsBase.getDexMod() > 0)
-        if (this.skillsBase.getStrMod() > 0)
+                statMod += (float) this.skillsBase.getDexMod() * (float) CharacterSkill.GetOwner(this).getStatDexCurrent() / 100f;
-            statMod += (float) this.skillsBase.getStrMod() * (float) CharacterSkill.GetOwner(this).getStatStrCurrent() / 100f;
+            if (this.skillsBase.getConMod() > 0)
-        if (this.skillsBase.getDexMod() > 0)
+                statMod += (float) this.skillsBase.getConMod() * (float) CharacterSkill.GetOwner(this).getStatConCurrent() / 100f;
-            statMod += (float) this.skillsBase.getDexMod() * (float) CharacterSkill.GetOwner(this).getStatDexCurrent() / 100f;
+            if (this.skillsBase.getIntMod() > 0)
-        if (this.skillsBase.getConMod() > 0)
+                statMod += (float) this.skillsBase.getIntMod() * (float) CharacterSkill.GetOwner(this).getStatIntCurrent() / 100f;
-            statMod += (float) this.skillsBase.getConMod() * (float) CharacterSkill.GetOwner(this).getStatConCurrent() / 100f;
+            if (this.skillsBase.getSpiMod() > 0)
-        if (this.skillsBase.getIntMod() > 0)
+                statMod += (float) this.skillsBase.getSpiMod() * (float) CharacterSkill.GetOwner(this).getStatSpiCurrent() / 100f;
-            statMod += (float) this.skillsBase.getIntMod() * (float) CharacterSkill.GetOwner(this).getStatIntCurrent() / 100f;
+            if (statMod < 1)
-        if (this.skillsBase.getSpiMod() > 0)
+                statMod = 1f;
-            statMod += (float) this.skillsBase.getSpiMod() * (float) CharacterSkill.GetOwner(this).getStatSpiCurrent() / 100f;
+            else if (statMod > 600)
-        if (statMod < 1)
+                statMod = 600f;
-            statMod = 1f;
-        else if (statMod > 600)
-            statMod = 600f;
-        if(this.skillsBase.getToken() == -660435875){
-            statMod = 0;
         }
         base += CharacterSkill.baseSkillValues[(int) statMod];
         SourceType sourceType = SourceType.GetSourceType(this.skillsBase.getNameNoSpace());
 
         //Get any rune, effect and item bonus
 
-        if (CharacterSkill.GetOwner(this).getBonuses() != null) {
+        if (CharacterSkill.GetOwner(this) != null && CharacterSkill.GetOwner(this).getBonuses() != null) {
             //add bonuses from effects/items and runes
             base += bonus + CharacterSkill.GetOwner(this).getBonuses().getFloat(ModType.Skill, sourceType);
         }
 
-        if (base < 1f && this.skillsBase.getToken() != -660435875)
+        if (base < 1f)
             this.baseAmount = 1f;
         else
             this.baseAmount = base;
 
         float modAmount = this.baseAmount + calculateAmountAfterTrains();
 
-        if (CharacterSkill.GetOwner(this).getBonuses() != null) {
+        if (CharacterSkill.GetOwner(this) != null && CharacterSkill.GetOwner(this).getBonuses() != null) {
             //Multiply any percent bonuses
             modAmount *= (1 + CharacterSkill.GetOwner(this).getBonuses().getFloatPercentAll(ModType.Skill, sourceType));
         }

src/engine/objects/City.java

@@ -39,7 +39,6 @@ import java.sql.SQLException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
@@ -89,8 +88,6 @@ public class City extends AbstractWorldObject {
     private boolean reverseKOS = false;
     private String hash;
 
-    public HashMap<Integer, Long> baneAttendees = new HashMap<>();
-
     /**
      * ResultSet Constructor
      */
@@ -237,24 +234,7 @@ public class City extends AbstractWorldObject {
         writer.putInt(rulingGuild.getObjectUUID());
 
         writer.putString(rulingGuild.getName());
-        try {
+        writer.putString(city.motto);
-            if (city.getBane() != null) {
-                Bane bane = city.getBane();
-                if (bane.daySet && bane.timeSet && bane.getLiveDate() != null) {
-                    int day = bane.getLiveDate().dayOfMonth().get();
-                    int month = bane.getLiveDate().getMonthOfYear();
-                    int year = bane.getLiveDate().year().get();
-                    int hour = bane.getLiveDate().getHourOfDay();
-                    writer.putString("BANE SET: " + month + "/" + day + "/" + year + "   " + hour + ":00 CST");
-                } else {
-                    writer.putString("BANED!: Unset");
-                }
-            } else {
-                writer.putString(city.motto);
-            }
-        }catch(Exception e){
-            writer.putString(city.motto);
-        }
         writer.putString(rulingGuild.getLeadershipType());
 
         // Serialize guild ruler's name
@@ -309,11 +289,8 @@ public class City extends AbstractWorldObject {
         else
             writer.putString(rulingNation.getName());
 
-        if(city.getTOL() != null) {
+        writer.putInt(city.getTOL().getRank());
-            writer.putInt(city.getTOL().getRank());
+
-        } else{
-            writer.putInt(1);
-        }
         if (city.isNoobIsle > 0)
             writer.putInt(1);
         else
@@ -340,11 +317,8 @@ public class City extends AbstractWorldObject {
         writer.putFloat(city.location.y);
         writer.putFloat(city.location.z);
 
-        if(city.getBane() != null) {
+        writer.putInt(city.siegesWithstood);
-            writer.putInt(city.getBane().capSize);
+
-        }else{
-            writer.putInt(0);
-        }
         writer.put((byte) 1);
         writer.put((byte) 0);
         writer.putInt(0x64);
@@ -1012,7 +986,7 @@ public class City extends AbstractWorldObject {
 
         // Gather current list of players within the zone bounds
 
-        currentPlayers = WorldGrid.getObjectsInRangePartial(this.location, 1500, MBServerStatics.MASK_PLAYER);
+        currentPlayers = WorldGrid.getObjectsInRangePartial(this.location, CityBoundsType.ZONE.extents, MBServerStatics.MASK_PLAYER);
         currentMemory = new HashSet<>();
 
         for (AbstractWorldObject playerObject : currentPlayers) {
@@ -1024,15 +998,7 @@ public class City extends AbstractWorldObject {
             currentMemory.add(player.getObjectUUID());
 
             // Player is already in our memory
-            if(this.getBane() != null){
+
-                //handle zerg mechanics here
-                if(this.getBane().getSiegePhase().equals(SiegePhase.WAR)){
-                    //bane is live, start tallying players
-                    if(!this.baneAttendees.containsKey(player.getObjectUUID())){
-                        this.baneAttendees.put(player.getObjectUUID(),System.currentTimeMillis());
-                    }
-                }
-            }
             if (_playerMemory.contains(player.getObjectUUID()))
                 continue;
 
@@ -1059,29 +1025,14 @@ public class City extends AbstractWorldObject {
         } catch (Exception e) {
             Logger.error(e.getMessage());
         }
-    }
 
-    private void onExitBane() {
-        ArrayList<Integer> toRemove = new ArrayList<>();
-        for (Integer uuid : this.baneAttendees.keySet()) {
-            if (!_playerMemory.contains(uuid)) {
-                long timeGone = System.currentTimeMillis() - this.baneAttendees.get(uuid).longValue();
-                if (timeGone > 180000L) { // 3 minutes
-                    toRemove.add(uuid); // Mark for removal
-                }
-            }
-        }
-        for(int uuid : toRemove){
-            this.baneAttendees.remove(uuid);
-        }
     }
 
-
     private void onExit(HashSet<Integer> currentMemory) {
 
         PlayerCharacter player;
         int playerUUID = 0;
-        HashSet<Integer> toRemoveStandard = new HashSet<>();
+        HashSet<Integer> toRemove = new HashSet<>();
         Iterator<Integer> iter = _playerMemory.iterator();
 
         while (iter.hasNext()) {
@@ -1103,28 +1054,21 @@ public class City extends AbstractWorldObject {
 
             this.removeAllCityEffects(player, false);
 
-            player.ZergMultiplier = 1.0f;
             // We will remove this player after iteration is complete
             // so store it in a temporary collection
 
-            toRemoveStandard.add(playerUUID);
+            toRemove.add(playerUUID);
             // ***For debugging
             // Logger.info("PlayerMemory for ", this.getCityName() + ": " + _playerMemory.size());
         }
 
         // Remove players from city memory
 
-        _playerMemory.removeAll(toRemoveStandard);
+        _playerMemory.removeAll(toRemove);
-        for (Integer removalUUID : toRemoveStandard) {
+        for (Integer removalUUID : toRemove) {
             if (this.cityOutlaws.contains(removalUUID))
                 this.cityOutlaws.remove(removalUUID);
         }
-        if(this.getBane() != null){
-            //handle zerg mechanics here
-            if(this.getBane().getSiegePhase().equals(SiegePhase.WAR)){
-                this.onExitBane();
-            }
-        }
     }
 
     public int getWarehouseBuildingID() {
@@ -1139,7 +1083,7 @@ public class City extends AbstractWorldObject {
 
         Thread destroyCityThread = new Thread(new DestroyCityThread(this));
 
-        destroyCityThread.setName("deestroyCity:" + this.getName());
+        destroyCityThread.setName("destroyCity:" + this.getName());
         destroyCityThread.start();
     }
 

src/engine/objects/Contract.java

@@ -11,12 +11,7 @@ package engine.objects;
 
 import ch.claude_martin.enumbitset.EnumBitSet;
 import engine.Enum;
-import engine.gameManager.*;
+import engine.gameManager.DbManager;
-import engine.net.Dispatch;
-import engine.net.DispatchMessage;
-import engine.net.client.msg.CityDataMsg;
-import engine.net.client.msg.ErrorPopupMsg;
-import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
@@ -91,15 +86,6 @@ public class Contract extends AbstractGameObject {
         this.iconID = rs.getInt("iconID");
         this.vendorID = rs.getInt("vendorID");
         this.allowedBuildings = EnumBitSet.asEnumBitSet(rs.getLong("allowedBuildingTypeID"), Enum.BuildingGroup.class);
-        switch(this.contractID){
-            case 866: //banker
-            case 865: //siege engineer
-            case 899: //alchemist
-                this.allowedBuildings.add(Enum.BuildingGroup.TOL);
-        }
-        if(this.getName().toLowerCase().contains("sage")){
-            this.allowedBuildings.add(Enum.BuildingGroup.TOL);
-        }
         this.equipmentSet = rs.getInt("equipSetID");
         this.inventorySet = rs.getInt("inventorySet");
 
@@ -195,288 +181,6 @@ public class Contract extends AbstractGameObject {
         return this.vendorDialog;
     }
 
-    public static VendorDialog HandleArenaMaster(int optionId, NPC npc, PlayerCharacter pc){
-        //1502043
-        pc.setLastNPCDialog(npc);
-        VendorDialog vd = new VendorDialog(VendorDialog.getHostileVendorDialog().getDialogType(),VendorDialog.getHostileVendorDialog().getIntro(),-1);//VendorDialog.getHostileVendorDialog();
-        vd.getOptions().clear();
-
-        switch(optionId){
-            case 15020431:
-                //if(pc.isBoxed){
-                //    ChatManager.chatSystemInfo(pc, "You Cannot Join The Que, You Are Boxed");
-                //}else {
-                    if (ArenaManager.playerQueue.contains(pc)) {
-                        ChatManager.chatSystemInfo(pc, "You Are Already In The Arena Que");
-                    } else {
-                        ArenaManager.joinQueue(pc);
-                        ChatManager.chatSystemInfo(pc, "You Have Joined The Arena Que");
-                    }
-                //}
-                break;
-            case 15020432:
-                if(ArenaManager.playerQueue.contains(pc)) {
-                    ArenaManager.leaveQueue(pc);
-                    ChatManager.chatSystemInfo(pc, "You Have Left The Arena Que");
-                }else{
-                    ChatManager.chatSystemInfo(pc, "You Are Not In The Arena Que");
-                }
-                break;
-        }
-        MenuOption option1 = new MenuOption(15020431, "Join Arena Que", 15020431);
-        vd.getOptions().add(option1);
-        MenuOption option2 = new MenuOption(15020432, "Leave Arena Que", 15020432);
-        vd.getOptions().add(option2);
-        return vd;
-    }
-    public static VendorDialog HandleEnrollmentOfficer(int optionId, NPC npc, PlayerCharacter pc){
-        pc.setLastNPCDialog(npc);
-        //VendorDialog vd = new VendorDialog(npc.contract.getVendorDialog().getDialogType(),npc.contract.getVendorDialog().getIntro(),-1);//VendorDialog.getHostileVendorDialog();
-        VendorDialog vd = new VendorDialog(npc.contract.getVendorDialog().getDialogType(),npc.contract.getVendorDialog().getIntro(),-1);//VendorDialog.getHostileVendorDialog();
-        vd.getOptions().clear();
-        switch(optionId) {
-            default:
-            if (pc.isBoxed) {
-                MenuOption option1 = new MenuOption(15020401, "Unbox Character", 15020401);
-                vd.getOptions().add(option1);
-            }
-            break;
-            case 15020401:
-                PlayerCharacter.unboxPlayer(pc);
-                vd.getOptions().clear();
-                break;
-        }
-        return vd;
-    }
-    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();
-        vd.getOptions().clear();
-        Building building = npc.building;
-        Bane bane = null;
-        int updateBaneTime = 0;
-        int updateBaneDay = 0;
-        int updateBaneCap = 0;
-
-        int treesInNation = 0;
-        if(building != null)
-        {
-            City city = ZoneManager.getCityAtLocation(building.loc);
-            if(city != null){
-                bane = city.getBane();
-                if(!city.getGuild().equals(pc.guild))
-                    return vd;
-
-                if(!GuildStatusController.isInnerCouncil(pc.getGuildStatus()) && !GuildStatusController.isGuildLeader(pc.getGuildStatus())){
-                    return vd;
-                }
-                for(Guild sub : city.getGuild().getNation().getSubGuildList()){
-                    if(sub.getOwnedCity() != null){
-                        treesInNation += 1;
-                    }
-                }
-            }
-        }
-        if(bane == null){
-            return VendorDialog.getHostileVendorDialog();
-        }
-        if(bane.timeSet && bane.capSet && bane.daySet){
-            vd.getOptions().clear();
-            return vd;
-        }
-
-        DateTime placement = bane.getPlacementDate();
-        vd.getOptions().clear();
-        switch(optionId){
-            default:
-                if(!bane.daySet) {
-                    MenuOption option1 = new MenuOption(796, "Set Bane Day", 796);
-                    vd.getOptions().add(option1);
-                }
-                if(!bane.timeSet) {
-                    MenuOption option2 = new MenuOption(797, "Set Bane Time", 797);
-                    vd.getOptions().add(option2);
-                }
-                if(!bane.capSet) {
-                    MenuOption option3 = new MenuOption(797, "Set Bane Cap", 798);
-                    vd.getOptions().add(option3);
-                }
-                break;
-            case 796: // set bane day
-                DateTime dayOption1Date = placement.plusDays(3);
-                MenuOption dayOption1 = new MenuOption(7961, dayOption1Date.toString("yyyy-MM-dd"), 7961);
-                vd.getOptions().add(dayOption1);
-
-                DateTime dayOption2Date = placement.plusDays(4);
-                MenuOption dayOption2 = new MenuOption(7962, dayOption2Date.toString("yyyy-MM-dd"), 7962);
-                vd.getOptions().add(dayOption2);
-
-                DateTime dayOption3Date = placement.plusDays(5);
-                MenuOption dayOption3 = new MenuOption(7963, dayOption3Date.toString("yyyy-MM-dd"), 7963);
-                vd.getOptions().add(dayOption3);
-
-                DateTime dayOption4Date = placement.plusDays(6);
-                MenuOption dayOption4 = new MenuOption(7964, dayOption4Date.toString("yyyy-MM-dd"), 7964);
-                vd.getOptions().add(dayOption4);
-
-                DateTime dayOption5Date = placement.plusDays(7);
-                MenuOption dayOption5 = new MenuOption(7965, dayOption5Date.toString("yyyy-MM-dd"), 7965);
-                vd.getOptions().add(dayOption5);
-                break;
-            case 797: // set bane time
-                MenuOption timeOption1 = new MenuOption(7971, "6:00 pm CST", 7971);
-                vd.getOptions().add(timeOption1);
-
-                MenuOption timeOption2 = new MenuOption(7972, "7:00 pm CST", 7972);
-                vd.getOptions().add(timeOption2);
-
-                MenuOption timeOption3 = new MenuOption(7973, "8:00 pm CST", 7973);
-                vd.getOptions().add(timeOption3);
-
-                MenuOption timeOption4 = new MenuOption(7974, "9:00 pm CST", 7974);
-                vd.getOptions().add(timeOption4);
-
-                MenuOption timeOption5 = new MenuOption(7975, "10:00 pm CST", 7975);
-                vd.getOptions().add(timeOption5);
-                break;
-            case 798: // set bane cap
-                if(treesInNation < 6) {
-                    MenuOption capOption1 = new MenuOption(7981, "10 Maximum Players", 7981);
-                    vd.getOptions().add(capOption1);
-                }
-
-                if(treesInNation < 11) {
-                    MenuOption capOption2 = new MenuOption(7982, "20 Maximum Players", 7982);
-                    vd.getOptions().add(capOption2);
-                }
-
-                MenuOption capOption3 = new MenuOption(7983, "30 Maximum Players", 7983);
-                vd.getOptions().add(capOption3);
-
-                MenuOption capOption4 = new MenuOption(7984, "40 Maximum Players", 7984);
-                vd.getOptions().add(capOption4);
-
-                MenuOption capOption5 = new MenuOption(7985, "Unlimited Players", 7985);
-                vd.getOptions().add(capOption5);
-
-                break;
-
-            case 7961: //3 days after placement
-                ErrorPopupMsg.sendErrorMsg(pc, "Bane Set 3 Days From Placement Date");
-                updateBaneDay = 3;
-                break;
-            case 7962: //4 days after placement
-                ErrorPopupMsg.sendErrorMsg(pc, "Bane Set 4 Days From Placement Date");
-                updateBaneDay = 4;
-                break;
-            case 7963: //5 days after placement
-                ErrorPopupMsg.sendErrorMsg(pc, "Bane Set 5 Days From Placement Date");
-                updateBaneDay = 5;
-                break;
-            case 7964: //6 days after placement
-                ErrorPopupMsg.sendErrorMsg(pc, "Bane Set 6 Days From Placement Date");
-                updateBaneDay = 6;
-                break;
-            case 7965: //7 days after placement
-                ErrorPopupMsg.sendErrorMsg(pc, "Bane Set 7 Days From Placement Date");
-                updateBaneDay = 7;
-                break;
-            case 7971: //6:00pm CST
-                ErrorPopupMsg.sendErrorMsg(pc, "Bane Set For 6:00 pm CST");
-                updateBaneTime = 6;
-                break;
-            case 7972: //7:00pm CST
-                ErrorPopupMsg.sendErrorMsg(pc, "Bane Set For 7:00 pm CST");
-                updateBaneTime = 7;
-                break;
-            case 7973: //8:00pm CST
-                ErrorPopupMsg.sendErrorMsg(pc, "Bane Set For 8:00 pm CST");
-                updateBaneTime = 8;
-                break;
-            case 7974: //9:00pm CST
-                ErrorPopupMsg.sendErrorMsg(pc, "Bane Set For 9:00 pm CST");
-                updateBaneTime = 9;
-                break;
-            case 7975: //10:00pm CST
-                ErrorPopupMsg.sendErrorMsg(pc, "Bane Set For 10:00 pm CST");
-                updateBaneTime = 10;
-                break;
-            case 7981: //cap = 10
-                ErrorPopupMsg.sendErrorMsg(pc, "Bane Cap Set To 10 Players On Each Side");
-                updateBaneCap = 10;
-                break;
-            case 7982: //cap = 20
-                ErrorPopupMsg.sendErrorMsg(pc, "Bane Cap Set To 20 Players On Each Side");
-                updateBaneCap = 20;
-                break;
-            case 7983: //cap = 30
-                ErrorPopupMsg.sendErrorMsg(pc, "Bane Cap Set To 30 Players On Each Side");
-                updateBaneCap = 30;
-                break;
-            case 7984: //cap = 40
-                ErrorPopupMsg.sendErrorMsg(pc, "Bane Cap Set To 40 Players On Each Side");
-                updateBaneCap = 40;
-                break;
-            case 7985: //cap = Unlimited
-                ErrorPopupMsg.sendErrorMsg(pc, "Bane Cap Set To Unlimited Players On Each Side");
-                updateBaneCap = 9999;
-                break;
-        }
-        if (updateBaneDay > 0) {
-            if(DbManager.BaneQueries.SET_BANE_DAY_NEW(updateBaneDay,bane.getCityUUID())){
-                bane.daySet = true;
-                if(bane.getLiveDate() == null) {
-                    bane.setLiveDate_NEW(bane.getPlacementDate().plusDays(updateBaneDay));
-                }else{
-                    bane.setLiveDate_NEW(bane.getLiveDate().plusDays(updateBaneDay));
-                }
-            }
-        }
-        if (updateBaneTime > 0) {
-            if(DbManager.BaneQueries.SET_BANE_TIME_NEW(updateBaneTime,bane.getCityUUID())){
-                bane.timeSet = true;
-                if(bane.getLiveDate() == null) {
-                    bane.setLiveDate_NEW(bane.getPlacementDate().withHourOfDay(12 + updateBaneTime));
-                }else{
-                    bane.setLiveDate_NEW(bane.getLiveDate().withHourOfDay(12 + updateBaneTime));
-                }
-            }
-            bane.setLiveDate(DbManager.BaneQueries.getLiveDate(bane.getCityUUID()));
-        }
-        if (updateBaneCap > 0) {
-            if(DbManager.BaneQueries.SET_BANE_CAP_NEW(updateBaneCap,bane.getCityUUID())){
-                bane.capSet = true;
-                bane.capSize = updateBaneCap;
-            }
-        }
-
-        if(updateBaneCap > 0 ||  updateBaneTime > 0 || updateBaneDay > 0) {
-            bane.getSiegePhase();
-            for (PlayerCharacter playerCharacter : SessionManager.getAllActivePlayerCharacters()) {
-                CityDataMsg cityDataMsg = new CityDataMsg(SessionManager.getSession(playerCharacter), false);
-                cityDataMsg.updateMines(true);
-                cityDataMsg.updateCities(true);
-                Dispatch dispatch = Dispatch.borrow(playerCharacter, cityDataMsg);
-                DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
-            }
-            vd.getOptions().clear();
-            if(!bane.daySet) {
-                MenuOption option1 = new MenuOption(796, "Set Bane Day", 796);
-                vd.getOptions().add(option1);
-            }
-            if(!bane.timeSet) {
-                MenuOption option2 = new MenuOption(797, "Set Bane Time", 797);
-                vd.getOptions().add(option2);
-            }
-            if(!bane.capSet) {
-                MenuOption option3 = new MenuOption(797, "Set Bane Cap", 798);
-                vd.getOptions().add(option3);
-            }
-        }
-
-        return vd;
-    }
-
     public ArrayList<Integer> getNPCMenuOptions() {
         return this.npcMenuOptions;
     }
@@ -494,92 +198,6 @@ public class Contract extends AbstractGameObject {
     }
 
     public ArrayList<MobEquipment> getSellInventory() {
-        if(this.getObjectUUID() == 900){ //resource merchant
-            for(MobEquipment me : this.sellInventory){
-                if(me.getItemBase().getType().equals(Enum.ItemType.RESOURCE)){
-                    int amountResource = Warehouse.getSellStackSize(me.getItemBase().getUUID());
-                    me.magicValue = amountResource * me.getItemBase().getBaseValue();
-                } else{
-                    me.magicValue = 1000000;
-                }
-            }
-        }
-
-        if(this.getObjectUUID() == 1202){ //rune merchant
-            for(MobEquipment me : this.sellInventory){
-                switch(me.getItemBase().getUUID()){
-                    case 250001: //5 stats
-                    case 250010:
-                    case 250019:
-                    case 250028:
-                    case 250037:
-                        me.magicValue = 3000000;
-                        break;
-                    case 250002: //10 stats
-                    case 250011:
-                    case 250020:
-                    case 250029:
-                    case 250038:
-                        me.magicValue = 4000000;
-                        break;
-                    case 250003: //15 stats
-                    case 250012:
-                    case 250021:
-                    case 250030:
-                    case 250039:
-                        me.magicValue = 5000000;
-                        break;
-                    case 250004: //20 stats
-                    case 250013:
-                    case 250022:
-                    case 250031:
-                    case 250040:
-                        me.magicValue = 6000000;
-                        break;
-                    case 250005: //25 stats
-                    case 250014:
-                    case 250023:
-                    case 250032:
-                    case 250041:
-                        me.magicValue = 7000000;
-                        break;
-                    case 250006: //30 stats
-                    case 250015:
-                    case 250024:
-                    case 250033:
-                    case 250042:
-                        me.magicValue = 8000000;
-                        break;
-                    case 250007: //35 stats
-                    case 250016:
-                    case 250025:
-                    case 250034:
-                    case 250043:
-                        me.magicValue = 9000000;
-                        break;
-                    default:
-                        me.magicValue = 10000000;
-                        break;
-                }
-            }
-        }
-
-        if(this.getObjectUUID() == 1201){ //disc merchant
-            for(MobEquipment me : this.sellInventory){
-                if(me.getItemBase().getName().equals("Prospector")){
-                    me.magicValue = 500000;
-                }else{
-                    me.magicValue = 10000000;
-                }
-            }
-        }
-
-        if(this.getObjectUUID() == 1502041) {//noob helper{
-            for(MobEquipment me : this.sellInventory){
-                me.magicValue = 1;
-            }
-        }
-
         return this.sellInventory;
     }
 

src/engine/objects/Experience.java

@@ -9,7 +9,6 @@
 
 package engine.objects;
 
-import engine.Enum;
 import engine.Enum.TargetColor;
 import engine.gameManager.ZoneManager;
 import engine.math.Vector3fImmutable;
@@ -118,11 +117,6 @@ public class Experience {
             159932666, // Level 74
             169707808, // Level 75
             179921247, // Level 76
-            190585732,  // Level 77
-            201714185,  // Level 78
-            213319687,  // Level 79
-            225415457,   // Level 80
-            238014819   // Level 81
 
     };
 
@@ -220,14 +214,7 @@ public class Experience {
             235166.21f, // Level 72
             246039.34f, // Level 73
             257240.58f, // Level 74
-            268774.71f, //Level 75
+            1 // 268774.71 //Level 75
-            280647.69f, // Level 76
-            292865.22f, // Level 77
-            305433.33f, // Level 78
-            318358.08f, // Level 79
-
-            // R8
-            1 //331645.74f // Level 80
 
     };
     // Used to calcuate the amount of experience a monster grants in the
@@ -281,8 +268,8 @@ public class Experience {
         if (level < 1)
             level = 1;
 
-        if (level > MBServerStatics.LEVELCAP)
+        if (level > 75)
-            level = MBServerStatics.LEVELCAP;
+            level = 75;
 
         return MaxExpPerLevel[level];
     }
@@ -292,17 +279,17 @@ public class Experience {
 
         switch (TargetColor.getCon(pc, mob)) {
             case Red:
-                return 1.1;
+                return 1.25;
             case Orange:
                 return 1.15;
             case Yellow:
-                return 1.2;
+                return 1.05;
             case Blue:
-                return 1.25;
+                return 1;
             case Cyan:
-                return 0.9;
+                return 0.8;
             case Green:
-                return 0.7;
+                return 0.5;
             default:
                 return 0;
         }
@@ -346,9 +333,6 @@ public class Experience {
         if (killer == null || mob == null)
             return;
 
-        if(killer.equals(mob))
-            return;
-
         double grantedExperience = 0.0;
 
         if (g != null) { // Do group EXP stuff
@@ -399,14 +383,10 @@ public class Experience {
                 if (playerCharacter.getLevel() >= MBServerStatics.LEVELCAP)
                     continue;
 
-                if(playerCharacter.level >= 75 && !mob.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
-                    continue; // cannot PVE higher than level 75
-
                 // Sets Max XP with server exp mod taken into account.
 
                 grantedExperience = (double) LOOTMANAGER.NORMAL_EXP_RATE * maxXPPerKill(playerCharacter.getLevel());
 
-                grantedExperience *= (1/ giveEXPTo.size()+0.9);
                 // Adjust XP for Mob Level
 
                 grantedExperience *= getConMod(playerCharacter, mob);
@@ -448,13 +428,10 @@ public class Experience {
             }
 
         } else { // Give EXP to a single character
-            //if (!killer.isAlive()) // Skip if the player is dead.
+            if (!killer.isAlive()) // Skip if the player is dead.
-             //   return;
-
-            if (killer.getLevel() >= MBServerStatics.LEVELCAP)
                 return;
 
-            if(killer.level >= 75 && !mob.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
+            if (killer.getLevel() >= MBServerStatics.LEVELCAP)
                 return;
 
             // Get XP and adjust for Mob Level with world xp modifier taken into account

src/engine/objects/Guild.java

@@ -521,10 +521,6 @@ public class Guild extends AbstractWorldObject {
     public void setICMOTD(String value) {
         this.icmotd = value;
     }
-    public void setNMOTD(String value) {
-        this.nmotd = value;
-    }
-    public String getNMOTD(){return nmotd;}
 
     public boolean isNPCGuild() {
 
@@ -756,9 +752,9 @@ public class Guild extends AbstractWorldObject {
                 canSub = false;
         }
         City nationCap = City.getCity(nation.cityUUID);
-        //if (nation.getSubGuildList().size() >= nationCap.getRank()) {
+        if (nation.getSubGuildList().size() >= nationCap.getRank()) {
-        //    canSub = false;
+            canSub = false;
-        //}
+        }
         return canSub;
     }
 

src/engine/objects/Item.java

@@ -23,7 +23,6 @@ import engine.net.client.ClientConnection;
 import engine.net.client.msg.DeleteItemMsg;
 import engine.powers.EffectsBase;
 import engine.powers.effectmodifiers.AbstractEffectModifier;
-import engine.powers.effectmodifiers.WeaponProcEffectModifier;
 import engine.powers.poweractions.AbstractPowerAction;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
@@ -234,6 +233,7 @@ public class Item extends AbstractWorldObject {
         this.value = rs.getInt("item_value");
         this.customName = rs.getString("item_name");
 
+
     }
 
     public static void _serializeForClientMsg(Item item, ByteBufferWriter writer)
@@ -303,7 +303,7 @@ public class Item extends AbstractWorldObject {
             writer.putString(item.customName); // Unknown. pad?
         writer.put((byte) 1); // End Datablock byte
 
-        writer.putFloat((float) item.getDurabilityMax());
+        writer.putFloat((float) item.durabilityMax);
         writer.putFloat((float) item.durabilityCurrent);
 
         writer.put((byte) 1); // End Datablock byte
@@ -609,7 +609,7 @@ public class Item extends AbstractWorldObject {
         writer.putIntAt(serialized, indexPosition);
     }
 
-    public static Item createItemForPlayer(PlayerCharacter pc, ItemBase ib, boolean fromNoob) {
+    public static Item createItemForPlayer(PlayerCharacter pc, ItemBase ib) {
         Item item = null;
         byte charges = 0;
 
@@ -817,29 +817,8 @@ public class Item extends AbstractWorldObject {
         return ownerID;
     }
 
-    public void stripCastableEnchants(){
-        ArrayList<String> keys =new ArrayList<>();
-
-        for(String eff : this.effects.keySet()){
-            for(AbstractEffectModifier mod : this.effects.get(eff).getEffectsBase().getModifiers()){
-                if(mod.modType.equals(ModType.WeaponProc)){
-                    keys.add(eff);
-                }
-            }
-        }
-
-        for(String eff : keys){
-            try {
-                this.effects.get(eff).endEffect();
-                this.effects.remove(eff);
-            }catch(Exception e){
-
-            }
-        }
-    }
     //Only to be used for trading
     public void setOwnerID(int ownerID) {
-        this.stripCastableEnchants();
         this.ownerID = ownerID;
     }
 
@@ -863,7 +842,6 @@ public class Item extends AbstractWorldObject {
     public boolean setOwner(AbstractGameObject owner) {
         if (owner == null)
             return false;
-        this.stripCastableEnchants();
         if (owner.getObjectType().equals(GameObjectType.NPC))
             this.ownerType = OwnerType.Npc;
         else if (owner.getObjectType().equals(GameObjectType.PlayerCharacter))
@@ -907,15 +885,7 @@ public class Item extends AbstractWorldObject {
     }
 
     public short getDurabilityMax() {
-        int extra = 0;
+        return durabilityMax;
-        for(Effect eff : this.effects.values()){
-            for(AbstractEffectModifier mod : eff.getEffectModifiers()){
-                if(mod.modType.equals(ModType.Durability)){
-                    extra += mod.getMaxMod();
-                }
-            }
-        }
-        return (short)(durabilityMax + extra);
     }
 
     public boolean isCanDestroy() {
@@ -978,7 +948,6 @@ public class Item extends AbstractWorldObject {
     }
 
     public boolean isID() {
-        this.flags |= 1;
         return ((this.flags & 1) > 0);
     }
 
@@ -1085,7 +1054,6 @@ public class Item extends AbstractWorldObject {
         this.ownerID = pc.getObjectUUID();
         this.ownerType = OwnerType.PlayerCharacter;
         this.containerType = ItemContainerType.INVENTORY;
-        this.stripCastableEnchants();
         return true;
     }
 
@@ -1106,7 +1074,6 @@ public class Item extends AbstractWorldObject {
         this.ownerID = npc.getObjectUUID();
         this.ownerType = OwnerType.Npc;
         this.containerType = Enum.ItemContainerType.INVENTORY;
-        this.stripCastableEnchants();
         return true;
     }
 
@@ -1124,7 +1091,6 @@ public class Item extends AbstractWorldObject {
         this.ownerID = 0;
         this.ownerType = null;
         this.containerType = Enum.ItemContainerType.INVENTORY;
-        this.stripCastableEnchants();
         return true;
     }
 
@@ -1231,7 +1197,6 @@ public class Item extends AbstractWorldObject {
     }
 
     public int getBaseValue() {
-
         if (this.getItemBase() != null)
             return this.getItemBase().getBaseValue();
         return 0;
@@ -1275,9 +1240,7 @@ public class Item extends AbstractWorldObject {
                     continue;
                 }
                 AbstractPowerAction apa = PowersManager.getPowerActionByIDString(effect.getIDString());
-
+                apa.applyBakedInStatsForItem(this, this.getItemBase().getBakedInStats().get(token));
-                if(apa != null)
-                    apa.applyBakedInStatsForItem(this, this.getItemBase().getBakedInStats().get(token));
             }
     }
 

src/engine/objects/ItemBase.java

@@ -75,6 +75,7 @@ public class ItemBase {
     private boolean isStrBased;
     private ArrayList<Integer> animations = new ArrayList<>();
     private ArrayList<Integer> offHandAnimations = new ArrayList<>();
+    private boolean autoID = false;
 
     /**
      * ResultSet Constructor
@@ -144,6 +145,8 @@ public class ItemBase {
 
         }
 
+        this.autoIDItemsCheck();
+
         try {
             DbManager.ItemBaseQueries.LOAD_ANIMATIONS(this);
         } catch (Exception e) {
@@ -229,79 +232,7 @@ public class ItemBase {
         AnniverseryGifts.add(5101060);
         AnniverseryGifts.add(5101080);
 
-        //fate peddler presents
-        AnniverseryGifts.add(971012);
-        AnniverseryGifts.add(971013);
-        AnniverseryGifts.add(971014);
-        AnniverseryGifts.add(971015);
-        AnniverseryGifts.add(971016);
-        AnniverseryGifts.add(971017);
-        AnniverseryGifts.add(971018);
-        AnniverseryGifts.add(971019);
-        AnniverseryGifts.add(971020);
-        AnniverseryGifts.add(971021);
-        AnniverseryGifts.add(971022);
-        AnniverseryGifts.add(971023);
-    }
 
-    public static int getDiscPrice(int uuid) {
-        if(uuid == 3040)
-            return 500000;
-        else return 10000000;
-    }
-
-    public static int getStatPrice(int uuid) {
-        switch(uuid){
-            case 250001: //5 stats
-            case 250010:
-            case 250019:
-            case 250028:
-            case 250037:
-                return 3000000;
-            case 250002: //10 stats
-            case 250011:
-            case 250020:
-            case 250029:
-            case 250038:
-                return 4000000;
-            case 250003: //15 stats
-            case 250012:
-            case 250021:
-            case 250030:
-            case 250039:
-                return 5000000;
-            case 250004: //20 stats
-            case 250013:
-            case 250022:
-            case 250031:
-            case 250040:
-                return 6000000;
-            case 250005: //25 stats
-            case 250014:
-            case 250023:
-            case 250032:
-            case 250041:
-                return 7000000;
-            case 250006: //30 stats
-            case 250015:
-            case 250024:
-            case 250033:
-            case 250042:
-                return 8000000;
-            case 250007: //35 stats
-            case 250016:
-            case 250025:
-            case 250034:
-            case 250043:
-                return 9000000;
-            case 250008: //40 stats
-            case 250017:
-            case 250026:
-            case 250035:
-            case 250044:
-                return 10000000;
-        }
-        return 10000000;
     }
 
     /*
@@ -441,10 +372,74 @@ public class ItemBase {
         return modTable;
     }
 
+    public int getVendorType() {
+        return vendorType;
+    }
+
+    public void setVendorType(int vendorType) {
+        this.vendorType = vendorType;
+    }
+
     public int getHashID() {
         return hashID;
     }
 
+    public void setHashID(int hashID) {
+        this.hashID = hashID;
+    }
+
+    private void autoIDItemsCheck() {
+        //AUto ID Vorg and Glass
+        switch (uuid) {
+
+            case 27550:
+            case 27560:
+            case 27580:
+            case 27590:
+            case 188500:
+            case 188510:
+            case 188520:
+            case 188530:
+            case 188540:
+            case 188550:
+            case 189100:
+            case 189110:
+            case 189120:
+            case 189130:
+            case 189140:
+            case 189150:
+            case 189510:
+            case 27600:
+            case 181840:
+            case 188700:
+            case 188720:
+            case 189550:
+            case 189560:
+            case 7000100:
+            case 7000110:
+            case 7000120:
+            case 7000130:
+            case 7000140:
+            case 7000150:
+            case 7000160:
+            case 7000170:
+            case 7000180:
+            case 7000190:
+            case 7000200:
+            case 7000210:
+            case 7000220:
+            case 7000230:
+            case 7000240:
+            case 7000250:
+            case 7000270:
+            case 7000280:
+                this.autoID = true;
+                break;
+            default:
+                this.autoID = false;
+        }
+    }
+
     public boolean validForSkills(ConcurrentHashMap<String, CharacterSkill> skills) {
 
         CharacterSkill characterSkill;
@@ -911,4 +906,29 @@ public class ItemBase {
     public void setOffHandAnimations(ArrayList<Integer> offHandAnimations) {
         this.offHandAnimations = offHandAnimations;
     }
+
+    public boolean isAutoID() {
+        return autoID;
+    }
+
+    public void setAutoID(boolean autoID) {
+        this.autoID = autoID;
+    }
+
+    public boolean isArmor(){
+
+        if(this.isHeavyArmor())
+            return true;
+
+        if(this.isMediumArmor())
+            return true;
+
+        if(this.isLightArmor())
+            return true;
+
+        if(this.isClothArmor())
+            return true;
+
+    return false;
+    }
 }

src/engine/objects/ItemFactory.java

@@ -73,7 +73,7 @@ public class ItemFactory {
         itemManager.updateInventory();
     }
 
-    public static Item ResourceRoll(NPC npc, PlayerCharacter pc, int itemsToRoll, int itemID, int pToken, int sToken, String customName) {
+    public static Item fillForge(NPC npc, PlayerCharacter pc, int itemsToRoll, int itemID, int pToken, int sToken, String customName) {
 
         String prefixString = "";
         String suffixString = "";
@@ -215,7 +215,7 @@ public class ItemFactory {
                 pi.setAmount(itemsToRoll);
                 pi.setRandom(false);
 
-                ItemQueue produced = ItemQueue.borrow(pi, (long) time);
+                ItemQueue produced = ItemQueue.borrow(pi, (long) (time * Float.parseFloat(ConfigManager.MB_PRODUCTION_RATE.getValue())));
                 ItemProductionManager.send(produced);
 
                 return ml;
@@ -410,7 +410,7 @@ public class ItemFactory {
 
             if (overdraft > 0 && !useWarehouse) {
                 if (pc != null)
-                    ErrorPopupMsg.sendErrorMsg(pc, "Not enough gold in building strongbox. " + ib.getName());
+                    ErrorPopupMsg.sendErrorMsg(pc, "Not enough gold in building strongbox." + ib.getName());
                 return null;
             }
 
@@ -707,7 +707,7 @@ public class ItemFactory {
 
         if (rollPrefix < 80) {
 
-            int randomPrefix = TableRoll(vendor.getLevel());
+            int randomPrefix = LootManager.TableRoll(vendor.getLevel(), false);
             prefixEntry = ModTableEntry.rollTable(prefixTypeTable.modTableID, randomPrefix);
 
             if (prefixEntry != null)
@@ -722,7 +722,7 @@ public class ItemFactory {
 
         if (rollSuffix < 80 || prefixEntry == null) {
 
-            int randomSuffix = TableRoll(vendor.getLevel());
+            int randomSuffix = LootManager.TableRoll(vendor.getLevel(), false);
             suffixEntry = ModTableEntry.rollTable(suffixTypeTable.modTableID, randomSuffix);
 
             if (suffixEntry != null)
@@ -774,43 +774,6 @@ public class ItemFactory {
         return toRoll;
     }
 
-    public static int TableRoll(int vendorLevel) {
-        // Calculate min and max based on mobLevel
-        int min = 60;
-        int max = 120;
-        switch(vendorLevel){
-            case 20:
-                min = 70;
-                max = 140;
-                break;
-            case 30:
-                min = 80;
-                max = 160;
-                break;
-            case 40:
-                min = 90;
-                max = 180;
-                break;
-            case 50:
-                min = 100;
-                max = 200;
-                break;
-            case 60:
-                min = 175;
-                max = 260;
-                break;
-            case 70:
-                min = 220;
-                max = 320;
-                break;
-        }
-
-        int roll = ThreadLocalRandom.current().nextInt(min, max + 1);
-
-        return roll;
-    }
-
-
     public static MobLoot produceRandomRoll(NPC npc, PlayerCharacter pc, String prefixString, String suffixString, int itemID) {
 
         boolean useWarehouse = false;
@@ -922,8 +885,8 @@ public class ItemFactory {
 
             ItemBase goldIB = ItemBase.getGoldItemBase();
 
-            //int baseCost = ib.getBaseValue();
+            int baseCost = ib.getBaseValue();
-            int total = ib.getBaseValue();
+            int total = (int) (baseCost + baseCost * .10);
 
             EffectsBase suffix = null;
 
@@ -936,7 +899,7 @@ public class ItemFactory {
 
             //calculate gold costs and remove from the warehouse
             if (prefix != null || suffix != null) {
-                int costToCreate = ib.getBaseValue();
+                int costToCreate = (int) (ib.getBaseValue() + ib.getBaseValue() * .10f);
                 int buildingWithdraw = BuildingManager.GetWithdrawAmountForRolling(forge, costToCreate);
                 int overdraft = BuildingManager.GetOverdraft(forge, costToCreate);
 

src/engine/objects/MenuOption.java

@@ -31,13 +31,6 @@ public class MenuOption extends AbstractGameObject {
         this.prereq = rs.getInt("prereq");
     }
 
-    public MenuOption(int id, String msg, int option){
-        this.menuID = id;
-        this.message = msg;
-        this.optionID = option;
-        this.prereq = 0;
-    }
-
     /*
      * Getters
      */

src/engine/objects/Mine.java

@@ -10,11 +10,11 @@
 package engine.objects;
 
 import engine.Enum;
-import engine.InterestManagement.InterestManager;
 import engine.InterestManagement.WorldGrid;
-import engine.gameManager.*;
+import engine.gameManager.BuildingManager;
-import engine.math.Vector3f;
+import engine.gameManager.ChatManager;
-import engine.math.Vector3fImmutable;
+import engine.gameManager.DbManager;
+import engine.gameManager.ZoneManager;
 import engine.net.ByteBufferWriter;
 import engine.net.client.msg.ErrorPopupMsg;
 import engine.server.MBServerStatics;
@@ -25,9 +25,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
 import java.util.concurrent.ConcurrentHashMap;
 
 import static engine.gameManager.DbManager.MineQueries;
@@ -54,48 +51,20 @@ public class Mine extends AbstractGameObject {
     private int buildingID;
     private MineProduction mineType;
 
-    public int openHour;
-    public int openMinute;
-    public int capSize;
-    public LocalDateTime liveTime;
-    public final HashSet<Integer> _playerMemory = new HashSet<>();
-    public ArrayList<PlayerCharacter> affectedPlayers = new ArrayList<>();
-
-    //stronghold stuff
-    public boolean isStronghold = false;
-    public ArrayList<Mob> strongholdMobs;
-    public HashMap<Integer,Integer> oldBuildings;
-
     /**
      * ResultSet Constructor
      */
     public Mine(ResultSet rs) throws SQLException, UnknownHostException {
         super(rs);
 
-        if (rs.getInt("capSize") == 0) {
-            throw new IllegalArgumentException("Mine creation canceled: capSize cannot be 0");
-        }
-
         this.mineType = MineProduction.getByName(rs.getString("mine_type"));
 
         int ownerUID = rs.getInt("mine_ownerUID");
         this.buildingID = rs.getInt("mine_buildingUID");
         this.flags = rs.getInt("flags");
         int parent = rs.getInt("parent");
-        if(ZoneManager.getZoneByUUID(parent) != null) {
+        this.parentZone = ZoneManager.getZoneByUUID(parent);
-            this.parentZone = ZoneManager.getZoneByUUID(parent);
+        this.zoneName = this.parentZone.getParent().getName();
-            this.zoneName = this.parentZone.getParent().getName();
-        }else{
-            this.parentZone = ZoneManager.getSeaFloor();
-            if(this.parentZone.getParent() != null)
-                this.zoneName = this.parentZone.getParent().getName();
-            else
-                this.zoneName = "FAILED TO LOAD ZONE";
-            Logger.error("MINE FAILED TO LOAD PARENT: ");
-            Logger.error("MINE UID: " + rs.getInt("UID"));
-            Logger.error("MINE buildingID: " + buildingID);
-
-        }
 
         this.owningGuild = Guild.getGuild(ownerUID);
         Guild nation = null;
@@ -121,15 +90,7 @@ public class Mine extends AbstractGameObject {
 
         this.production = Resource.valueOf(rs.getString("mine_resource"));
         this.lastClaimer = null;
-        this.openHour = rs.getInt("mineLiveHour");
+
-        this.openMinute = rs.getInt("mineLiveMinute");
-        this.capSize = rs.getInt("capSize");
-        this.liveTime = LocalDateTime.now().withHour(this.openHour).withMinute(this.openMinute);
-        Building tower = BuildingManager.getBuildingFromCache(this.buildingID);
-        if(tower != null){
-            tower.setMaxHitPoints(5000f * this.capSize);
-            tower.setCurrentHitPoints(tower.healthMax);
-        }
     }
 
     public static void releaseMineClaims(PlayerCharacter playerCharacter) {
@@ -182,10 +143,8 @@ public class Mine extends AbstractGameObject {
             ArrayList<Mine> serverMines = MineQueries.GET_ALL_MINES_FOR_SERVER();
 
             for (Mine mine : serverMines) {
-                if(mine.capSize != 0) {
+                Mine.mineMap.put(mine, mine.buildingID);
-                    Mine.mineMap.put(mine, mine.buildingID);
+                Mine.towerMap.put(mine.buildingID, mine);
-                    Mine.towerMap.put(mine.buildingID, mine);
-                }
             }
 
         } catch (Exception e) {
@@ -202,58 +161,56 @@ public class Mine extends AbstractGameObject {
     }
 
     public static void serializeForClientMsg(Mine mine, ByteBufferWriter writer) {
-        try {
+        writer.putInt(mine.getObjectType().ordinal());
-            writer.putInt(mine.getObjectType().ordinal());
+        writer.putInt(mine.getObjectUUID());
-            writer.putInt(mine.getObjectUUID());
+        writer.putInt(mine.getObjectUUID()); //actually a hash of mine
-            writer.putInt(mine.getObjectUUID()); //actually a hash of mine
+        writer.putString(mine.mineType.name);
-            if(mine.isStronghold){
+        writer.putString(mine.zoneName);
-                writer.putString("STRONGHOLD");
+        writer.putInt(mine.production.hash);
-                writer.putString("");
+        writer.putInt(mine.production.baseProduction);
-            }else {
+        writer.putInt(mine.getModifiedProductionAmount()); //TODO calculate range penalty here
-                writer.putString(mine.mineType.name);
+        writer.putInt(3600); //window in seconds
-                writer.putString(mine.capSize + " Man ");
-            }
-            //writer.putString(mine.zoneName + " " + mine.capSize + " Man ");
 
-            writer.putInt(mine.production.hash);
+        // Errant mines are currently open.  Set time to now.
-            writer.putInt(mine.production.baseProduction);
-            writer.putInt(mine.getModifiedProductionAmount()); //TODO calculate range penalty here
-            writer.putInt(3600); //window in seconds
 
-            LocalDateTime mineOpenTime = LocalDateTime.now().withHour(mine.openHour).withMinute(mine.openMinute).withSecond(0).withNano(0);
+        LocalDateTime mineOpenTime = LocalDateTime.now().withMinute(0).withSecond(0).withNano(0);
 
-            writer.putLocalDateTime(mineOpenTime);
+        // Mine times are those of the nation not individual guild.
-            writer.putLocalDateTime(mineOpenTime.plusMinutes(30));
-            writer.put(mine.isActive ? (byte) 0x01 : (byte) 0x00);
 
-            Building mineTower = BuildingManager.getBuilding(mine.buildingID);
+        Guild mineNatonGuild = mine.getOwningGuild().getNation();
-            if (mineTower != null) {
-                writer.putFloat(mineTower.getLoc().x);
-                writer.putFloat(mineTower.getParentZone().getLoc().y);
-                writer.putFloat(mineTower.getLoc().z);
-            } else {
-                writer.putFloat(mine.parentZone.getLoc().x);
-                writer.putFloat(mine.parentZone.getLoc().y);
-                writer.putFloat(mine.parentZone.getLoc().z);
-                Logger.error("Mine Tower Was Null For Mine: " + mine.getObjectUUID());
-            }
 
-            writer.putInt(mine.isExpansion() ? mine.mineType.xpacHash : mine.mineType.hash);
+        // Adjust the serialized mine time based upon whether
+        // the Guild's mine window has passed or not and if it was claimed.
+        // If a mine is active serialize current datetime irrespective
+        // of any claim.
+
+        if (mineNatonGuild.isEmptyGuild() == false && mine.isActive == false) {
+
+            int guildWOO = mineNatonGuild.getNation().getMineTime();
+            LocalDateTime guildMineTime = mineOpenTime.withHour(guildWOO);
+
+            if (mineOpenTime.isAfter(guildMineTime) || mine.wasClaimed == true)
+                mineOpenTime = guildMineTime.plusDays(1);
+            else
+                mineOpenTime = guildMineTime;
 
-            if (mine.isStronghold) {
-                writer.putString("");
-                GuildTag._serializeForDisplay(Guild.getErrantGuild().getGuildTag(), writer);
-                writer.putString("");
-                GuildTag._serializeForDisplay(Guild.getErrantGuild().getGuildTag(), writer);
-            }else {
-                writer.putString(mine.guildName);
-                GuildTag._serializeForDisplay(mine.guildTag, writer);
-                writer.putString(mine.nationName);
-                GuildTag._serializeForDisplay(mine.nationTag, writer);
-            }
-        } catch (Exception e) {
-            Logger.error("Failed TO Serialize Mine Because: " + e.getMessage());
         }
+
+        writer.putLocalDateTime(mineOpenTime);
+        writer.putLocalDateTime(mineOpenTime.plusHours(1));
+        writer.put(mine.isActive ? (byte) 0x01 : (byte) 0x00);
+
+        Building mineTower = BuildingManager.getBuilding(mine.buildingID);
+        writer.putFloat(mineTower.getLoc().x);
+        writer.putFloat(mineTower.getParentZone().getLoc().y);
+        writer.putFloat(mineTower.getLoc().z);
+
+        writer.putInt(mine.isExpansion() ? mine.mineType.xpacHash : mine.mineType.hash);
+
+        writer.putString(mine.guildName);
+        GuildTag._serializeForDisplay(mine.guildTag, writer);
+        writer.putString(mine.nationName);
+        GuildTag._serializeForDisplay(mine.nationTag, writer);
     }
 
     public static ArrayList<Mine> getMinesForGuild(int guildID) {
@@ -263,7 +220,8 @@ public class Mine extends AbstractGameObject {
         // Only inactive mines are returned.
 
         for (Mine mine : Mine.mineMap.keySet()) {
-            if (mine.owningGuild.getObjectUUID() == guildID)
+            if (mine.owningGuild.getObjectUUID() == guildID &&
+                    mine.isActive == false)
                 mineList.add(mine);
         }
         return mineList;
@@ -332,18 +290,24 @@ public class Mine extends AbstractGameObject {
         if (treeRank < 1)
             return false;
 
+        if (guildUnderMineLimit(playerGuild.getNation(), treeRank) == false) {
+            ErrorPopupMsg.sendErrorMsg(playerCharacter, "Your nation cannot support another mine.");
+            return false;
+        }
+
         return true;
     }
 
-    public static ArrayList<Mine> getMinesToTeleportTo(PlayerCharacter player) {
+    private static boolean guildUnderMineLimit(Guild playerGuild, int tolRank) {
-        ArrayList<Mine> mines = new ArrayList<>();
-        for(Mine mine : Mine.getMines())
-            if(!mine.isActive)
-                if(mine.getOwningGuild() != null)
-                  if(mine.getOwningGuild().getNation().equals(player.getGuild().getNation()))
-                         mines.add(mine);
 
-        return mines;
+        int mineCnt = 0;
+
+        mineCnt += Mine.getMinesForGuild(playerGuild.getObjectUUID()).size();
+
+        for (Guild guild : playerGuild.getSubGuildList())
+            mineCnt += Mine.getMinesForGuild(guild.getObjectUUID()).size();
+
+        return mineCnt <= tolRank;
     }
 
     public boolean changeProductionType(Resource resource) {
@@ -414,24 +378,12 @@ public class Mine extends AbstractGameObject {
         Building building = BuildingManager.getBuildingFromCache(this.buildingID);
         if (building != null && !this.isActive)
             building.isDeranking.compareAndSet(true, false);
-
-        if(!isAc){
-            for(PlayerCharacter player : this.affectedPlayers){
-                try {
-                    player.ZergMultiplier = 1.0f;
-                } catch(Exception e){
-                    //something went wrong resetting zerg multiplier, maybe player was deleted?
-                }
-            }
-        }
     }
 
     public boolean validForMine(Resource r) {
-        if (this.mineType == null) {
+        if (this.mineType == null)
-            Logger.error("Mine Was Null Setting Resources for Mine: " + this.getObjectUUID());
             return false;
-        }
+        return this.mineType.validForMine(r, this.isExpansion());
-        return this.mineType.validForMine(r);
     }
 
     public void serializeForMineProduction(ByteBufferWriter writer) {
@@ -442,10 +394,10 @@ public class Mine extends AbstractGameObject {
         writer.putString(this.mineType.name);
         writer.putString(this.zoneName);
         writer.putInt(this.production.hash);
-        writer.putInt(this.getModifiedProductionAmount());
+        writer.putInt(this.production.baseProduction);
         writer.putInt(this.getModifiedProductionAmount()); //TODO calculate range penalty here
         writer.putInt(3600); //window in seconds
-        writer.putInt(this.mineType.hash);
+        writer.putInt(this.isExpansion() ? this.mineType.xpacHash : this.mineType.hash);
     }
 
     @Override
@@ -586,236 +538,41 @@ public class Mine extends AbstractGameObject {
     }
 
     public int getModifiedProductionAmount() {
-        ItemBase resourceBase = ItemBase.getItemBase(this.production.UUID);
+        //TODO Calculate Distance modifications.
-        if(resourceBase == null)
-            return 0;
-        int value = resourceBase.getBaseValue();
 
-        int amount = 0;
+        //calculate base values.
-        switch(this.capSize){
+        int baseProduction = this.production.baseProduction;
-            case 3:
+        float baseModValue = this.production.baseProduction * .1f;
-                amount = 1800000;
+        float rankModValue = this.production.baseProduction * .0143f;
-                break;
+        float totalModded = 0;
-            case 5:
+
-                amount = 3000000;
+        //get Mine Building.
-                break;
+        Building mineBuilding = BuildingManager.getBuilding(this.buildingID);
-            case 10:
+        if (mineBuilding == null)
-                amount = 6000000;
+            return this.production.baseProduction;
-                break;
+        for (AbstractCharacter harvester : mineBuilding.getHirelings().keySet()) {
-            case 20:
+            totalModded += baseModValue;
-                amount = 12000000;
+            totalModded += rankModValue * harvester.getRank();
-                break;
         }
-        if(this.production.UUID == 7)
+        //add base production on top;
-            value = 1;
+        totalModded += baseProduction;
+        //skip distance check for expansion.
+        if (this.isExpansion())
+            return (int) totalModded;
 
-        amount = amount / value;
+        if (this.owningGuild.isEmptyGuild() == false) {
+            if (this.owningGuild.getOwnedCity() != null) {
+                float distanceSquared = this.owningGuild.getOwnedCity().getLoc().distanceSquared2D(mineBuilding.getLoc());
 
-        return amount;
+                if (distanceSquared > sqr(10000 * 3))
-    }
+                    totalModded *= .25f;
-    public void onEnter() {
+                else if (distanceSquared > sqr(10000 * 2))
-
+                    totalModded *= .50f;
-        Building tower = BuildingManager.getBuildingFromCache(this.buildingID);
+                else if (distanceSquared > sqr(10000))
-        if(tower == null)
+                    totalModded *= .75f;
-            return;
-
-        // Gather current list of players within the zone bounds
-
-        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) {
-
-            if (playerObject == null)
-                continue;
-
-            PlayerCharacter player = (PlayerCharacter) playerObject;
-
-            if(this.affectedPlayers.contains(player) == false)
-                this.affectedPlayers.add(player);
-
-            if(!this._playerMemory.contains(player.getObjectUUID())){
-                this._playerMemory.add(player.getObjectUUID());
-            }
-            Guild nation = player.guild.getNation();
-            if(charactersByNation.containsKey(nation)){
-                if(!charactersByNation.get(nation).contains(player)) {
-                    charactersByNation.get(nation).add(player);
-                    if(!updatedNations.contains(nation)){
-                        updatedNations.add(nation);
-                    }
-                }
-            }else{
-                ArrayList<PlayerCharacter> players = new ArrayList<>();
-                players.add(player);
-                charactersByNation.put(nation,players);
-                if(!updatedNations.contains(nation)){
-                    updatedNations.add(nation);
-                }
             }
         }
-        for(Guild nation : updatedNations){
+        return (int) totalModded;
-            float multiplier = ZergManager.getCurrentMultiplier(charactersByNation.get(nation).size(),this.capSize);
-            for(PlayerCharacter player : charactersByNation.get(nation)){
-                player.ZergMultiplier = multiplier;
-            }
-        }
-        try
-        {
-            this.onExit(this._playerMemory);
-        }
-        catch(Exception ignored){
-
-        }
     }
 
-    private void onExit(HashSet<Integer> currentMemory) {
-
-        Building tower = BuildingManager.getBuildingFromCache(this.buildingID);
-        if(tower == null)
-            return;
-        ArrayList<Integer>toRemove = new ArrayList<>();
-        HashSet<AbstractWorldObject> currentPlayers = WorldGrid.getObjectsInRangePartial(tower.loc, Enum.CityBoundsType.GRID.extents, MBServerStatics.MASK_PLAYER);
-        for(Integer id : currentMemory){
-            PlayerCharacter pc = PlayerCharacter.getPlayerCharacter(id);
-            if(currentPlayers.contains(pc) == false){
-                toRemove.add(id);
-                pc.ZergMultiplier = 1.0f;
-            }
-        }
-
-        // Remove players from city memory
-
-        _playerMemory.removeAll(toRemove);
-    }
-    public static Building getTower(Mine mine){
-        Building tower = BuildingManager.getBuildingFromCache(mine.buildingID);
-        if(tower != null)
-            return tower;
-        else
-            return null;
-    }
-    public static void serializeForClientMsgTeleport(Mine mine, ByteBufferWriter writer) {
-        AbstractCharacter guildRuler;
-        Guild rulingGuild;
-        Guild rulingNation;
-        java.time.LocalDateTime dateTime1900;
-
-        // Cities aren't a mine without a TOL. Time to early exit.
-        // No need to spam the log here as non-existant TOL's are indicated
-        // during bootstrap routines.
-        Building tower = Mine.getTower(mine);
-        if (tower == null) {
-
-            Logger.error("NULL TOWER FOR " + mine.zoneName + " mine");
-            return;
-        }
-
-
-        // Assign mine owner
-
-        if (tower.getOwner() != null)
-            guildRuler = tower.getOwner();
-        else
-            guildRuler = null;
-
-        // If is an errant tree, use errant guild for serialization.
-        // otherwise we serialize the soverign guild
-
-        if (guildRuler == null)
-            rulingGuild = Guild.getErrantGuild();
-        else
-            rulingGuild = guildRuler.getGuild();
-
-        rulingNation = rulingGuild.getNation();
-
-        // Begin Serialzing soverign guild data
-        writer.putInt(mine.getObjectType().ordinal());
-        writer.putInt(mine.getObjectUUID());
-        writer.putString(mine.zoneName + " Mine");
-        writer.putInt(rulingGuild.getObjectType().ordinal());
-        writer.putInt(rulingGuild.getObjectUUID());
-
-        writer.putString(rulingGuild.getName());
-        writer.putString("");
-        writer.putString(rulingGuild.getLeadershipType());
-
-        // Serialize guild ruler's name
-        // If tree is abandoned blank out the name
-        // to allow them a rename.
-
-        if (guildRuler == null)
-            writer.putString("");
-        else
-            writer.putString(guildRuler.getFirstName() + ' ' + guildRuler.getLastName());
-
-        writer.putInt(rulingGuild.getCharter());
-        writer.putInt(0); // always 00000000
-
-        writer.put((byte)0);
-
-        writer.put((byte) 1);
-        writer.put((byte) 1);  // *** Refactor: What are these flags?
-        writer.put((byte) 1);
-        writer.put((byte) 1);
-        writer.put((byte) 1);
-
-        GuildTag._serializeForDisplay(rulingGuild.getGuildTag(), writer);
-        GuildTag._serializeForDisplay(rulingNation.getGuildTag(), writer);
-
-        writer.putInt(0);// TODO Implement description text
-
-        writer.put((byte) 1);
-        writer.put((byte) 0);
-        writer.put((byte) 1);
-
-        // Begin serializing nation guild info
-
-        if (rulingNation.isEmptyGuild()) {
-            writer.putInt(rulingGuild.getObjectType().ordinal());
-            writer.putInt(rulingGuild.getObjectUUID());
-        } else {
-            writer.putInt(rulingNation.getObjectType().ordinal());
-            writer.putInt(rulingNation.getObjectUUID());
-        }
-
-
-        // Serialize nation name
-
-        if (rulingNation.isEmptyGuild())
-            writer.putString("None");
-        else
-            writer.putString(rulingNation.getName());
-
-        writer.putInt(1);
-
-        writer.putInt(0xFFFFFFFF);
-
-        writer.putInt(0);
-
-        if (rulingNation.isEmptyGuild())
-            writer.putString(" ");
-        else
-            writer.putString(Guild.GetGL(rulingNation).getFirstName() + ' ' + Guild.GetGL(rulingNation).getLastName());
-
-        writer.putLocalDateTime(LocalDateTime.now());
-
-        if(tower != null) {
-            writer.putFloat(tower.loc.x);
-            writer.putFloat(tower.loc.y);
-            writer.putFloat(tower.loc.z);
-        } else{
-            writer.putFloat(0);
-            writer.putFloat(0);
-            writer.putFloat(0);
-        }
-        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/objects/MineProduction.java

@@ -13,19 +13,21 @@ import java.util.HashMap;
 
 public enum MineProduction {
 
-    LUMBER("Lumber Camp", new HashMap<>(), 1618637196, 1663491950),
+    LUMBER("Lumber Camp", new HashMap<>(), Resource.WORMWOOD, 1618637196, 1663491950),
-    ORE("Ore Mine", new HashMap<>(), 518103023, -788976428),
+    ORE("Ore Mine", new HashMap<>(), Resource.OBSIDIAN, 518103023, -788976428),
-    MAGIC("Magic Mine", new HashMap<>(), 504746863, -1753567069),
+    GOLD("Gold Mine", new HashMap<>(), Resource.GALVOR, -662193002, -1227205358),
-    GOLDMINE("Gold Mine", new HashMap<>(), -662193002, -1227205358);
+    MAGIC("Magic Mine", new HashMap<>(), Resource.BLOODSTONE, 504746863, -1753567069);
 
     public final String name;
     public final HashMap<Integer, Resource> resources;
+    public final Resource xpac;
     public final int hash;
     public final int xpacHash;
 
-    MineProduction(String name, HashMap<Integer, Resource> resources,int hash, int xpacHash) {
+    MineProduction(String name, HashMap<Integer, Resource> resources, Resource xpac, int hash, int xpacHash) {
         this.name = name;
         this.resources = resources;
+        this.xpac = xpac;
         this.hash = hash;
         this.xpacHash = xpacHash;
     }
@@ -37,7 +39,6 @@ public enum MineProduction {
             MineProduction.LUMBER.resources.put(1580005, Resource.OAK);
             MineProduction.LUMBER.resources.put(1580006, Resource.BRONZEWOOD);
             MineProduction.LUMBER.resources.put(1580007, Resource.MANDRAKE);
-            MineProduction.LUMBER.resources.put(1580018, Resource.WORMWOOD);
         }
         if (MineProduction.ORE.resources.size() == 0) {
             MineProduction.ORE.resources.put(7, Resource.GOLD);
@@ -45,16 +46,14 @@ public enum MineProduction {
             MineProduction.ORE.resources.put(1580001, Resource.TRUESTEEL);
             MineProduction.ORE.resources.put(1580002, Resource.IRON);
             MineProduction.ORE.resources.put(1580003, Resource.ADAMANT);
-            MineProduction.ORE.resources.put(1580019, Resource.OBSIDIAN);
         }
-        if (MineProduction.GOLDMINE.resources.size() == 0) {
+        if (MineProduction.GOLD.resources.size() == 0) {
-            MineProduction.GOLDMINE.resources.put(7, Resource.GOLD);
+            MineProduction.GOLD.resources.put(7, Resource.GOLD);
-            MineProduction.GOLDMINE.resources.put(1580000, Resource.STONE);
+            MineProduction.GOLD.resources.put(1580000, Resource.STONE);
-            MineProduction.GOLDMINE.resources.put(1580008, Resource.COAL);
+            MineProduction.GOLD.resources.put(1580008, Resource.COAL);
-            MineProduction.GOLDMINE.resources.put(1580009, Resource.AGATE);
+            MineProduction.GOLD.resources.put(1580009, Resource.AGATE);
-            MineProduction.GOLDMINE.resources.put(1580010, Resource.DIAMOND);
+            MineProduction.GOLD.resources.put(1580010, Resource.DIAMOND);
-            MineProduction.GOLDMINE.resources.put(1580011, Resource.ONYX);
+            MineProduction.GOLD.resources.put(1580011, Resource.ONYX);
-            MineProduction.GOLDMINE.resources.put(1580017, Resource.GALVOR);
         }
         if (MineProduction.MAGIC.resources.size() == 0) {
             MineProduction.MAGIC.resources.put(7, Resource.GOLD);
@@ -63,25 +62,27 @@ public enum MineProduction {
             MineProduction.MAGIC.resources.put(1580014, Resource.ANTIMONY);
             MineProduction.MAGIC.resources.put(1580015, Resource.SULFUR);
             MineProduction.MAGIC.resources.put(1580016, Resource.QUICKSILVER);
-            MineProduction.MAGIC.resources.put(1580020, Resource.BLOODSTONE);
         }
     }
 
     public static MineProduction getByName(String name) {
-        if (name.equalsIgnoreCase("lumber"))
+        if (name.toLowerCase().equals("lumber"))
             return MineProduction.LUMBER;
-        else if (name.equalsIgnoreCase("ore"))
+        else if (name.toLowerCase().equals("ore"))
             return MineProduction.ORE;
-        else if (name.equalsIgnoreCase("gold"))
+        else if (name.toLowerCase().equals("gold"))
-            return MineProduction.GOLDMINE;
+            return MineProduction.GOLD;
         else
             return MineProduction.MAGIC;
     }
 
-    public boolean validForMine(Resource r) {
+    public boolean validForMine(Resource r, boolean isXpac) {
         if (r == null)
             return false;
-        return this.resources.containsKey(r.UUID);
+        if (this.resources.containsKey(r.UUID))
+            return true;
+        else
+            return isXpac && r.UUID == this.xpac.UUID;
     }
 
 

src/engine/objects/MobBase.java

@@ -27,6 +27,7 @@ public class MobBase extends AbstractGameObject {
     private final String firstName;
     private final byte level;
     private final float scale;
+    public final ArrayList<MobBaseEffects> effectsList;
     public int bootySet;
     public Enum.MobBehaviourType fsm;
     public EnumBitSet<Enum.MonsterType> notEnemy;
@@ -42,10 +43,6 @@ public class MobBase extends AbstractGameObject {
     private int goldMod;
     private int seeInvis;
     private int spawnTime = 0;
-    private int defense = 0;
-    private int atr = 0;
-    private float minDmg = 0;
-    private float maxDmg = 0;
     private float attackRange;
     private boolean isNecroPet = false;
     private MobBaseStats mobBaseStats;
@@ -108,6 +105,8 @@ public class MobBase extends AbstractGameObject {
 
         this.mobBaseStats = DbManager.MobBaseQueries.LOAD_STATS(this.loadID);
         DbManager.MobBaseQueries.LOAD_ALL_MOBBASE_SPEEDS(this);
+        //load effects for mobbase
+        this.effectsList = DbManager.MobBaseQueries.GET_RUNEBASE_EFFECTS(this.loadID);
 
     }
 
@@ -245,30 +244,6 @@ public class MobBase extends AbstractGameObject {
         return mobBaseStats;
     }
 
-    public float getMaxDmg() {
-        return maxDmg;
-    }
-
-    public float getMinDmg() {
-        return minDmg;
-    }
-
-    public int getAtr() {
-        return atr;
-    }
-
-    public void setAtr(int atr) {
-        this.atr = atr;
-    }
-
-    public int getDefense() {
-        return defense;
-    }
-
-    public void setDefense(int defense) {
-        this.defense = defense;
-    }
-
     public float getAttackRange() {
         return attackRange;
     }

src/engine/objects/MobBaseStats.java

@@ -21,6 +21,9 @@ public class MobBaseStats {
     private final int baseSpi;
     private final int baseDex;
 
+    private final int mobbaseSkill;
+    private final int mobbaseSkillAmount;
+
 
     /**
      * ResultSet Constructor
@@ -31,6 +34,8 @@ public class MobBaseStats {
         this.baseCon = rs.getInt("Constitution");
         this.baseSpi = rs.getInt("Spirit");
         this.baseDex = rs.getInt("Dexterity");
+        this.mobbaseSkill = rs.getInt("baseSkills");
+        this.mobbaseSkillAmount = rs.getInt("skillAmount");
     }
 
     /**
@@ -43,6 +48,8 @@ public class MobBaseStats {
         this.baseCon = 0;
         this.baseSpi = 0;
         this.baseDex = 0;
+        this.mobbaseSkill = 0;
+        this.mobbaseSkillAmount = 0;
     }
 
     public static MobBaseStats GetGenericStats() {
@@ -72,5 +79,8 @@ public class MobBaseStats {
         return baseDex;
     }
 
+    public int getBaseSkill(){return mobbaseSkill;}
+
+    public int getBaseSkillAmount(){return mobbaseSkillAmount;}
 
 }

src/engine/objects/MobEquipment.java

@@ -34,8 +34,7 @@ public class MobEquipment extends AbstractGameObject {
     private AbstractPowerAction suffix;
     private int pValue;
     private int sValue;
-    int magicValue;
+    private int magicValue;
-    public boolean fromNoob = false;
 
     private float dropChance = 0;
 
@@ -107,6 +106,7 @@ public class MobEquipment extends AbstractGameObject {
 
     public static void serializeForVendor(MobEquipment mobEquipment, ByteBufferWriter writer, float percent) throws SerializationException {
         _serializeForClientMsg(mobEquipment, writer, false);
+        int baseValue = mobEquipment.itemBase.getBaseValue() + mobEquipment.itemBase.getMagicValue();
         writer.putInt(mobEquipment.magicValue);
         writer.putInt(mobEquipment.magicValue);
     }

src/engine/objects/MobLoot.java

@@ -77,7 +77,7 @@ public final class MobLoot extends Item {
             this.setNumOfItems(quantity);
 
         this.noSteal = noSteal;
-        this.setIsID(true);
+        this.setIsID(this.getItemBase().isAutoID());
 
         // Class is 'final'; passing 'this' should be okay at the end of the constructor