fixed build error

# Conflicts:
#	src/engine/gameManager/LootManager.java

src/engine/Enum.java

@@ -9,13 +9,15 @@
 package engine;
 
 import ch.claude_martin.enumbitset.EnumBitSetHelper;
-import engine.gameManager.BuildingManager;
 import engine.gameManager.ConfigManager;
 import engine.gameManager.PowersManager;
 import engine.gameManager.ZoneManager;
 import engine.math.Vector2f;
 import engine.math.Vector3fImmutable;
-import engine.objects.*;
+import engine.objects.AbstractCharacter;
+import engine.objects.ItemBase;
+import engine.objects.Shrine;
+import engine.objects.Zone;
 import engine.powers.EffectsBase;
 import org.pmw.tinylog.Logger;
 
@@ -150,7 +152,9 @@ public class Enum {
         NEPHFEMALE(2026, MonsterType.Nephilim, RunSpeed.STANDARD, CharacterSex.FEMALE, 1.1f),
         HALFGIANTFEMALE(2027, MonsterType.HalfGiant, RunSpeed.STANDARD, CharacterSex.FEMALE, 1.15f),
         VAMPMALE(2028, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.MALE, 1),
-        VAMPFEMALE(2029, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.FEMALE, 1);
+        VAMPFEMALE(2029, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.FEMALE, 1),
+        SAETOR(1999, MonsterType.Minotaur, RunSpeed.MINOTAUR, CharacterSex.MALE, 0.80000001f),
+        LIZARDMAN(1998, MonsterType.Reptile, RunSpeed.STANDARD, CharacterSex.MALE, 1.05f);
 
         @SuppressWarnings("unchecked")
         private static HashMap<Integer, RaceType> _raceTypeByID = new HashMap<>();
@@ -170,8 +174,6 @@ public class Enum {
         }
 
         public static RaceType getRaceTypebyRuneID(int runeID) {
-            if(runeID == 1999)
-                return _raceTypeByID.get(2017);
             return _raceTypeByID.get(runeID);
         }
 
@@ -208,8 +210,9 @@ 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),
-        IREKEI(6.499500105f, 14.6685f, 4.2199998f, 14.6685f, 6.3299999f, 18.379999f, 6.5f);
+        IREKEI(6.35f, 15.25f, 4.2199998f, 14.5f, 6.3299999f, 18.379999f, 6.5f),
+        MINOTAUR(6.6300001f, 15.95f, 4.2199998f, 15.95f, 6.3299999f, 18.379999f, 6.5f);
+
         private float walkStandard;
         private float walkCombat;
         private float runStandard;
@@ -469,14 +472,11 @@ public class Enum {
 
                 // 14001 does not have a banestone to bind at
 
-                if (ruinZone.getLoadNum() == 14001) {
+                if (ruinZone.getLoadNum() == 14001)
                     spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc(), 30);
-                }else {
-                    //spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc()
-                    //.add(new Vector3fImmutable(-196.016f, 2.812f, 203.621f)), 30);
-                        spawnLocation = Vector3fImmutable.getRandomPointOnCircle(BuildingManager.getBuilding(27977).loc,30f);
-
-                }
+                else
+                    spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc()
+                            .add(new Vector3fImmutable(-196.016f, 2.812f, 203.621f)), 30);
             }
 
 
@@ -779,7 +779,6 @@ public class Enum {
         Combat,
         Spires,
         Snare,
-        Snared,
         Stun,
         Blind,
         Root,
@@ -882,7 +881,6 @@ public class Enum {
         Siege,
         Slash,
         Snare,
-        Snared,
         Sorcery,
         Spear,
         SpearMastery,
@@ -962,21 +960,20 @@ public class Enum {
         Wizardry;
 
         public static SourceType GetSourceType(String modName) {
-            switch(modName){
-                case "Slashing":
-                    modName = "Slash";
+            SourceType returnMod;
+            if (modName.isEmpty())
+                return SourceType.None;
+            switch(modName) {
+                case "Piercing":
+                    modName = "Pierce";
                     break;
                 case "Crushing":
                     modName = "Crush";
                     break;
-                case "Piercing":
-                    modName = "Pierce";
+                case "Slashing":
+                    modName = "Slash";
                     break;
             }
-            SourceType returnMod;
-            if (modName.isEmpty())
-                return SourceType.None;
-
             try {
                 returnMod = SourceType.valueOf(modName.replace(",", ""));
             } catch (Exception e) {
@@ -1032,7 +1029,6 @@ public class Enum {
         Silence,
         Slash,
         Snare,
-        Snared,
         Stance,
         Stun,
         Summon,
@@ -1157,7 +1153,6 @@ public class Enum {
         SkillDebuff,
         SlashResistanceDebuff,
         Snare,
-        Snared,
         StackableAttrCONBuff,
         StackableAttrDEXBuff,
         StackableAttrSTRBuff,
@@ -1670,6 +1665,24 @@ public class Enum {
             return extents;
         }
 
+        public boolean isTrainerBuilding(){
+            switch(this){
+                case AMAZONHALL:
+                case CATHEDRAL:
+                case GREATHALL:
+                case KEEP:
+                case THIEFHALL:
+                case TEMPLEHALL:
+                case WIZARDHALL:
+                case ELVENHALL:
+                case ELVENSANCTUM:
+                case IREKEIHALL:
+                case FORESTHALL:
+                    return true;
+            }
+            return false;
+        }
+
     }
 
     public enum UpdateType {
@@ -2324,9 +2337,9 @@ public class Enum {
 
     public enum CityBoundsType {
 
-        GRID(544),
-        ZONE(672),
-        PLACEMENT(673);
+        GRID(640),
+        ZONE(680),
+        PLACEMENT(681);
 
         public final float extents;
 
@@ -2840,7 +2853,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),
@@ -2865,6 +2877,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),
@@ -2875,13 +2888,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 MobBehaviourType BehaviourHelperType;
-        public boolean isWimpy;
-        public boolean isAgressive;
-        public boolean canRoam;
-        public boolean callsForHelp;
-        public boolean respondsToCallForHelp;
+        public final MobBehaviourType BehaviourHelperType;
+        public final boolean isWimpy;
+        public final boolean isAgressive;
+        public final boolean canRoam;
+        public final boolean callsForHelp;
+        public final boolean respondsToCallForHelp;
 
         MobBehaviourType(MobBehaviourType helpeebehaviourType, boolean wimpy, boolean agressive, boolean canroam, boolean callsforhelp, boolean respondstocallforhelp) {
             this.BehaviourHelperType = helpeebehaviourType;
@@ -2898,6 +2910,8 @@ public class Enum {
         MOBILE,
         PET,
         CHARMED,
+
+        SIEGEENGINE,
         GUARD;
     }
 }

src/engine/InterestManagement/InterestManager.java

@@ -19,9 +19,13 @@ 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 engine.util.BoxTracker;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
@@ -106,7 +110,7 @@ public enum InterestManager implements Runnable {
             origin.sendMsg(moveMsg);
     }
 
-    public static void reloadCharacter(AbstractCharacter absChar) {
+    public static void reloadCharacter(AbstractCharacter absChar, boolean sendToSelf) {
 
         UnloadObjectsMsg uom = new UnloadObjectsMsg();
         uom.addObject(absChar);
@@ -207,7 +211,7 @@ public enum InterestManager implements Runnable {
             if (origin == null)
                 continue;
 
-            if (!playerCharacter.isEnteredWorld())
+            if (!playerCharacter.enteredWorld)
                 continue;
 
             if (playerCharacter.getTeleportLock().readLock().tryLock()) {
@@ -464,7 +468,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 +481,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 +522,11 @@ public enum InterestManager implements Runnable {
 
         // Update loaded upbjects lists
 
-        player.isBoxed = PlayerCharacter.checkIfBoxed(player);
         player.setDirtyLoad(true);
         updateStaticList(player, origin);
         updateMobileList(player, origin);
+        BoxTracker.addPlayer(origin.machineID,player);
+
     }
 
     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.math.Vector3fImmutable;
-import engine.objects.*;
+import engine.objects.Bane;
+import engine.objects.Building;
+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/dbBlueprintHandler.java

@@ -73,6 +73,14 @@ public class dbBlueprintHandler extends dbHandlerBase {
                 Blueprint._meshLookup.putIfAbsent(thisBlueprint.getMeshForRank(3), thisBlueprint);
                 Blueprint._meshLookup.putIfAbsent(thisBlueprint.getMeshForRank(7), thisBlueprint);
 
+                if(thisBlueprint.getName().contains("Vampire Shrine")){
+                    Blueprint saetorShrine = new Blueprint(rs);
+                    saetorShrine.setBlueprintUUID(1720000);
+                    saetorShrine.rank1UUID = 1720000;
+                    saetorShrine.rank3UUID = 1720000;
+                    saetorShrine.rank7UUID = 1720000;
+                }
+
             }
 
         } catch (SQLException e) {

src/engine/db/handlers/dbCharacterSkillHandler.java

@@ -14,6 +14,7 @@ import engine.gameManager.DbManager;
 import engine.objects.AbstractCharacter;
 import engine.objects.CharacterSkill;
 import engine.objects.PlayerCharacter;
+import engine.objects.SkillsBase;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 

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();
-                 PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_npc_contract_selltype` WHERE `contractID` = ?;")) {
+        try (Connection connection = DbManager.getConnection();
+             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 value = rs.getInt("value");
+                int type = rs.getInt("type");
+                int value = rs.getInt("value");
 
-                    switch (type) {
-                        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))
+                switch (type) {
+                    case 1:
                         contract.getBuyItemType().add(value);
-
-                    if(!contract.getBuyUnknownToken().contains(value))
+                        break;
+                    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,23 +57,10 @@ 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){

src/engine/db/handlers/dbItemBaseHandler.java

@@ -22,17 +22,73 @@ import java.util.HashMap;
 
 public class dbItemBaseHandler extends dbHandlerBase {
 
-    public static final HashMap<Integer,Float> dexReductions = new HashMap<>();
     public dbItemBaseHandler() {
 
     }
 
     public void LOAD_BAKEDINSTATS(ItemBase itemBase) {
 
+        int itemBaseID = itemBase.getUUID();
+        switch(itemBaseID){
+            case 27550://bow
+            case 27560://dagger
+            case 27570://hammer
+            case 27580://axe
+            case 27590://sword
+                //return new String[]{"PRE-010","SUF-260"};
+                itemBaseID =  8000000;
+                break;
+            case 27600://staff
+                //return new String[]{"PRE-334","PRE-315"};
+                itemBaseID =  8000010;
+                break;
+
+            case 188500://HA chest
+            case 188510://HA arms
+            case 188520://HA legs
+            case 188530://HA gloves
+            case 188550://HA helm
+            case 188720://CC hood
+            case 188900://MA chest
+            case 188910://MA Sleeves
+            case 188920://MA Legs
+            case 188930://MA gloves
+            case 188950://MA helm
+            case 189100://la chest
+            case 189110://la arms
+            case 189120://la legs
+            case 189130://la gloves
+            case 189150://la helm
+            case 189550://CC gloves
+                //return new String[]{"PRE-130", "PRE-232", "PRE-212", "PRE-222", "SUF-007"};
+                itemBaseID = 8000020;
+                break;
+
+            case 188540://HA boots
+            case 188940://MA boots
+            case 189140://LA boots
+            case 189560://CC boots
+                //return new String[]{"PRE-133", "PRE-230", "PRE-210", "PRE-220", "SUF-003","SUF-150"};
+                itemBaseID = 8000030;
+                break;
+
+            case 188700://CC robe
+                //return new String[]{"PRE-130", "PRE-232", "PRE-212", "PRE-222","SUF-317","SUF-317","SUF-317"};
+                itemBaseID = 8000040;
+                break;
+
+            case 189500://MA shield
+            case 189510://HA shield
+                //return new String[]{"PRE-125","PRE-125","PRE-125", "PRE-230", "PRE-210", "PRE-220"};
+                itemBaseID = 8000050;
+        }
+
+
+
         try (Connection connection = DbManager.getConnection();
              PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_item_bakedinstat` WHERE `itemID` = ?")) {
 
-            preparedStatement.setInt(1, itemBase.getUUID());
+            preparedStatement.setInt(1, itemBaseID);
             ResultSet rs = preparedStatement.executeQuery();
 
             while (rs.next()) {
@@ -46,14 +102,6 @@ public class dbItemBaseHandler extends dbHandlerBase {
         }
     }
 
-    public void LOAD_DEX_REDUCTION(ItemBase itemBase) {
-        if(dexReductions.containsKey(itemBase.getUUID())){
-            itemBase.dexReduction = dexReductions.get(itemBase.getUUID());
-        }else{
-            itemBase.dexReduction = 0.0f;
-        }
-    }
-
     public void LOAD_ANIMATIONS(ItemBase itemBase) {
 
         ArrayList<Integer> tempList = new ArrayList<>();
@@ -96,28 +144,20 @@ public class dbItemBaseHandler extends dbHandlerBase {
                 recordsRead++;
                 itemBase = new ItemBase(rs);
                 ItemBase.addToCache(itemBase);
+
+                //copy the vampire shrine for saetor and change uuid and name
+                if(itemBase.getName().contains("Vampire Shrine")){
+                    ItemBase saetorShrine = new ItemBase(rs);
+                    saetorShrine.setUUID(1035);
+                    saetorShrine.setName(saetorShrine.getName().replace("Vampire","Saetor"));
+                    ItemBase.addToCache(saetorShrine);
+                }
             }
 
         } catch (SQLException e) {
             Logger.error(e);
         }
-
         Logger.info("read: " + recordsRead + " cached: " + ItemBase.getUUIDCache().size());
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_item_dexpenalty`")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-
-            // Check if a result was found
-            if (rs.next()) {
-                int ID = rs.getInt("ID");
-                float factor = rs.getInt("item_bulk_factor");
-                dexReductions.put(ID,factor);
-            }
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
     }
 
     public HashMap<Integer, ArrayList<Integer>> LOAD_RUNES_FOR_NPC_AND_MOBS() {

src/engine/db/handlers/dbItemHandler.java

@@ -134,13 +134,13 @@ public class dbItemHandler extends dbHandlerBase {
 
             ResultSet rs = preparedStatement.executeQuery();
 
-            if (rs.next()) {
+            if (rs.next())
                 try {
                     worked = rs.getBoolean("result");
                 }catch(Exception e){
-                    worked = false;
+                    return true;
                 }
-            }
+
         } catch (SQLException e) {
             Logger.error(e);
         }
@@ -354,7 +354,11 @@ public class dbItemHandler extends dbHandlerBase {
             ResultSet rs = preparedStatement.executeQuery();
 
             if (rs.next())
-                worked = rs.getBoolean("result");
+                try {
+                    worked = rs.getBoolean("result");
+                } catch(Exception e){
+                    worked = true;
+                }
 
         } catch (SQLException e) {
             Logger.error(e);

src/engine/db/handlers/dbMineHandler.java

@@ -9,12 +9,14 @@
 package engine.db.handlers;
 
 import engine.Enum;
+import engine.gameManager.BuildingManager;
 import engine.gameManager.DbManager;
 import engine.objects.Mine;
 import engine.objects.MineProduction;
 import engine.objects.Resource;
 import org.pmw.tinylog.Logger;
 
+import java.net.UnknownHostException;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -32,8 +34,24 @@ public class dbMineHandler extends dbHandlerBase {
 
         if (id == 0)
             return null;
-
         Mine mine = (Mine) DbManager.getFromCache(Enum.GameObjectType.Mine, id);
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM obj_mine;")) {
+
+            //preparedStatement.setInt(1, id);
+
+            ResultSet rs = preparedStatement.executeQuery();
+            while(rs.next()){
+                if(rs.getInt("UID") == id){
+                    int towerUID = rs.getInt("mine_buildingUID");
+                    mine = Mine.getMineFromTower(towerUID);
+                }
+            }
+
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
 
         if (mine != null)
             return mine;
@@ -56,13 +74,27 @@ public class dbMineHandler extends dbHandlerBase {
 
         ArrayList<Mine> mines = new ArrayList<>();
 
+        //try (Connection connection = DbManager.getConnection();
+        //     PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_mine`.*, `object`.`parent` FROM `object` INNER JOIN `obj_mine` ON `obj_mine`.`UID` = `object`.`UID`")) {
+
+        //    ResultSet rs = preparedStatement.executeQuery();
+        //    mines = getObjectsFromRs(rs, 1000);
+
+       // } catch (SQLException e) {
+        //    Logger.error(e);
+        //}
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_mine`.*, `object`.`parent` FROM `object` INNER JOIN `obj_mine` ON `obj_mine`.`UID` = `object`.`UID`")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM obj_mine;")) {
 
             ResultSet rs = preparedStatement.executeQuery();
-            mines = getObjectsFromRs(rs, 1000);
+            while(rs.next()){
+                if(BuildingManager.getBuildingFromCache(rs.getInt("mine_buildingUID")) == null)
+                    continue;
 
-        } catch (SQLException e) {
+                mines.add(new Mine(rs));
+            }
+
+        } catch (SQLException | UnknownHostException e) {
             Logger.error(e);
         }
         return mines;

src/engine/db/handlers/dbMobBaseHandler.java

@@ -21,6 +21,7 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.HashMap;
 
 public class dbMobBaseHandler extends dbHandlerBase {
 
@@ -112,6 +113,25 @@ public class dbMobBaseHandler extends dbHandlerBase {
         return mobBaseStats;
     }
 
+    public void LOAD_ALL_MOBBASE_RACES() {
+        MobBase.mobbase_race_types = new HashMap<>();
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_npc_mobbase`;")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+
+            while (rs.next()) {
+                int id = rs.getInt("loadID");
+                if(MobBase.mobbase_race_types.containsKey(id) == false){
+                    MobBase.mobbase_race_types.put(id,rs.getString("raceType"));
+                }
+            }
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+    }
+
     public void LOAD_ALL_MOBBASE_SPEEDS(MobBase mobBase) {
 
         if (mobBase.getLoadID() == 0)

src/engine/db/handlers/dbMobHandler.java

@@ -28,31 +28,26 @@ 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.setLong(1, toAdd.getParentZoneID());
-            preparedStatement.setInt(2, toAdd.getMobBaseID());
-            preparedStatement.setInt(3, toAdd.getGuildUUID());
-            preparedStatement.setFloat(4, toAdd.getSpawnX());
-            preparedStatement.setFloat(5, toAdd.getSpawnY());
-            preparedStatement.setFloat(6, toAdd.getSpawnZ());
+            preparedStatement.setLong(1, toAdd.parentZoneUUID);
+            preparedStatement.setInt(2, toAdd.loadID);
+            preparedStatement.setInt(3, toAdd.guildUUID);
+            preparedStatement.setFloat(4, toAdd.bindLoc.x);
+            preparedStatement.setFloat(5, toAdd.bindLoc.y);
+            preparedStatement.setFloat(6, toAdd.bindLoc.z);
             preparedStatement.setInt(7, 0);
-            preparedStatement.setFloat(8, toAdd.getSpawnRadius());
-            preparedStatement.setInt(9, toAdd.getTrueSpawnTime());
-
-            if (toAdd.getContract() != null)
-                preparedStatement.setInt(10, toAdd.getContract().getContractID());
-            else
-                preparedStatement.setInt(10, 0);
-
-            preparedStatement.setInt(11, toAdd.getBuildingID());
-            preparedStatement.setInt(12, toAdd.getLevel());
-            preparedStatement.setString(13, toAdd.getFirstName());
+            preparedStatement.setFloat(8, toAdd.spawnRadius);
+            preparedStatement.setInt(9, toAdd.spawnTime);
+            preparedStatement.setInt(10, toAdd.contractUUID);
+            preparedStatement.setInt(11, toAdd.buildingUUID);
+            preparedStatement.setInt(12, toAdd.level);
+            preparedStatement.setString(13, toAdd.firstName);
 
             ResultSet rs = preparedStatement.executeQuery();
 
@@ -106,17 +101,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");
-                Mob toCreate = Mob.createGuardMob(captain, captain.getGuild(), captain.getParentZone(), captain.building.getLoc(), captain.getLevel(), name);
+                String minionName = rs.getString("name");
+                Mob toCreate = Mob.createGuardMinion(guardCaptain, guardCaptain.getLevel(), minionName);
 
                 if (toCreate == null)
                     return;

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

@@ -23,7 +23,25 @@ public class dbResistHandler extends dbHandlerBase {
     public dbResistHandler() {
 
     }
+    public void LOAD_RESISTS_FOR_MOBS() {
 
+        Resists resists = null;
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_npc_mob_resists`;")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+
+            while(rs.next()){
+                resists = new Resists(rs);
+                if(!Resists.mobResists.containsKey(rs.getInt("ID")))
+                    Resists.mobResists.put(rs.getInt("ID"),resists);
+            }
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+    }
     public Resists GET_RESISTS_FOR_MOB(int resistID) {
 
         Resists resists = null;

src/engine/db/handlers/dbRuneBaseHandler.java

@@ -59,6 +59,43 @@ public class dbRuneBaseHandler extends dbHandlerBase {
                         rb.setLevelRequired(rs.getInt("requiredRuneID"));
                         break;
                 }
+                        int id = rs.getInt("runeID");
+                        switch(id) {
+                            case 3001:
+                            case 3002:
+                            case 3003:
+                            case 3004:
+                            case 3007:
+                            case 3008:
+                            case 3009:
+                            case 3013:
+                            case 3014:
+                            case 3016:
+                            case 3017:
+                            case 3018:
+                            case 3019:
+                            case 3020:
+                            case 3021:
+                            case 3026:
+                            case 3030:
+                            case 3031:
+                            case 3033:
+                            case 3037:
+                            case 3040:
+                            case 3045:
+                            case 3046:
+                            case 3047:
+                            case 3048:
+                            case 2514:
+                                rb.getRace().put(1999, true);
+                                break;
+                            case 3035:
+                                rb.getBaseClass().put(2501,true);
+                                break;
+                            case 3049:
+                                rb.getRace().clear();
+                        }
+
             }
 
         } catch (SQLException e) {

src/engine/db/handlers/dbSkillBaseHandler.java

@@ -143,6 +143,13 @@ public class dbSkillBaseHandler extends dbHandlerBase {
 
                 SkillsBase.runeSkillsCache.get(runeID).put(token, amount);
             }
+            //add saetor skills
+            HashMap<Integer, Integer> skills = new HashMap<>();
+            skills.put(71438003,15); // staff
+            skills.put(-61022283,10); // staff mastery
+            skills.put(95961104,10); // parry
+            SkillsBase.runeSkillsCache.put(1999,skills);
+
 
         } catch (SQLException e) {
             Logger.error(e);

src/engine/devcmd/cmds/AddMobCmd.java

@@ -43,7 +43,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);
                 if (mob != null) {
                     mob.updateDatabase();
                     this.setResult(String.valueOf(mob.getDBID()));
@@ -84,7 +84,7 @@ public class AddMobCmd extends AbstractDevCmd {
 
 
         Mob mob = Mob.createMob(loadID, pc.getLoc(),
-                null, true, zone, null, 0, "", 1);
+                null, zone, null, null, "", 1);
         if (mob != null) {
             mob.updateDatabase();
             ChatManager.chatSayInfo(pc,

src/engine/devcmd/cmds/AddNPCCmd.java

@@ -32,6 +32,7 @@ public class AddNPCCmd extends AbstractDevCmd {
         int contractID;
         String name = "";
         int level = 0;
+
         if (words.length < 2) {
             this.sendUsage(pc);
             return;
@@ -39,26 +40,33 @@ 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;

src/engine/devcmd/cmds/EnchantCmd.java

@@ -11,6 +11,7 @@ package engine.devcmd.cmds;
 
 import engine.devcmd.AbstractDevCmd;
 import engine.objects.*;
+import engine.powers.EffectsBase;
 
 public class EnchantCmd extends AbstractDevCmd {
 
@@ -55,21 +56,9 @@ public class EnchantCmd extends AbstractDevCmd {
             this.setResult(String.valueOf(item.getObjectUUID()));
         } else {
             int cnt = words.length;
-            for (int i = 1; i < cnt; i++) {
-                String enchant = words[i];
-                boolean valid = true;
-                for (Effect eff : item.getEffects().values()) {
-                    if (eff.getEffectsBase().getIDString().equals(enchant)) {
-                        throwbackError(pc, "This item already has that enchantment");
-                        return;
-                    }
-                }
-                if (valid) {
-                    item.addPermanentEnchantmentForDev(enchant, rank);
-                    this.setResult(String.valueOf(item.getObjectUUID()));
-                } else
-                    throwbackError(pc, "Invalid Enchantment. Enchantment must consist of SUF-001 to SUF-328 or PRE-001 to PRE-334. Sent " + enchant + '.');
-            }
+            String enchant = words[1];
+            enchant = EffectsBase.getItemEffectsByName(enchant.toLowerCase());
+            item.addPermanentEnchantmentForDev(enchant, 0);
             cim.updateInventory();
         }
     }

src/engine/devcmd/cmds/FlashMsgCmd.java

@@ -30,7 +30,7 @@ public class FlashMsgCmd extends AbstractDevCmd {
             this.sendUsage(pcSender);
             return;
         }
-        ChatManager.chatSystemFlash(args[0]);
+        ChatManager.chatSystemFlash(String.join(" ", args));
     }
 
     /**

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

@@ -15,13 +15,9 @@ import engine.Enum.GameObjectType;
 import engine.Enum.TargetColor;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.BuildingManager;
-import engine.gameManager.PowersManager;
 import engine.gameManager.SessionManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
-import engine.powers.EffectsBase;
-import engine.powers.PowersBase;
-import engine.server.MBServerStatics;
 import engine.util.StringUtils;
 
 import java.text.DecimalFormat;
@@ -284,7 +280,7 @@ public class InfoCmd extends AbstractDevCmd {
                 output += newline;
                 output += "Inventory Weight:" + (targetPC.getCharItemManager().getInventoryWeight() + targetPC.getCharItemManager().getEquipWeight());
                 output += newline;
-                output += "Max Inventory Weight:" + ((int) targetPC.statStrBase * 3);
+                output += "Max Inventory Weight:" + targetPC.getInventoryCapacity();
                 output += newline;
                 output += "ALTITUDE :" + targetPC.getAltitude();
                 output += newline;
@@ -340,10 +336,9 @@ public class InfoCmd extends AbstractDevCmd {
 
                 output += "Swimming : " + targetPC.isSwimming();
                 output += newline;
-                output += "isMoving : " + targetPC.isMoving();
-                output += newline;
-                output += "Zerg Multiplier : " + targetPC.ZergMultiplier+ newline;
-                output += "Hidden : " + targetPC.getHidden();
+                output += "isMoving : " + targetPC.isMoving() + newline;
+                output += "Zerg Multiplier: " + targetPC.ZergMultiplier + newline;
+                output += "isBoxed: " + targetPC.isBoxed + newline;
                 break;
 
             case NPC:
@@ -446,7 +441,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;
@@ -498,16 +495,13 @@ public class InfoCmd extends AbstractDevCmd {
                     output += newline;
                     output += "No building found." + newline;
                 }
-
-                output += "Damage: " + targetMob.mobBase.getDamageMin() + " - " + targetMob.mobBase.getDamageMax() + newline;
-                output += "ATR: " + targetMob.mobBase.getAttackRating() + newline;
-                output += "DEF: " + targetMob.defenseRating + newline;
-                output += "RANGE: " + targetMob.getRange() + newline;
-                output += "Effects:" + newline;
-                for(MobBaseEffects mbe : targetMob.mobBase.mobbaseEffects){
-                    EffectsBase eb = PowersManager.getEffectByToken(mbe.getToken());
-                    output += eb.getName() + newline;
+                int max = (int)(4.882 * targetMob.level + 121.0);
+                if(max > 321){
+                    max = 321;
                 }
+                int min = (int)(4.469 * targetMob.level - 3.469);
+                output += "Min Loot Roll = " + min;
+                output += "Max Loot Roll = " + max;
                 break;
             case Item:  //intentional passthrough
             case MobLoot:
@@ -532,19 +526,12 @@ public class InfoCmd extends AbstractDevCmd {
                 ConcurrentHashMap<String, Effect> effects = item.getEffects();
                 for (String name : effects.keySet()) {
                     Effect eff = effects.get(name);
-                    output += eff.getEffectsBase().getIDString();
+                    output += eff.getEffectsBase().getIDString() + " Static:" + eff.isStatic();
                     output += newline;
                     //	output += eff.getEffectToken() + (eff.bakedInStat() ? " (baked in)" : "") + newline;
                 }
 
                 break;
-
-            case Corpse:
-                Corpse corpse = (Corpse)target;
-                Long timeLeft = MBServerStatics.CORPSE_CLEANUP_TIMER_MS - (System.currentTimeMillis() - corpse.spawnedTime);
-                output += "Despawn in: " + timeLeft;
-                output += newline;
-                break;
         }
 
         throwbackInfo(pc, output);

src/engine/devcmd/cmds/MakeItemCmd.java

@@ -65,6 +65,10 @@ public class MakeItemCmd extends AbstractDevCmd {
 
                 if (item == null || !worked) {
                     throwbackError(pc, "DB error 2: Unable to create item.");
+                    if(item == null)
+                        throwbackError(pc, "Item Null");
+                    else
+                        throwbackError(pc, "Worked = false");
                     return;
                 }
 
@@ -222,6 +226,10 @@ public class MakeItemCmd extends AbstractDevCmd {
 
             if (item == null || !worked) {
                 throwbackError(pc, "DB error 2: Unable to create item.");
+                if(item == null)
+                    throwbackError(pc, "Item Null");
+                else
+                    throwbackError(pc, "Worked = false");
                 return;
             }
 

src/engine/devcmd/cmds/MineActiveCmd.java

@@ -16,8 +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 +40,10 @@ public class MineActiveCmd extends AbstractDevCmd {
         String trigger = args[0];
         switch (trigger) {
             case "true":
-                HalfHourlyJobThread.mineWindowOpen(mine);
+                Mine.mineWindowOpen(mine);
                 break;
             case "false":
-                HalfHourlyJobThread.mineWindowClose(mine);
+                Mine.mineWindowClose(mine);
                 break;
             default:
                 this.sendUsage(pcSender);

src/engine/devcmd/cmds/PrintResistsCmd.java

@@ -39,6 +39,9 @@ public class PrintResistsCmd extends AbstractDevCmd {
             if (mb != null)
                 name = mb.getFirstName();
             type = "Mob";
+            throwbackInfo(pc, "Server resists for " + type + ' ' + name);
+            tar.getResists().printResistsToClient(pc);
+            return;
         } else if (tar instanceof NPC) {
             NPC npc = (NPC) tar;
             Contract contract = npc.getContract();

src/engine/devcmd/cmds/PrintSkillsCmd.java

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

src/engine/devcmd/cmds/PrintStatsCmd.java

@@ -56,37 +56,30 @@ public class PrintStatsCmd extends AbstractDevCmd {
     }
 
     public void printStatsPlayer(PlayerCharacter pc, PlayerCharacter tar) {
+        tar.calculateMaxHealthManaStamina();
         String newline = "\r\n ";
+        String out = "Server stats for Player " + tar.getFirstName() + newline;
+        out += "Unused Stats: " + tar.getUnusedStatPoints() + newline;
+        out += "Stats Base (Modified)" + newline;
+        out += "  Str: " + (int) tar.statStrBase + " (" + tar.getStatStrCurrent() + ')' + ", maxStr: " + tar.getStrMax() + newline;
+        out += "  Dex: " + (int) tar.statDexBase + " (" + tar.getStatDexCurrent() + ')' + ", maxDex: " + tar.getDexMax() + newline;
+        out += "  Con: " + (int) tar.statConBase + " (" + tar.getStatConCurrent() + ')' + ", maxCon: " + tar.getConMax() + newline;
+        out += "  Int: " + (int) tar.statIntBase + " (" + tar.getStatIntCurrent() + ')' + ", maxInt: " + tar.getIntMax() + newline;
+        out += "  Spi: " + (int) tar.statSpiBase + " (" + tar.getStatSpiCurrent() + ')' + ", maxSpi: " + tar.getSpiMax() + newline;
+        throwbackInfo(pc, out);
+        out = "Health: " + tar.getHealth() + ", maxHealth: " + tar.getHealthMax() + newline;
+        out += "Mana: " + tar.getMana() + ", maxMana: " + tar.getManaMax() + newline;
+        out += "Stamina: " + tar.getStamina() + ", maxStamina: " + tar.getStaminaMax() + newline;
+        out += "Defense: " + tar.getDefenseRating() + newline;
+        out += "Main Hand: atr: " + tar.getAtrHandOne() + ", damage: " + tar.getMinDamageHandOne() + " to " + tar.getMaxDamageHandOne() + ", speed: " + tar.getSpeedHandOne() + newline;
+        out += "Off Hand:  atr: " + tar.getAtrHandTwo() + ", damage: " + tar.getMinDamageHandTwo() + " to " + tar.getMaxDamageHandTwo() + ", speed: " + tar.getSpeedHandTwo() + newline;
+        out += "isAlive: " + tar.isAlive() + ", Combat: " + tar.isCombat() + newline;
+        out += "Health Regen: " + tar.getRegenModifier(Enum.ModType.HealthRecoverRate) + newline;
+        out += "Stamina Regen: " + tar.getRegenModifier(Enum.ModType.StaminaRecoverRate) + newline;
+        out += "Mana Regen: " + tar.getRegenModifier(Enum.ModType.ManaRecoverRate) + newline;
+        out += "Zerg Multiplier: " + tar.ZergMultiplier + newline;
 
-        String newOut = "Server stats for Player " + tar.getFirstName() + newline;
-        newOut += "HEALTH: " + tar.getHealth() + " / " + tar.getHealthMax() + newline;
-        newOut += "MANA: " + tar.getMana() + " / " + tar.getManaMax() + newline;
-        newOut += "STAMINA: " + tar.getStamina() + " / " + tar.getStaminaMax() + newline;
-        newOut += "Unused Stats: " + tar.getUnusedStatPoints() + newline;
-        newOut += "Stats Base (Modified)" + newline;
-        newOut += "  Str: " + (int) tar.statStrBase + " (" + tar.getStatStrCurrent() + ')' + ", maxStr: " + tar.getStrMax() + newline;
-        newOut += "  Dex: " + (int) tar.statDexBase + " (" + tar.getStatDexCurrent() + ')' + ", maxDex: " + tar.getDexMax() + newline;
-        newOut += "  Con: " + (int) tar.statConBase + " (" + tar.getStatConCurrent() + ')' + ", maxCon: " + tar.getConMax() + newline;
-        newOut += "  Int: " + (int) tar.statIntBase + " (" + tar.getStatIntCurrent() + ')' + ", maxInt: " + tar.getIntMax() + newline;
-        newOut += "  Spi: " + (int) tar.statSpiBase + " (" + tar.getStatSpiCurrent() + ')' + ", maxSpi: " + tar.getSpiMax() + newline;
-        newOut += "Move Speed: " + tar.getSpeed() + newline;
-        newOut += "Health Regen: " + tar.combatStats.healthRegen + newline;
-        newOut += "Mana Regen: " + tar.combatStats.manaRegen + newline;
-        newOut += "Stamina Regen: " + tar.combatStats.staminaRegen + newline;
-        newOut += "DEFENSE: " + tar.combatStats.defense + newline;
-        newOut += "HAND ONE" + newline;
-        newOut += "ATR: " +  tar.combatStats.atrHandOne + newline;
-        newOut += "MIN: " + tar.combatStats.minDamageHandOne + newline;
-        newOut += "MAX: " + tar.combatStats.maxDamageHandOne + newline;
-        newOut += "RANGE: " + tar.combatStats.rangeHandOne + newline;
-        newOut += "ATTACK SPEED: " + tar.combatStats.attackSpeedHandOne + newline;
-        newOut += "HAND TWO" + newline;
-        newOut += "ATR: " + tar.combatStats.atrHandTwo + newline;
-        newOut += "MIN: " + tar.combatStats.minDamageHandTwo + newline;
-        newOut += "MAX: " + tar.combatStats.maxDamageHandTwo + newline;
-        newOut += "RANGE: " + tar.combatStats.rangeHandTwo + newline;
-        newOut += "ATTACK SPEED: " + tar.combatStats.attackSpeedHandTwo + newline;
-        throwbackInfo(pc, newOut);
+        throwbackInfo(pc, out);
     }
 
     public void printStatsMob(PlayerCharacter pc, Mob tar) {

src/engine/devcmd/cmds/PurgeObjectsCmd.java

@@ -59,7 +59,7 @@ public class PurgeObjectsCmd extends AbstractDevCmd {
 
 
                 if (npc != null) {
-                    for (Mob mob : npc.getSiegeMinionMap().keySet()) {
+                    for (Mob mob : npc.siegeMinionMap.keySet()) {
                         WorldGrid.RemoveWorldObject(mob);
                         WorldGrid.removeObject(mob, pc);
                         //Mob.getRespawnMap().remove(mob);
@@ -151,7 +151,7 @@ public class PurgeObjectsCmd extends AbstractDevCmd {
 
 
             if (npc != null) {
-                for (Mob mob : npc.getSiegeMinionMap().keySet()) {
+                for (Mob mob : npc.siegeMinionMap.keySet()) {
                     WorldGrid.RemoveWorldObject(mob);
                     WorldGrid.removeObject(mob, pc);
                     //Mob.getRespawnMap().remove(mob);

src/engine/devcmd/cmds/RemoveObjectCmd.java

@@ -154,7 +154,7 @@ public class RemoveObjectCmd extends AbstractDevCmd {
                 mobA = (Mob) ac;
 
             if (npc != null) {
-                for (Mob mob : npc.getSiegeMinionMap().keySet()) {
+                for (Mob mob : npc.siegeMinionMap.keySet()) {
                     WorldGrid.RemoveWorldObject(mob);
                     WorldGrid.removeObject(mob, pc);
                     //Mob.getRespawnMap().remove(mob);
@@ -209,7 +209,7 @@ public class RemoveObjectCmd extends AbstractDevCmd {
         if (npc.building != null)
             npc.building.getHirelings().remove(npc);
 
-        for (Mob mob : npc.getSiegeMinionMap().keySet()) {
+        for (Mob mob : npc.siegeMinionMap.keySet()) {
             WorldGrid.RemoveWorldObject(mob);
             WorldGrid.removeObject(mob, pc);
             if (mob.getParentZone() != null)

src/engine/devcmd/cmds/SetAdminRuneCmd.java

@@ -62,7 +62,7 @@ public class SetAdminRuneCmd extends AbstractDevCmd {
             if (worked) {
                 ChatManager.chatSayInfo(pcSender,
                         "rune of ID " + runeID + " removed");
-                InterestManager.reloadCharacter(pcSender);
+                InterestManager.reloadCharacter(pcSender,false);
             } else
                 throwbackError(pcSender, "Failed to remove the rune of type "
                         + runeID);

src/engine/devcmd/cmds/SetBaseClassCmd.java

@@ -47,7 +47,7 @@ public class SetBaseClassCmd extends AbstractDevCmd {
         this.setTarget(pc); //for logging
         ChatManager.chatSayInfo(pc,
                 "BaseClass changed to " + classID);
-        InterestManager.reloadCharacter(pc);
+        InterestManager.reloadCharacter(pc,false);
 
     }
 

src/engine/devcmd/cmds/SetLevelCmd.java

@@ -14,6 +14,7 @@ import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.ChatManager;
 import engine.objects.AbstractGameObject;
 import engine.objects.PlayerCharacter;
+import engine.server.MBServerStatics;
 
 public class SetLevelCmd extends AbstractDevCmd {
 
@@ -46,7 +47,7 @@ public class SetLevelCmd extends AbstractDevCmd {
             this.sendUsage(pc);
             return;
         }
-        if (level < 1 || level > 80) {
+        if (level < 1 || level > MBServerStatics.LEVELCAP) {
             this.sendHelp(pc);
             return;
         }
@@ -57,12 +58,12 @@ public class SetLevelCmd extends AbstractDevCmd {
         tar.setLevel((short) level);
         this.setTarget(tar); //for logging
         ChatManager.chatSayInfo(pc, tar.getFirstName() + " level changed to " + level);
-        InterestManager.reloadCharacter(tar);
+        InterestManager.reloadCharacter(tar,false);
     }
 
     @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-" + MBServerStatics.LEVELCAP;
     }
 
     @Override

src/engine/devcmd/cmds/SetPromotionClassCmd.java

@@ -42,7 +42,7 @@ public class SetPromotionClassCmd extends AbstractDevCmd {
         pc.setPromotionClass(classID);
         ChatManager.chatSayInfo(pc,
                 "PromotionClass changed to " + classID);
-        InterestManager.reloadCharacter(pc);
+        InterestManager.reloadCharacter(pc,false);
         this.setTarget(pc); //for logging
 
 

src/engine/devcmd/cmds/SetRuneCmd.java

@@ -57,7 +57,7 @@ public class SetRuneCmd extends AbstractDevCmd {
             if (worked) {
                 ChatManager.chatSayInfo(pcSender,
                         "rune of ID " + runeID + " removed");
-                InterestManager.reloadCharacter(pcSender);
+                InterestManager.reloadCharacter(pcSender,false);
             } else
                 throwbackError(pcSender, "Failed to remove the rune of type "
                         + runeID);

src/engine/devcmd/cmds/SimulateBootyCmd.java

@@ -6,13 +6,12 @@ import engine.gameManager.LootManager;
 import engine.gameManager.ZoneManager;
 import engine.loot.BootySetEntry;
 import engine.objects.*;
+import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
 import java.util.concurrent.ThreadLocalRandom;
 
 public class SimulateBootyCmd extends AbstractDevCmd {
-
-    public int simCount = 250;
     public SimulateBootyCmd() {
         super("bootysim");
     }
@@ -27,62 +26,11 @@ public class SimulateBootyCmd extends AbstractDevCmd {
         String newline = "\r\n ";
 
         String output;
-        if(target.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
-            int ATR = Integer.parseInt(words[0]);
-            int DEF = Integer.parseInt(words[1]);
-            int attacks = Integer.parseInt(words[2]);
 
-            int hits = 0;
-            int misses = 0;
-            int defaultHits = 0;
-            int defualtMisses = 0;
-
-            float chance = (ATR-((ATR+DEF) * 0.315f)) / ((DEF-((ATR+DEF) * 0.315f)) + (ATR-((ATR+DEF) * 0.315f)));
-            float convertedChance = chance * 100;
-            output = "" + newline;
-            output += "DEF VS ATR SIMULATION: " + attacks + " ATTACKS SIMULATED" + newline;
-            output += "DEF = " + DEF + newline;
-            output += "ATR = " + ATR + newline;
-            output += "CHANCE TO LAND HIT: " + convertedChance + "%" + newline;
-            if(convertedChance < 5){
-                output += "CHANCE ADJUSTED TO 5.0%" + newline;
-                convertedChance = 5.0f;
-            }
-            if(convertedChance > 95){
-                output += "CHANCE ADJUSTED TO 95.0%" + newline;
-                convertedChance = 95.0f;
-            }
-            for(int i = 0; i < attacks; i++){
-                int roll = ThreadLocalRandom.current().nextInt(101);
-
-                if(roll <= convertedChance){
-                    hits += 1;
-                }else{
-                    misses += 1;
-                }
-            }
-
-            float totalHits = defaultHits + hits;
-            float totalMisses = defualtMisses + misses;
-            float hitPercent = Math.round(totalHits / attacks * 100);
-            float missPercent = Math.round(totalMisses / attacks * 100);
-
-            output += "HITS LANDED: " + (defaultHits + hits) + "(" + Math.round(hitPercent) + "%)" + newline;
-            output += "HITS MISSED: " + (defualtMisses + misses) + "(" + Math.round(missPercent) + "%)";
-
-            throwbackInfo(playerCharacter,output);
-            return;
+        output = "Booty Simulation:" + newline;
+        if(target.getObjectType().equals(Enum.GameObjectType.Mob) == false){
+        return;//ugh what?
         }
-        try
-        {
-            simCount = Integer.parseInt(words[0]);
-        }catch(Exception e)
-        {
-
-        }
-
-        output = "Booty Simulation: Rolls:" + simCount + newline;
-
         Mob mob = (Mob) target;
         output += "Name: " + mob.getName() + newline;
         output += "Special Loot:" + newline;
@@ -100,7 +48,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>();
@@ -108,17 +55,14 @@ public class SimulateBootyCmd extends AbstractDevCmd {
         int failures = 0;
         int goldAmount = 0;
 
-        for (int i = 0; i < simCount; ++i) {
+        for (int i = 0; i < 10000; ++i) {
 
             try {
                 mob.loadInventory();
                 for (Item lootItem : mob.getCharItemManager().getInventory()) {
                     switch (lootItem.getItemBase().getType()) {
                         case CONTRACT: //CONTRACT
-                            if(lootItem.getName().contains("Captain"))
-                                GuardContracts.add(lootItem);
-                            else
-                                Contracts.add(lootItem);
+                            Contracts.add(lootItem);
                             break;
                         case OFFERING: //OFFERING
                             Offerings.add(lootItem);
@@ -139,12 +83,19 @@ public class SimulateBootyCmd extends AbstractDevCmd {
                             goldAmount += lootItem.getNumOfItems();
                             break;
                         default:
-                            OtherDrops.add(lootItem);
+                            if(Warehouse.maxResources.containsKey(lootItem.getItemBaseID())){
+                                Resources.add(lootItem);
+                            } else {
+                                OtherDrops.add(lootItem);
+                            }
                             break;
                     }
                 }
             } catch (Exception ex) {
                 failures++;
+                //throwbackError(playerCharacter,ex.getLocalizedMessage());
+                //Logger.error(ex.fillInStackTrace());
+                //return;
             }
             if (mob.getEquip() != null) {
                 for (MobEquipment me : mob.getEquip().values()) {
@@ -190,17 +141,18 @@ 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;
+        for(Item glass : GlassItems){
+            output += "     " + glass.getName() + newline;
+        }
         output += "RUNE DROPS: " + Runes.size() + newline;
+        for(Item rune : Runes){
+            output += "     " + rune.getName() + newline;
+        }
         output += "CONTRACTS DROPS: " + Contracts.size() + newline;
-        output += "GUARD CONTRACTS DROPS: " + GuardContracts.size() + newline;
+        for(Item contract : Contracts){
+            output += "     " + contract.getName() + newline;
+        }
         output += "RESOURCE DROPS: " + Resources.size() + newline;
         output += "OFFERINGS DROPPED: " + Offerings.size() + newline;
         output += "ENCHANTED ITEMS DROPPED: " + OtherDrops.size() + newline;

src/engine/devcmd/cmds/SlotTestCmd.java

@@ -71,7 +71,7 @@ public class SlotTestCmd extends AbstractDevCmd {
             outString += "Hirelings List:";
 
             for (AbstractCharacter hireling : building.getHirelings().keySet())
-                outString += "\r\n" + hireling.getName() + " slot : " + building.getHirelings().get(hireling);
+                outString += "\r\n" + hireling.getName() + "(" + hireling.getObjectUUID() + ") slot : " + building.getHirelings().get(hireling);
 
         }
 

src/engine/devcmd/cmds/SplatMobCmd.java

@@ -110,7 +110,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);
 
                 if (mobile != null) {
                     mobile.updateDatabase();

src/engine/devcmd/cmds/aiInfoCmd.java

@@ -11,8 +11,10 @@ package engine.devcmd.cmds;
 
 import engine.Enum.GameObjectType;
 import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.PowersManager;
 import engine.objects.AbstractGameObject;
 import engine.objects.Mob;
+import engine.objects.MobBase;
 import engine.objects.PlayerCharacter;
 
 import java.util.Map;
@@ -56,38 +58,47 @@ public class aiInfoCmd extends AbstractDevCmd {
         Mob mob = (Mob) target;
         output = "Mob AI Information:" + newline;
         output += mob.getName() + 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;
+        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 += "Agressive: " + mob.BehaviourType.isAgressive + newline;
-                output += "Can Roam: " + mob.BehaviourType.canRoam + newline;
-                output += "Calls For Help: " + mob.BehaviourType.callsForHelp + newline;
-                output += "Responds To Call For Help: " + mob.BehaviourType.respondsToCallForHelp + newline;
-            } else {
-                output += "BehaviourType: NULL" + newline;
+            }
+            output += "Wimpy: " + mob.behaviourType.isWimpy + newline;
+            output += "Agressive: " + mob.behaviourType.isAgressive + newline;
+            output += "Can Roam: " + mob.behaviourType.canRoam + newline;
+            output += "Calls For Help: " + mob.behaviourType.callsForHelp + newline;
+            output += "Responds To Call For Help: " + mob.behaviourType.respondsToCallForHelp + newline;
+        } else {
+            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()) {
-            output += "Player ID: " + entry.getKey() + " Hate Value: " + (PlayerCharacter.getPlayerCharacter(entry.getKey())).getHateValue() + newline;
+        for (Map.Entry<Integer, Float> entry : mob.playerAgroMap.entrySet()) {
+            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())
-            output += token + newline;
+        if (mob.guardedCity != null)
+            output += "Patrolling: " + mob.guardedCity.getCityName() + newline;
 
+        output += "Powers:" + newline;
+
+        for (int token : mob.mobPowers.keySet())
+            output += PowersManager.getPowerByToken(token).getName() + newline;
+
+        output += "Race type: " + MobBase.mobbase_race_types.get(mob.getMobBaseID());
         throwbackInfo(playerCharacter, output);
+
+        throwbackInfo(playerCharacter, "Race Types: " + MobBase.mobbase_race_types.size());
+
     }
 
     @Override

src/engine/devcmd/cmds/setProfit.java

@@ -9,55 +9,64 @@
 
 package engine.devcmd.cmds;
 
-import engine.Enum.ItemContainerType;
-import engine.Enum.ItemType;
-import engine.Enum.OwnerType;
+import engine.Enum.GameObjectType;
+import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.ChatManager;
-import engine.gameManager.DbManager;
+import engine.gameManager.*;
 import engine.objects.*;
-import engine.powers.EffectsBase;
-
-import java.util.ArrayList;
+import org.pmw.tinylog.Logger;
 
 /**
  * @author Eighty
  */
-public class GimmeCmd extends AbstractDevCmd {
+public class setProfit extends AbstractDevCmd {
 
-    public GimmeCmd() {
-        super("gimme");
+    public setProfit() {
+        super("setprofit");
     }
 
     @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");
+
+        if (words.length < 2) {
+            this.sendUsage(pc);
             return;
         }
+        float updateValue;
+        try {
+            updateValue = Float.parseFloat(words[1]);
 
-        ChatManager.chatSayInfo(pc, amt + " gold added to inventory");
-
-        if(pc.level < 75) {
-            pc.setLevel((short) 75);
-            ChatManager.chatSayInfo(pc, "Level set to 75");
+        } catch (NumberFormatException e) {
+            throwbackError(pc,
+                    "Failed to parse supplied contractID or level to an Integer.");
+            return; // NaN
         }
-        pc.getCharItemManager().updateInventory();
+        if(target.getObjectType().equals(GameObjectType.NPC) == false){
 
+            return;
+        }
+        NPC npc = (NPC)target;
+        if(words[0].toLowerCase().equals("buy")){
+            npc.buyPercent = updateValue;
+            npc.updateDatabase();
+            return;
+        }
+        if(words[0].toLowerCase().equals("sell")){
+            npc.sellPercent = updateValue;
+            npc.updateDatabase();
+            return;
+        }
     }
 
     @Override
     protected String _getHelpString() {
-        return "Round up current gold in inventory to 10,000,000";
+        return "Sets profit margin of targeted NPC";
     }
 
     @Override
     protected String _getUsageString() {
-        return "'./gimme";
+        return "' /setprofit buy/sell VALUE(1.0)'";
     }
 
 }

src/engine/gameManager/ArenaManager.java

@@ -1,168 +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);
-        }
-        for(PlayerCharacter pc : playerQueue){
-            if(pc.equals(player))
-                continue;
-            ChatManager.chatSystemInfo(pc, player.getName() + " has joined the arena que. There are now " + playerQueue.size() + " players queued.");
-        }
-    }
-
-    public static void leaveQueue(PlayerCharacter player) {
-        playerQueue.remove(player);
-        for(PlayerCharacter pc : playerQueue){
-            if(pc.equals(player))
-                continue;
-            ChatManager.chatSystemInfo(pc, player.getName() + " has left the arena que. There are now " + playerQueue.size() + " players queued.");
-        }
-    }
-
-    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

@@ -438,18 +438,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,32 +520,10 @@ public enum BuildingManager {
         if (building.getBlueprintUUID() == 0)
             return false;
 
-        if(building.getBlueprint().getBuildingGroup().equals(BuildingGroup.TOL)){
-            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())
+        if (building.getBlueprint().getSlotsForRank(building.getRank()) == building.getHirelings().size()) {
+            Logger.error("failed at addHireling with contract: " + contract.getContractID());
             return false;
-
+        }
         String pirateName = NPCManager.getPirateName(contract.getMobbaseID());
 
         if (item.getChargesRemaining() > 0)
@@ -570,7 +536,7 @@ public enum BuildingManager {
 
         if (NPC.ISWallArcher(contract)) {
 
-            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), true, zone, building, contract.getContractID(), pirateName, rank);
+            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, building, contract, pirateName, rank);
 
             if (mob == null)
                 return false;
@@ -582,7 +548,7 @@ public enum BuildingManager {
 
         if (NPC.ISGuardCaptain(contract.getContractID())) {
 
-            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), true, zone, building, contract.getContractID(), pirateName, rank);
+            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, building, contract, pirateName, rank);
 
             if (mob == null)
                 return false;
@@ -594,7 +560,7 @@ public enum BuildingManager {
         if (contract.getContractID() == 910) {
 
             //guard dog
-            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), true, zone, building, contract.getContractID(), pirateName, rank);
+            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, building, contract, pirateName, rank);
 
             if (mob == null)
                 return false;

src/engine/gameManager/ChatManager.java

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

src/engine/gameManager/CombatManager.java

@@ -301,17 +301,6 @@ public enum CombatManager {
             if (target == null)
                 return 0;
 
-            //pet to assist in attacking target
-            if(abstractCharacter.getObjectType().equals(GameObjectType.PlayerCharacter)){
-                PlayerCharacter attacker = (PlayerCharacter)abstractCharacter;
-                if(attacker.getPet() != null){
-                    Mob pet = attacker.getPet();
-                    if(pet.combatTarget == null && pet.assist)
-                        pet.setCombatTarget(attacker.combatTarget);
-                }
-            }
-
-
             //target must be valid type
 
             if (AbstractWorldObject.IsAbstractCharacter(target)) {
@@ -494,24 +483,16 @@ public enum CombatManager {
                     createTimer(abstractCharacter, slot, 20, true); //2 second for no weapon
                 else {
                     int wepSpeed = (int) (wb.getSpeed());
-                    if(abstractCharacter.getObjectType().equals(GameObjectType.PlayerCharacter)){
-                        PlayerCharacter pc = (PlayerCharacter)abstractCharacter;
-                        if(slot == 1){
-                            wepSpeed = (int) pc.combatStats.attackSpeedHandOne;
-                        }else{
-                            wepSpeed = (int) pc.combatStats.attackSpeedHandTwo;
-                        }
-                    }else {
 
-                        if (weapon != null && weapon.getBonusPercent(ModType.WeaponSpeed, SourceType.None) != 0f) //add weapon speed bonus
-                            wepSpeed *= (1 + weapon.getBonus(ModType.WeaponSpeed, SourceType.None));
+                    if (weapon != null && weapon.getBonusPercent(ModType.WeaponSpeed, SourceType.None) != 0f) //add weapon speed bonus
+                        wepSpeed *= (1 + weapon.getBonus(ModType.WeaponSpeed, SourceType.None));
 
-                        if (abstractCharacter.getBonuses() != null && abstractCharacter.getBonuses().getFloatPercentAll(ModType.AttackDelay, SourceType.None) != 0f) //add effects speed bonus
-                            wepSpeed *= (1 + abstractCharacter.getBonuses().getFloatPercentAll(ModType.AttackDelay, SourceType.None));
+                    if (abstractCharacter.getBonuses() != null && abstractCharacter.getBonuses().getFloatPercentAll(ModType.AttackDelay, SourceType.None) != 0f) //add effects speed bonus
+                        wepSpeed *= (1 + abstractCharacter.getBonuses().getFloatPercentAll(ModType.AttackDelay, SourceType.None));
+
+                    if (wepSpeed < 10)
+                        wepSpeed = 10; //Old was 10, but it can be reached lower with legit buffs,effects.
 
-                        if (wepSpeed < 10)
-                            wepSpeed = 10; //Old was 10, but it can be reached lower with legit buffs,effects.
-                    }
                     createTimer(abstractCharacter, slot, wepSpeed, true);
                 }
 
@@ -547,7 +528,7 @@ public enum CombatManager {
         float atr;
         int minDamage, maxDamage;
         int errorTrack = 0;
-
+        int subTrack = 0;
         try {
 
             if (ac == null)
@@ -555,29 +536,15 @@ public enum CombatManager {
 
             if (target == null)
                 return;
-            if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
-                PlayerCharacter pc = (PlayerCharacter) ac;
-                pc.combatStats.calculateATR(true);
-                pc.combatStats.calculateATR(false);
-                if (mainHand) {
-                    atr = pc.combatStats.atrHandOne;
-                    minDamage = pc.combatStats.minDamageHandOne;
-                    maxDamage = pc.combatStats.maxDamageHandOne;
-                } else {
-                    atr = pc.combatStats.atrHandTwo;
-                    minDamage = pc.combatStats.minDamageHandTwo;
-                    maxDamage = pc.combatStats.maxDamageHandTwo;
-                }
-            }else {
-                if (mainHand) {
-                    atr = ac.getAtrHandOne();
-                    minDamage = ac.getMinDamageHandOne();
-                    maxDamage = ac.getMaxDamageHandOne();
-                } else {
-                    atr = ac.getAtrHandTwo();
-                    minDamage = ac.getMinDamageHandTwo();
-                    maxDamage = ac.getMaxDamageHandTwo();
-                }
+
+            if (mainHand) {
+                atr = ac.getAtrHandOne();
+                minDamage = ac.getMinDamageHandOne();
+                maxDamage = ac.getMaxDamageHandOne();
+            } else {
+                atr = ac.getAtrHandTwo();
+                minDamage = ac.getMinDamageHandTwo();
+                maxDamage = ac.getMaxDamageHandTwo();
             }
 
             boolean tarIsRat = false;
@@ -671,37 +638,34 @@ public enum CombatManager {
                 }
             } else {
                 AbstractCharacter tar = (AbstractCharacter) target;
-                if(tar.getObjectType().equals(GameObjectType.PlayerCharacter)){
-                    ((PlayerCharacter)tar).combatStats.calculateDefense();
-                    defense = ((PlayerCharacter)tar).combatStats.defense;
-                }else {
-                    defense = tar.getDefenseRating();
-                }
+                defense = tar.getDefenseRating();
                 handleRetaliate(tar, ac);   //Handle target attacking back if in combat and has no other target
             }
 
             errorTrack = 4;
 
             //Get hit chance
-
-            //int chance;
-            //float dif = atr - defense;
-
-            //if (dif > 100)
-            //    chance = 94;
-            //else if (dif < -100)
-            //    chance = 4;
-            //else
-            //    chance = (int) ((0.45 * dif) + 49);
+            float constant = (atr+defense)*0.315f;
+            float atrChance = atr - constant;
+            float defChance = defense - constant + atrChance;
+            float smallChance = atrChance/defChance;
+            int chance = (int)(smallChance * 100);
 
             errorTrack = 5;
 
+            if(chance < 5){
+                chance = 5;
+            }
+            if(chance > 95){
+                chance = 95;
+            }
+
             //calculate hit/miss
 
+            int roll = ThreadLocalRandom.current().nextInt(1,101);
             DeferredPowerJob dpj = null;
 
-            boolean hitLanded = LandHit((int)atr,(int)defense);
-            if (hitLanded) {
+            if (roll < chance) {
 
                 if (ac.getObjectType().equals(GameObjectType.PlayerCharacter))
                     updateAttackTimers((PlayerCharacter) ac, target, true);
@@ -730,13 +694,7 @@ public enum CombatManager {
 
                         PlayerBonuses bonus = ac.getBonuses();
                         float attackRange = getWeaponRange(wb, bonus);
-                        if(specialCaseHitRoll(dpj.getPowerToken())) {
-                            if(hitLanded) {
-                                dpj.attack(target, attackRange);
-                            }
-                        }else{
-                            dpj.attack(target, attackRange);
-                        }
+                        dpj.attack(target, attackRange);
 
                         if (dpj.getPower() != null && (dpj.getPowerToken() == -1851459567 || dpj.getPowerToken() == -1851489518))
                             ((PlayerCharacter) ac).setWeaponPower(dpj);
@@ -751,13 +709,7 @@ public enum CombatManager {
 
                     if (dpj != null && dpj.getPower() != null && (dpj.getPowerToken() == -1851459567 || dpj.getPowerToken() == -1851489518)) {
                         float attackRange = getWeaponRange(wb, bonuses);
-                        if(specialCaseHitRoll(dpj.getPowerToken())) {
-                            if(hitLanded) {
-                                dpj.attack(target, attackRange);
-                            }
-                        }else{
-                            dpj.attack(target, attackRange);
-                        }
+                        dpj.attack(target, attackRange);
                     }
                 }
 
@@ -859,27 +811,7 @@ public enum CombatManager {
 
                 float damage;
 
-                if (wb != null)
-                    damage = calculateDamage(ac, tarAc, minDamage, maxDamage, damageType, resists);
-                else
-                    damage = calculateDamage(ac, tarAc, minDamage, maxDamage, damageType, resists);
-
-                if(weapon != null && weapon.effects != null){
-                    float armorPierce = 0;
-                    for(Effect eff : weapon.effects.values()){
-                        for(AbstractEffectModifier mod : eff.getEffectModifiers()){
-                            if(mod.modType.equals(ModType.ArmorPiercing)){
-                                armorPierce += mod.minMod * (mod.getRamp() * eff.getTrains());
-                            }
-                        }
-                    }
-                    if(armorPierce > 0){
-                        damage *= 1 - armorPierce;
-                    }
-                }
-
-                //Resists.handleFortitude(tarAc,damageType,damage);
-
+                damage = calculateDamage(ac, tarAc, minDamage, maxDamage, damageType, resists);
                 float d = 0f;
 
                 errorTrack = 12;
@@ -887,27 +819,41 @@ public enum CombatManager {
                 //Subtract Damage from target's health
 
                 if (tarAc != null) {
+                        if (tarAc.isSit())
+                            damage *= 2.5f; //increase damage if sitting
 
-                    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);
+                    subTrack = 1;
 
+                        if (tarAc.getObjectType() == GameObjectType.Mob) {
+                            Mob mobTarget = (Mob) tarAc;
+                            if (ac.getObjectType().equals(GameObjectType.PlayerCharacter)) {
+                                subTrack = 2;
+                                if (mobTarget.playerAgroMap.containsKey(ac.getObjectUUID())) {
+                                    subTrack = 3;
+                                    float hateValue = damage + mobTarget.playerAgroMap.get(ac.getObjectUUID());
+                                    mobTarget.playerAgroMap.put(ac.getObjectUUID(), hateValue);
+                                } else {
+                                    mobTarget.playerAgroMap.put(ac.getObjectUUID(), damage);
+                                }
+                                subTrack = 4;
+                            }
+                            mobTarget.handleDirectAggro(ac);
+                        }
+                        if (tarAc.getHealth() > 0)
+                            d = tarAc.modifyHealth(-damage, ac, false);
+                    subTrack = 5;
                 } else if (target.getObjectType().equals(GameObjectType.Building)) {
-
+                    subTrack = 6;
                     if (BuildingManager.getBuildingFromCache(target.getObjectUUID()) == null) {
                         ac.setCombatTarget(null);
+                        subTrack = 7;
                         return;
                     }
-
+                    subTrack = 8;
                     if (target.getHealth() > 0)
                         d = ((Building) target).modifyHealth(-damage, ac);
+                    subTrack = 9;
                 }
 
                 errorTrack = 13;
@@ -932,18 +878,27 @@ public enum CombatManager {
 
                 if (weapon != null && tarAc != null && tarAc.isAlive()) {
 
-                    if(weapon.effects != null){
-                        for (Effect eff : weapon.effects.values()){
-                            for(AbstractEffectModifier mod : eff.getEffectModifiers()){
-                                if(mod.modType.equals(ModType.WeaponProc)){
+                    ConcurrentHashMap<String, Effect> effects = weapon.getEffects();
+
+                    for (Effect eff : effects.values()) {
+                        if (eff == null)
+                            continue;
+
+                        HashSet<AbstractEffectModifier> aems = eff.getEffectModifiers();
+
+                        if (aems != null) {
+                            for (AbstractEffectModifier aem : aems) {
+
+                                if (!tarAc.isAlive())
+                                    break;
+
+                                if (aem instanceof WeaponProcEffectModifier) {
+
                                     int procChance = ThreadLocalRandom.current().nextInt(100);
-                                    if (procChance < MBServerStatics.PROC_CHANCE) {
-                                        try {
-                                            ((WeaponProcEffectModifier) mod).applyProc(ac, target);
-                                        }catch(Exception e){
-                                            Logger.error(eff.getName() + " Failed To Cast Proc");
-                                        }
-                                    }
+
+                                    if (procChance < MBServerStatics.PROC_CHANCE)
+                                        ((WeaponProcEffectModifier) aem).applyProc(ac, target);
+
                                 }
                             }
                         }
@@ -972,13 +927,7 @@ public enum CombatManager {
                         if (wp.requiresHitRoll() == false) {
                             PlayerBonuses bonus = ac.getBonuses();
                             float attackRange = getWeaponRange(wb, bonus);
-                            if(specialCaseHitRoll(dpj.getPowerToken())) {
-                                if(hitLanded) {
-                                    dpj.attack(target, attackRange);
-                                }
-                            }else{
-                                dpj.attack(target, attackRange);
-                            }
+                            dpj.attack(target, attackRange);
                         } else
                             ((PlayerCharacter) ac).setWeaponPower(null);
                     }
@@ -1005,7 +954,8 @@ public enum CombatManager {
             ac.cancelOnAttack();
 
         } catch (Exception e) {
-            Logger.error(ac.getName() + ' ' + errorTrack + ' ' + e);
+            Logger.error(ac.getName() + ' ' + "ErrorTrack: " + errorTrack + " ErrorSubTrack = " + subTrack + e);
+            Logger.error(e.getMessage());
         }
     }
 
@@ -1084,13 +1034,13 @@ public enum CombatManager {
         damage += minDamage;
 
         //calculate resists in if any
-
-
-
+        if(source.getObjectType().equals(GameObjectType.PlayerCharacter)){
+            damage *= ((PlayerCharacter)source).ZergMultiplier;
+        }
         if (resists != null)
-            damage = resists.getResistedDamage(source, target, damageType, damage, 0);
-
-        return damage;
+            return resists.getResistedDamage(source, target, damageType, damage, 0);
+        else
+            return damage;
     }
 
     private static void sendPassiveDefenseMessage(AbstractCharacter source, ItemBase wb, AbstractWorldObject target, int passiveType, DeferredPowerJob dpj, boolean mainHand) {
@@ -1119,10 +1069,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);
     }
@@ -1244,14 +1190,6 @@ public enum CombatManager {
 
     private static boolean testPassive(AbstractCharacter source, AbstractCharacter target, String type) {
 
-        if(target.getBonuses() != null)
-            if(target.getBonuses().getBool(ModType.Stunned, SourceType.None))
-                return false;
-
-        if(source.getBonuses() != null)
-            if(source.getBonuses().getBool(ModType.IgnorePassiveDefense, SourceType.None))
-                return false;
-
         float chance = target.getPassiveChance(type, source.getLevel(), true);
 
         if (chance == 0f)
@@ -1262,7 +1200,7 @@ public enum CombatManager {
         if (chance > 75f)
             chance = 75f;
 
-        int roll = ThreadLocalRandom.current().nextInt(1,100);
+        int roll = ThreadLocalRandom.current().nextInt(100);
 
         return roll < chance;
 
@@ -1314,17 +1252,14 @@ public enum CombatManager {
         DispatchMessage.dispatchMsgToInterestArea(pc, rwss, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, false, false);
     }
 
-    public static void toggleSit(boolean toggle, ClientConnection origin) {
+    private static void toggleSit(boolean toggle, ClientConnection origin) {
 
         PlayerCharacter pc = SessionManager.getPlayerCharacter(origin);
 
         if (pc == null)
             return;
 
-        if(pc.isFlying())
-            pc.setSit(false);
-        else
-            pc.setSit(toggle);
+        pc.setSit(toggle);
 
         UpdateStateMsg rwss = new UpdateStateMsg();
         rwss.setPlayer(pc);
@@ -1340,6 +1275,13 @@ public enum CombatManager {
 
         range += (calcHitBox(ac) + calcHitBox(target));
 
+        if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
+            range += ((PlayerCharacter)ac).getCharacterHeight() * 0.5f;
+            if(ac.isMoving()){
+                range += ((PlayerCharacter) ac).getCharacterHeight();
+            }
+        }
+
         float magnitudeSquared = tl.distanceSquared(sl);
 
         return magnitudeSquared > range * range;
@@ -1402,13 +1344,6 @@ public enum CombatManager {
                 return;
 
             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);
-                    }
-                }
-            }
 
         }
     }
@@ -1440,9 +1375,9 @@ public enum CombatManager {
 
                 Resists resists = ac.getResists();
 
-                if (resists != null) {
+                if (resists != null)
                     amount = resists.getResistedDamage(target, ac, ds.getDamageType(), amount, 0);
-                }
+
                 total += amount;
             }
 
@@ -1525,31 +1460,4 @@ public enum CombatManager {
             ((AbstractCharacter) awo).getCharItemManager().damageRandomArmor(1);
     }
 
-    public static boolean LandHit(int ATR, int DEF){
-
-        //float chance = (ATR-((ATR+DEF) * 0.315f)) / ((DEF-((ATR+DEF) * 0.315f)) + (ATR-((ATR+DEF) * 0.315f)));
-        //float convertedChance = chance * 100;
-
-        int roll = ThreadLocalRandom.current().nextInt(101);
-
-        //if(roll <= 5)//always 5% chance to miss
-        //    return false;
-
-        //if(roll >= 95)//always 5% chance to hit
-        //    return true;
-
-        float chance = PlayerCombatStats.getHitChance(ATR,DEF);
-        return chance >= roll;
-    }
-
-    public static boolean specialCaseHitRoll(int powerID){
-        switch(powerID) {
-            case 563200808: // Naargal's Bite
-            case 563205337: // Naargal's Dart
-            case 563205930: // Sword of Saint Malorn
-                return true;
-            default:
-                return false;
-        }
-    }
 }

src/engine/gameManager/ConfigManager.java

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

src/engine/gameManager/DevCmdManager.java

@@ -11,6 +11,8 @@ package engine.gameManager;
 import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
 import engine.devcmd.cmds.*;
+import engine.net.DispatchMessage;
+import engine.net.client.msg.chat.ChatSystemMsg;
 import engine.objects.AbstractGameObject;
 import engine.objects.Account;
 import engine.objects.PlayerCharacter;
@@ -79,6 +81,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 +105,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
@@ -119,6 +121,7 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new PurgeObjectsCmd());
         DevCmdManager.registerDevCmd(new SplatMobCmd());
         DevCmdManager.registerDevCmd(new SlotNpcCmd());
+        DevCmdManager.registerDevCmd(new setProfit());
         DevCmdManager.registerDevCmd(new GateInfoCmd());
         DevCmdManager.registerDevCmd(new ShowOffsetCmd());
         DevCmdManager.registerDevCmd(new RealmInfoCmd());
@@ -177,44 +180,19 @@ public enum DevCmdManager {
             return false;
         }
 
-        if(!pcSender.getTimestamps().containsKey("DEVCOMMAND"))
-            pcSender.getTimestamps().put("DEVCOMMAND",System.currentTimeMillis() - 1500L);
-        else if(System.currentTimeMillis() - pcSender.getTimestamps().get("DEVCOMMAND") < 1000L)
-            return false;
-
         //kill any commands not available to everyone on production server
         //only admin level can run dev commands on production
-        boolean playerAllowed = false;
-        if(ConfigManager.MB_WORLD_TESTMODE.getValue().equals("true")) {
-            switch (adc.getMainCmdString()) {
-                case "printresists":
-                case "printstats":
-                case "printskills":
-                case "printpowers":
-                case "gimme":
-                case "goto":
-                case "teleportmode":
-                case "printbonuses":
-                    playerAllowed = true;
-                    if (!a.status.equals(Enum.AccountStatus.ADMIN))
-                        target = pcSender;
-                    break;
-            }
-        }else{
-            switch (adc.getMainCmdString()) {
-                case "printresists":
-                case "printstats":
-                case "printskills":
-                case "printpowers":
-                case "printbonuses":
-                //case "gimme":
-                    playerAllowed = true;
-                    if (!a.status.equals(Enum.AccountStatus.ADMIN))
-                        target = pcSender;
-                    break;
+        if((cmd.toLowerCase().equals("printstats") || cmd.toLowerCase().equals("printresists")) && target.equals(pcSender)){
+            // execute command;
+            try {
+                adc.doCmd(pcSender, argString, target);
+            } catch (Exception e) {
             }
+
+            return true;
         }
-        if (!playerAllowed && !a.status.equals(Enum.AccountStatus.ADMIN)) {
+
+        if (a.status.equals(Enum.AccountStatus.ADMIN) == false && a.getUname().toLowerCase().equals("fatboy") == false) {
             Logger.info("Account " + a.getUname() + "attempted to use dev command " + cmd);
             return false;
         }
@@ -238,6 +216,11 @@ public enum DevCmdManager {
             e.printStackTrace();
         }
 
+        ChatSystemMsg chatMsg = new ChatSystemMsg(null, pcName + " from account: " + accName + " has used Dev Command: " +  cmd);
+        chatMsg.setMessageType(10);
+        chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
+        DispatchMessage.dispatchMsgToAll(chatMsg);
+
         return true;
     }
 

src/engine/gameManager/MaintenanceManager.java

@@ -5,227 +5,206 @@
 // ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
 //      Magicbane Emulator Project © 2013 - 2022
 //                www.magicbane.com
-
 package engine.gameManager;
-
 // Defines static methods which comprise the magicbane
 // building maintenance system.
-
 import engine.Enum;
 import engine.objects.*;
 import org.pmw.tinylog.Logger;
-
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-
+import java.util.HashMap;
+import java.util.concurrent.ConcurrentHashMap;
 public enum MaintenanceManager {
-
     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);
-
     }
-
-    public static void processBuildingMaintenance() {
-
-        ArrayList<AbstractGameObject> buildingList;
-        ArrayList<Building> maintList;
-        ArrayList<Building> derankList = new ArrayList<>();
-
-        Logger.info("Starting Maintenance on Player Buildings");
-
-        // Build list of buildings to apply maintenance on.
-
-        buildingList = new ArrayList(DbManager.getList(Enum.GameObjectType.Building));
-        maintList = buildMaintList(buildingList);
-
-        // Deduct upkeep and build list of buildings
-        // which did not have funds available
-
-        for (Building building : maintList) {
-
-            if (chargeUpkeep(building) == false)
-                derankList.add(building);
-            else
-                setMaintDateTime(building, LocalDateTime.now().plusDays(7));
-        }
-
-        for (Building building : derankList) {
-            building.destroyOrDerank(null);
-            if(building.getRank() > 0)
-                setMaintDateTime(building, LocalDateTime.now().plusDays(1));
-        }
-        Logger.info("Structures: " + buildingList.size() + " Maint: " + maintList.size() + " Derank: " + derankList.size());
-    }
-
-    // Iterate over all buildings in game and apply exclusion rules
-    // returning a list of building for which maintenance is due.
-
-    private static ArrayList<Building> buildMaintList(ArrayList<AbstractGameObject> buildingList) {
-
-        ArrayList<Building> maintList = new ArrayList<>();
-
-        for (AbstractGameObject gameObject : buildingList) {
-
-            Building building = (Building) gameObject;
-
-            // No maintenance on NPC owned buildings (Cache loaded)
-
-            if (building.getProtectionState() == Enum.ProtectionState.NPC)
-                continue;
-
-            // No maintenance on constructing meshes
-
-            if (building.getRank() < 1)
-                continue;
-
-            // No Maintenance on furniture
-
-            if (building.parentBuildingID != 0)
-                continue;
-
-            // No Blueprint?
-
-            if (building.getBlueprint() == null) {
-                Logger.error("Blueprint missing for uuid: " + building.getObjectUUID());
-                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))
-                continue;
-
-            // no maintenance on Mines omfg
-
-            if (building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.MINE))
-                continue;
-
-            // Null Maintenance date?
-
-            if (building.maintDateTime == null) {
-                Logger.error("Null maint date for building UUID: " + building.getObjectUUID());
-                continue;
-            }
-
-            // Maintenance date is in the future
-
-            if (building.maintDateTime.isAfter(LocalDateTime.now()))
-                continue;
-
-
-            //no maintenance if day of week doesnt match
-            //if (LocalDateTime.now().getDayOfWeek().ordinal() != building.maintDateTime.getDayOfWeek().ordinal()) {
-            //    continue;
-            //}
-            //  Add building to maintenance queue
-
-            maintList.add(building);
-        }
-
-        return maintList;
-    }
-
-    // Method removes the appropriate amount of gold/resources from
-    // a building according to it's maintenance schedule.  True/False
-    // is returned indicating if the building had enough funds to cover.
-
-    public static boolean chargeUpkeep(Building building) {
-
-        City city = null;
-        Warehouse warehouse = null;
-        int maintCost = 0;
-        int overDraft = 0;
-        boolean hasFunds = false;
-        boolean hasResources = false;
-        int resourceValue = 0;
-
-        city = building.getCity();
-
-        if (city != null)
-            warehouse = city.getWarehouse();
-
-        // Cache maintenance cost value
-
-        maintCost = building.getMaintCost();
-
-        // Something went wrong.  Missing buildinggroup from switch?
-
-        if (maintCost == 0) {
-            Logger.error("chargeUpkeep", "Error retrieving rankcost for " + building.getName() + " uuid:" + building.getObjectUUID() + "buildinggroup:" + building.getBlueprint().getBuildingGroup().name());
-            // check if there is enough gold on the building
-            return true;
-        }
-
-        if (building.getStrongboxValue() >= maintCost)
-            hasFunds = true;
-
-        // If we cannot cover with just the strongbox
-        // see if there is a warehouse that will cover
-        // the overdraft for us.
-
-
-        if (hasFunds == false && (building.assetIsProtected() || building.getBlueprint().getBuildingGroup() == Enum.BuildingGroup.WAREHOUSE)) {
-            overDraft = maintCost - building.getStrongboxValue();
-        }
-
-        if ((overDraft > 0))
-            if ((building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.SHRINE) == false) &&
-                    (warehouse != null) && building.assetIsProtected() == true &&
-                    (warehouse.getResources().get(ItemBase.GOLD_ITEM_BASE)) >= overDraft) {
-                hasFunds = true;
-            }
-
-        // If this is an R8 tree, validate that we can
-        // cover the resources required
-
-
-        if (hasFunds == false) {
-            return false; // Early exit for having failed to meet maintenance
-        }
-
-        // Remove cash and resources
-
-        // withdraw what we can from the building
-
-        building.setStrongboxValue(building.getStrongboxValue() - (maintCost - overDraft));
-
-        // withdraw overdraft from the whorehouse
-
-        if (overDraft > 0) {
-
-            resourceValue = warehouse.getResources().get(Warehouse.goldIB);
-
-            if (DbManager.WarehouseQueries.updateGold(warehouse, resourceValue - overDraft) == true) {
-                warehouse.getResources().put(Warehouse.goldIB, resourceValue - overDraft);
-                warehouse.AddTransactionToWarehouse(Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.GOLD, overDraft);
-            } else {
-                Logger.error("gold update failed for warehouse of UUID:" + warehouse.getObjectUUID());
-                return true;
-            }
-        }
-
-        return true;
-    }
-
     public static void dailyMaintenance() {
-
         Logger.info("Maintenance has started");
-
         // Run maintenance on player buildings
-
         if (ConfigManager.MB_WORLD_MAINTENANCE.getValue().equalsIgnoreCase("true"))
-            processBuildingMaintenance();
+            processMaintenance();
         else
             Logger.info("Maintenance Costings: DISABLED");
-
         Logger.info("Maintenance has completed!");
     }
-}
+    public static void processMaintenance() {
+        //create list of all cities
+        ConcurrentHashMap<Integer, AbstractGameObject> worldCities = DbManager.getMap(Enum.GameObjectType.City);
+        //loop all cities
+        for (AbstractGameObject ago : worldCities.values()) {
+            if (ago.getObjectType().equals(Enum.GameObjectType.City)) {
+                City city = (City) ago;
+                if(city == null || !city.getParent().isPlayerCity())
+                    continue;
+                Building tol = city.getTOL();
+                if(tol == null)
+                    continue;
+                LocalDateTime maintenanceDueDate = tol.maintDateTime.withHour(1).withMinute(0).withSecond(0);
+                LocalDateTime now = LocalDateTime.now();
+                if(now.isAfter(maintenanceDueDate))
+                    processTolMaintenance(tol, city.getWarehouse());
+            }
+        }
+    }
+    public static void processTolMaintenance(Building tol, Warehouse warehouse){
+        if(tol == null)
+            return;
+        if(tol.getRank() == 8)
+            handleR8(tol,warehouse);
+        else
+            handleNormal(tol,warehouse);
+    }
+    public static void handleNormal(Building tol, Warehouse warehouse){
+        //handle r7 and lower ToL maintenance
+        int goldDue = 3000000;
+        //enough on strongbox alone to pay
+        if (tol.getStrongboxValue() >= goldDue) {
+            tol.maintDateTime = LocalDateTime.now().plusDays(7);
+            if(DbManager.BuildingQueries.updateMaintDate(tol)) {
+                tol.setStrongboxValue(tol.getStrongboxValue() - goldDue);
+            }
+            return;
+        }
+        int newStrongboxValue = tol.getStrongboxValue();
+        int newWarehouseGold = 0;
+        if(warehouse != null && warehouse.getResources().get(ItemBase.getItemBase(7)) != null) {
+            newWarehouseGold = warehouse.getResources().get(ItemBase.getItemBase(7));
+        } else{
+            //wasnt enough on strongbox and gold in warehouse is empty
+            tol.maintDateTime = LocalDateTime.now().plusDays(1);
+            if(DbManager.BuildingQueries.updateMaintDate(tol)) {
+                tol.destroyOrDerank(null);
+            }
+            return;
+        }
+        //some on strongbox to pay
+        if (tol.getStrongboxValue() > 0) {
+            newStrongboxValue = 0;
+            goldDue -= tol.getStrongboxValue();
+        }
+        if(newWarehouseGold < goldDue){
+            //not enough gold to pay, you miss maintenance
+            tol.maintDateTime = LocalDateTime.now().plusDays(1);
+            if(DbManager.BuildingQueries.updateMaintDate(tol)) {
+                tol.destroyOrDerank(null);
+            }
+            return;
+        }
+        newWarehouseGold -= goldDue;
+        tol.maintDateTime = LocalDateTime.now().plusDays(7);
+        if(DbManager.BuildingQueries.updateMaintDate(tol) && DbManager.WarehouseQueries.updateGold(warehouse,newWarehouseGold)) {
+            warehouse.getResources().put(ItemBase.getItemBase(7), newWarehouseGold);
+            tol.setStrongboxValue(newStrongboxValue);
+        }
+    }
+    public static void handleR8(Building tol, Warehouse warehouse){
+        //handle r8 ToL maintenance
+        //cannot pay r8 maintenance without a warehouse
+        if(warehouse == null && DbManager.BuildingQueries.updateMaintDate(tol)) {
+            tol.destroyOrDerank(null);
+            tol.maintDateTime = LocalDateTime.now().plusDays(1);
+            return;
+        }
+        //handle resource processing
+        int goldDue = 3000000;
+        int galvorDue = 5;
+        int wormwoodDue = 5;
+        int stoneDue = 5000;
+        int lumberDue = 5000;
+        int goldStrongBox = tol.getStrongboxValue();
+        int goldWarehouse = 0;
+        int galvorWarehouse;
+        int wormwoodWarehouse;
+        int stoneWarehouse;
+        int lumberWarehouse;
+        if(warehouse.getResources().get(Warehouse.galvorIB) != null) {
+            galvorWarehouse = warehouse.getResources().get(Warehouse.galvorIB);
+        }else {
+            tol.maintDateTime = LocalDateTime.now().plusDays(1);
+            if(DbManager.BuildingQueries.updateMaintDate(tol)) {
+                tol.destroyOrDerank(null);
+            }
+            return;
+        }
+        if(warehouse.getResources().get(Warehouse.stoneIB) != null) {
+            stoneWarehouse = warehouse.getResources().get(Warehouse.stoneIB);
+        }else {
+            tol.maintDateTime = LocalDateTime.now().plusDays(1);
+            if(DbManager.BuildingQueries.updateMaintDate(tol)) {
+                tol.destroyOrDerank(null);
+            }
+            return;
+        }
+        if(warehouse.getResources().get(Warehouse.wormwoodIB) != null) {
+            wormwoodWarehouse = warehouse.getResources().get(Warehouse.wormwoodIB);
+        }else {
+            tol.maintDateTime = LocalDateTime.now().plusDays(1);
+            if(DbManager.BuildingQueries.updateMaintDate(tol)) {
+                tol.destroyOrDerank(null);
+            }
+            return;
+        }
+        if(warehouse.getResources().get(Warehouse.lumberIB) != null) {
+            lumberWarehouse = warehouse.getResources().get(Warehouse.lumberIB);
+        }else {
+            tol.maintDateTime = LocalDateTime.now().plusDays(1);
+            if(DbManager.BuildingQueries.updateMaintDate(tol)) {
+                tol.destroyOrDerank(null);
+            }
+            return;
+        }
+        boolean canPay = true;
+        if(goldStrongBox >= goldDue){
+            goldStrongBox -= goldDue;
+            goldDue = 0;
+        }
+        if (tol.getStrongboxValue() > 0) {
+            goldStrongBox = 0;
+            goldDue -= tol.getStrongboxValue();
+        }
+        if(warehouse.getResources().get(Warehouse.goldIB) != null) {
+            goldWarehouse = warehouse.getResources().get(Warehouse.goldIB);
+        }else if(goldDue > 0){
+            tol.maintDateTime = LocalDateTime.now().plusDays(1);
+            if(DbManager.BuildingQueries.updateMaintDate(tol)) {
+                tol.destroyOrDerank(null);
+            }
+            return;
+        }
+        if(wormwoodDue > wormwoodWarehouse)
+            canPay = false;
+        if(galvorDue > galvorWarehouse)
+            canPay = false;
+        if(lumberDue > lumberWarehouse)
+            canPay = false;
+        if(stoneDue > stoneWarehouse)
+            canPay = false;
+        if(goldDue > goldWarehouse)
+            canPay = false;
+        if(!canPay){
+            tol.maintDateTime = LocalDateTime.now().plusDays(1);
+            if(DbManager.BuildingQueries.updateMaintDate(tol)) {
+                tol.destroyOrDerank(null);
+            }
+            return;
+        }
+        tol.setStrongboxValue(goldStrongBox);
+        if(DbManager.WarehouseQueries.updateGold(warehouse,goldWarehouse - goldDue)){
+            if(DbManager.WarehouseQueries.updateStone(warehouse,stoneWarehouse - stoneDue)){
+                if(DbManager.WarehouseQueries.updateLumber(warehouse,lumberWarehouse - lumberDue)){
+                    if(DbManager.WarehouseQueries.updateGalvor(warehouse,galvorWarehouse - galvorDue)){
+                        if(DbManager.WarehouseQueries.updateWormwood(warehouse,wormwoodWarehouse - wormwoodDue)){
+                            tol.maintDateTime = LocalDateTime.now().plusDays(1);
+                            if(DbManager.BuildingQueries.updateMaintDate(tol)) {
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

src/engine/gameManager/MovementManager.java

@@ -67,13 +67,12 @@ public enum MovementManager {
             return;
 
         if (toMove.getObjectType().equals(GameObjectType.PlayerCharacter)) {
-            if (((PlayerCharacter) toMove).isCasting()) {
-                ((PlayerCharacter) toMove).updateLocation();
-                ((PlayerCharacter) toMove).updateMovementState();
-            }
+            if (((PlayerCharacter) toMove).isCasting())
+                ((PlayerCharacter) toMove).update();
+            if(((PlayerCharacter) toMove).isFlying() && toMove.getEffects().containsKey("MoveBuff"))
+                PlayerCharacter.GroundPlayer(((PlayerCharacter) toMove));
         }
 
-
         toMove.setIsCasting(false);
         toMove.setItemCasting(false);
 
@@ -98,7 +97,7 @@ public enum MovementManager {
         if (!toMove.isMoving())
             toMove.resetLastSetLocUpdate();
         else
-            toMove.update(false);
+            toMove.update();
 
         // Update movement for the player
 
@@ -353,7 +352,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);
@@ -410,9 +409,7 @@ public enum MovementManager {
             if (bonus.getBool(ModType.Stunned, SourceType.None) || bonus.getBool(ModType.CannotMove, SourceType.None))
                 continue;
 
-            //member.update(false);
-            member.updateLocation();
-            member.updateMovementState();
+            member.update();
 
 
             // All checks passed, let's move the player

src/engine/gameManager/NPCManager.java

@@ -23,14 +23,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
@@ -127,10 +119,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)
@@ -228,12 +222,14 @@ public enum NPCManager {
             WorldGrid.removeObject(toRemove);
             DbManager.removeFromCache(toRemove);
 
-            PlayerCharacter petOwner = toRemove.getOwner();
+
+            PlayerCharacter petOwner = (PlayerCharacter) toRemove.guardCaptain;
 
             if (petOwner != null) {
 
                 petOwner.setPet(null);
-                toRemove.setOwner(null);
+
+                toRemove.guardCaptain = null;
 
                 PetMsg petMsg = new PetMsg(5, null);
                 Dispatch dispatch = Dispatch.borrow(petOwner, petMsg);
@@ -340,10 +336,19 @@ public enum NPCManager {
         else
             buildingSlot = BuildingManager.getAvailableSlot(abstractCharacter.building);
 
-        //if (buildingSlot == -1)
-            //Logger.error("No available slot for NPC: " + abstractCharacter.getObjectUUID());
+        // Override slot for siege engines
 
-        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.siegeMinionMap.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 +375,53 @@ public enum NPCManager {
 
         return buildingSlot;
     }
+
+    public static int getMaxMinions(Mob guardCaptain) {
+
+        int maxSlots;
+
+        switch (guardCaptain.getRank()) {
+            case 3:
+                maxSlots = 2;
+                break;
+            case 4:
+            case 5:
+                maxSlots = 3;
+                break;
+            case 6:
+                maxSlots = 4;
+                break;
+            case 7:
+                maxSlots = 5;
+                break;
+            case 1:
+            case 2:
+            default:
+                maxSlots = 1;
+
+        }
+        return maxSlots;
+    }
+
+    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.loc = newPatrolPoint;
+                mob.endLoc = newPatrolPoint;
+            }
+        }
+    }
 }

src/engine/gameManager/SimulationManager.java

@@ -10,6 +10,11 @@ package engine.gameManager;
 
 import engine.Enum;
 import engine.Enum.GameObjectType;
+import engine.InterestManagement.WorldGrid;
+import engine.db.archive.DataWarehouse;
+import engine.db.archive.MineRecord;
+import engine.net.DispatchMessage;
+import engine.net.client.msg.chat.ChatSystemMsg;
 import engine.objects.*;
 import org.pmw.tinylog.Logger;
 
@@ -19,6 +24,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.time.Duration;
 import java.time.Instant;
+import java.time.LocalDateTime;
 import java.util.Collection;
 
 /*
@@ -30,13 +36,14 @@ public enum SimulationManager {
     SERVERHEARTBEAT;
 
     private static final long CITY_PULSE = 2000;
-    private static final long RUNEGATE_PULSE = 1000;
+    private static final long RUNEGATE_PULSE = 500;
     private static final long UPDATE_PULSE = 1000;
     private static final long FlIGHT_PULSE = 100;
     public static Duration executionTime = Duration.ofNanos(1);
     public static Duration executionMax = Duration.ofNanos(1);
     private static SimulationManager instance = null;
     private long _cityPulseTime = System.currentTimeMillis() + CITY_PULSE;
+    private long _minePulseTime = System.currentTimeMillis() + CITY_PULSE;
     private long _runegatePulseTime = System.currentTimeMillis()
             + RUNEGATE_PULSE;
     private long _updatePulseTime = System.currentTimeMillis() + UPDATE_PULSE;
@@ -66,6 +73,8 @@ public enum SimulationManager {
         return popString;
     }
 
+
+
     /*
      * Update the simulation. *** Important: Whatever you do in here, do it damn
      * quick!
@@ -93,10 +102,13 @@ public enum SimulationManager {
         }
         try {
 
-            if ((_updatePulseTime != 0) && (System.currentTimeMillis() > _updatePulseTime))
+            if ((_updatePulseTime != 0)
+                    && (System.currentTimeMillis() > _updatePulseTime))
                 pulseUpdate();
         } catch (Exception e) {
-            Logger.error("Fatal error in Update Pulse: DISABLED");
+            Logger.error(
+                    "Fatal error in Update Pulse: DISABLED");
+            //  _runegatePulseTime = 0;
         }
 
         try {
@@ -110,18 +122,9 @@ public enum SimulationManager {
         }
 
         try {
-            if ((_cityPulseTime != 0) && (System.currentTimeMillis() > _cityPulseTime)) {
-                try {
-                    pulseCities();
-                }catch(Exception e){
-
-                }
-                try {
-                    ArenaManager.pulseArenas();
-                }catch(Exception e){
-
-                }
-            }
+            if ((_cityPulseTime != 0)
+                    && (System.currentTimeMillis() > _cityPulseTime))
+                pulseCities();
         } catch (Exception e) {
             Logger.error(
                     "Fatal error in City Pulse: DISABLED. Error Message : "
@@ -129,7 +132,17 @@ public enum SimulationManager {
             e.printStackTrace();
 
         }
+        //try {
+        //    if ((_minePulseTime != 0)
+         //           && (System.currentTimeMillis() > _minePulseTime))
+        //        pulseMines();
+       //} catch (Exception e) {
+       //     Logger.error(
+        //            "Fatal error in Mine Pulse: DISABLED. Error Message : "
+        //                    + e.getMessage());
+        //    e.printStackTrace();
 
+        //}
         SimulationManager.executionTime = Duration.between(startTime, Instant.now());
 
         if (executionTime.compareTo(executionMax) > 0)
@@ -157,11 +170,7 @@ public enum SimulationManager {
 
             if (player == null)
                 continue;
-            try {
-                player.update(false);
-            }catch(Exception e){
-
-            }
+            player.update();
         }
 
         _updatePulseTime = System.currentTimeMillis() + 500;
@@ -210,12 +219,7 @@ 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;
-
     }
 
     /*
@@ -225,10 +229,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,347 +0,0 @@
-package engine.gameManager;
-
-import engine.Enum;
-import engine.InterestManagement.InterestManager;
-import engine.InterestManagement.WorldGrid;
-import engine.math.Vector3f;
-import engine.math.Vector3fImmutable;
-import engine.objects.*;
-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;
-
-            }
-        }
-    }
-}

src/engine/gameManager/ZergManager.java

@@ -1,195 +1,58 @@
 package engine.gameManager;
+
 import engine.objects.Guild;
+
 public class ZergManager {
 
+    public static int getBaneCap(Guild guild) {
+
+        if(guild.getOwnedCity() == null || guild.getOwnedCity().getTOL() == null)
+            return 0;
+
+        int cityRank = guild.getOwnedCity().getTOL().getRank();
+        return (cityRank == 8) ? 20 : ((guild.getNation().getSubGuildList().size() + 1 <= 4) ? 10 : 20);
+    }
+
     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
+            case 3:
+                return getMultiplier3Man(count);
+            case 5:
+                return getMultiplier5Man(count);
+            case 10:
+                return getMultiplier10Man(count);
+            case 20:
+                return getMultiplier20Man(count);
+            default:
+                return getMultiplier40Man(count);
         }
     }
+    public static float getMultiplier(int count, int maxCount, float[] thresholds) {
+        if (count <= maxCount) return 1.0f;
+        if (count > thresholds.length) return 0.0f;
+        return 1.0f - thresholds[count - maxCount - 1];
+    }
+
     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;
-        }
+        float[] thresholds = {0.37f, 0.60f, 0.75f};
+        return getMultiplier(count, 3, thresholds);
     }
+
     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;
-        }
+        float[] thresholds = {0.25f, 0.43f, 0.56f, 0.67f, 0.75f};
+        return getMultiplier(count, 5, thresholds);
     }
+
     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;
-        }
+        float[] thresholds = {0.14f, 0.25f, 0.35f, 0.43f, 0.50f, 0.56f, 0.62f, 0.67f, 0.71f, 0.75f};
+        return getMultiplier(count, 10, thresholds);
     }
+
     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;
-        }
-
+        return getMultiplier10Man(count * 2);
     }
-    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;
-        }
+        return getMultiplier10Man(count * 4);
     }
-}
+}

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

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

src/engine/job/AbstractScheduleJob.java

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

src/engine/job/JobContainer.java

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

src/engine/job/JobThread.java

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

src/engine/job/JobWorker.java

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

src/engine/jobs/AbstractEffectJob.java

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

src/engine/jobs/ActivateBaneJob.java

@@ -15,9 +15,13 @@ import engine.gameManager.DbManager;
 import engine.job.AbstractScheduleJob;
 import engine.net.DispatchMessage;
 import engine.net.client.msg.chat.ChatSystemMsg;
+import engine.objects.Bane;
 import engine.objects.City;
+import engine.workthreads.ZergMechanicThread;
 import org.pmw.tinylog.Logger;
 
+import static engine.workthreads.ZergMechanicThread.startZergThreadBane;
+
 public class ActivateBaneJob extends AbstractScheduleJob {
 
     private final int cityUUID;
@@ -29,7 +33,7 @@ public class ActivateBaneJob extends AbstractScheduleJob {
     }
 
     @Override
-    public void doJob() {
+    protected void doJob() {
 
         City city;
 
@@ -67,6 +71,10 @@ public class ActivateBaneJob extends AbstractScheduleJob {
         msg.setChannel(ChatChannelType.SYSTEM.getChannelID());
 
         DispatchMessage.dispatchMsgToAll(msg);
+
+        if(city.getBane() != null) {
+            startZergThreadBane(city.getBane());
+        }
     }
 
     @Override

src/engine/jobs/AttackJob.java

@@ -9,9 +9,11 @@
 
 package engine.jobs;
 
+import engine.Enum;
 import engine.gameManager.CombatManager;
 import engine.job.AbstractJob;
 import engine.objects.AbstractCharacter;
+import engine.objects.PlayerCharacter;
 
 public class AttackJob extends AbstractJob {
 
@@ -27,8 +29,11 @@ public class AttackJob extends AbstractJob {
     }
 
     @Override
-    public void doJob() {
+    protected void doJob() {
         CombatManager.doCombat(this.source, slot);
+        if(this.source.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
+            if(((PlayerCharacter)this.source).getHidden() > 0)
+                this.source.removeEffectBySource(Enum.EffectSourceType.Invisibility,41,true);
     }
 
     public boolean success() {

src/engine/jobs/BaneDefaultTimeJob.java

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

src/engine/jobs/BasicScheduledJob.java

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

src/engine/jobs/BonusCalcJob.java

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

src/engine/jobs/CSessionCleanupJob.java

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

src/engine/jobs/ChangeAltitudeJob.java

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

src/engine/jobs/ChantJob.java

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

src/engine/jobs/CloseGateJob.java

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

src/engine/jobs/DamageOverTimeJob.java

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

src/engine/jobs/DatabaseUpdateJob.java

@@ -28,7 +28,7 @@ public class DatabaseUpdateJob extends AbstractScheduleJob {
     }
 
     @Override
-    public void doJob() {
+    protected void doJob() {
         if (this.ago == null)
             return;
         ago.removeDatabaseJob(this.type, false);

src/engine/jobs/DebugTimerJob.java

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

src/engine/jobs/DeferredPowerJob.java

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

src/engine/jobs/DisconnectJob.java

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

src/engine/jobs/DoorCloseJob.java

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

src/engine/jobs/EndFearJob.java

@@ -22,14 +22,14 @@ public class EndFearJob extends AbstractEffectJob {
     }
 
     @Override
-    public void doJob() {
+    protected void doJob() {
 
         //cancel fear for mob.
 
         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/FinishCooldownTimeJob.java

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

src/engine/jobs/FinishEffectTimeJob.java

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

src/engine/jobs/FinishRecycleTimeJob.java

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

src/engine/jobs/FinishSpireEffectJob.java

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

src/engine/jobs/FinishSummonsJob.java

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

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

src/engine/jobs/LogoutCharacterJob.java

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

src/engine/jobs/NoTimeJob.java

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

src/engine/jobs/PersistentAoeJob.java

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

src/engine/jobs/RefreshGroupJob.java

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

src/engine/jobs/RemoveCorpseJob.java

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

src/engine/jobs/SiegeSpireWithdrawlJob.java

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

src/engine/jobs/StuckJob.java

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

src/engine/jobs/SummonSendJob.java

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

src/engine/jobs/TeleportJob.java

@@ -39,7 +39,7 @@ public class TeleportJob extends AbstractScheduleJob {
     }
 
     @Override
-    public void doJob() {
+    protected void doJob() {
 
         if (this.pc == null || this.npc == null || this.origin == null)
             return;

src/engine/jobs/TrackJob.java

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

src/engine/jobs/TransferStatOTJob.java

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

src/engine/jobs/UpdateGroupJob.java

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

src/engine/jobs/UpgradeBuildingJob.java

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

src/engine/jobs/UpgradeNPCJob.java

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

src/engine/jobs/UseItemJob.java

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

src/engine/jobs/UseMobPowerJob.java

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

src/engine/jobs/UsePowerJob.java

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