Fixes for /mob, /npc, and /equipset commands.

This reverts commit 1c31070fc8.

src/engine/Enum.java

@@ -46,7 +46,7 @@ public class Enum {
         EXPLOIT,
         BUG,
         GAME_STOPPER,
-        TECH_SUPPORT
+        TECH_SUPPORT;
 
     }
 
@@ -112,7 +112,7 @@ public class Enum {
         Undead,
         Nephilim,
         Vampire,
-        SiegeEngineer
+        SiegeEngineer;
 
     }
 
@@ -120,7 +120,7 @@ public class Enum {
         MALE,
         FEMALE,
         FUZZY,
-        OTHER
+        OTHER;
     }
 
     public enum RaceType {
@@ -155,13 +155,13 @@ public class Enum {
         VAMPFEMALE(2029, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.FEMALE, 1);
 
         @SuppressWarnings("unchecked")
-        private static final HashMap<Integer, RaceType> _raceTypeByID = new HashMap<>();
+        private static HashMap<Integer, RaceType> _raceTypeByID = new HashMap<>();
 
         int runeID;
-        private final MonsterType monsterType;
+        private MonsterType monsterType;
-        private final CharacterSex characterSex;
+        private CharacterSex characterSex;
-        private final RunSpeed runSpeed;
+        private RunSpeed runSpeed;
-        private final float scaleHeight;
+        private float scaleHeight;
 
         RaceType(int runeID, MonsterType aggroType, RunSpeed runspeed, CharacterSex characterSex, float scaleHeight) {
             this.runeID = runeID;
@@ -210,13 +210,13 @@ public class Enum {
         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);
 
-        private final float walkStandard;
+        private float walkStandard;
-        private final float walkCombat;
+        private float walkCombat;
-        private final float runStandard;
+        private float runStandard;
-        private final float runCombat;
+        private float runCombat;
-        private final float swim;
+        private float swim;
-        private final float flyRun;
+        private float flyRun;
-        private final float flyWalk;
+        private float flyWalk;
 
         RunSpeed(float walkStandard, float runStandard, float walkCombat, float runCombat, float flyWalk, float flyRun, float swim) {
             this.walkStandard = walkStandard;
@@ -310,13 +310,13 @@ public class Enum {
 
     public enum PvpHistoryType {
         KILLS,
-        DEATHS
+        DEATHS;
     }
 
     public enum ChatMessageType {
         ERROR,
         INFO,
-        MOTD
+        MOTD;
     }
 
     public enum DataRecordType {
@@ -327,7 +327,7 @@ public class Enum {
         CITY,
         ZONE,
         REALM,
-        MINE
+        MINE;
     }
 
     public enum RecordEventType {
@@ -338,7 +338,7 @@ public class Enum {
         TRANSFER,
         PENDING,
         DEFEND,
-        LOST // Realm event
+        LOST; // Realm event
     }
 
     public enum CharterType {
@@ -346,8 +346,8 @@ public class Enum {
         MERCANTILE(-15978914, 5060400),
         BELLIGERENT(762228431, 5060800);
 
-        private final int charterID;
+        private int charterID;
-        private final int meshID;
+        private int meshID;
 
         CharterType(int charterID, int meshID) {
             this.charterID = charterID;
@@ -402,7 +402,7 @@ public class Enum {
         Npc,
         PlayerCharacter,
         Account,
-        Mob
+        Mob;
     }
 
     public enum SiegePhase {
@@ -410,20 +410,20 @@ public class Enum {
         CHALLENGE,
         STANDOFF,
         WAR,
-        CEASEFIRE
+        CEASEFIRE;
     }
 
     public enum SiegeResult {
         PENDING,
         DEFEND,
         DESTROY,
-        CAPTURE
+        CAPTURE;
     }
 
     public enum TaxType {
         PROFIT,
         WEEKLY,
-        NONE
+        NONE;
 
     }
 
@@ -469,7 +469,7 @@ public class Enum {
 
                 // 14001 does not have a banestone to bind at
 
-                if (ruinZone.templateID == 14001)
+                if (ruinZone.getLoadNum() == 14001)
                     spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc(), 30);
                 else
                     spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc()
@@ -1261,7 +1261,7 @@ public class Enum {
         SITTING,
         RUNNING,
         FLYING,
-        SWIMMING
+        SWIMMING;
     }
 
     public enum DoorState {
@@ -1269,7 +1269,7 @@ public class Enum {
         OPEN,
         CLOSED,
         LOCKED,
-        UNLOCKED
+        UNLOCKED;
     }
 
     // Used with stored procedure GET_UID_ENUM() for
@@ -1290,9 +1290,11 @@ public class Enum {
         SHRINE,
         WORLDSERVER,
         ZONE,
-        WAREHOUSE
+        WAREHOUSE;
     }
 
+    ;
+
     /**
      * Enumeration of Building Protection Status stored in the database as a
      * mysql enumfield. WARNING: This enumeration is fragile. Do not rename. Do
@@ -1307,63 +1309,10 @@ public class Enum {
         CONTRACT,
         DESTROYED,
         PENDING,
-        NPC
+        NPC;
     }
 
-    public enum DisciplineType {
+    ;
-
-        Alchemist,
-        Animator,
-        Archer,
-        Berserker,
-        BlackMask,
-        Blacksmith,
-        BladeMaster,
-        BladeWeaver,
-        BloodProphet,
-        BountyHunter,
-        Clanwarden,
-        Commander,
-        DarkKnight,
-        Duelist,
-        ForgeMaster,
-        GiantKiller,
-        Gladiator,
-        Huntsman,
-        Knight,
-        RatCatcher,
-        RuneCaster,
-        Enchanter,
-        StormLord,
-        Summoner,
-        Sundancer,
-        Trainer,
-        Traveler,
-        UndeadHunter,
-        Werebear,
-        Wererat,
-        Werewolf,
-        Wyrmslayer,
-        Conjurer,
-        Darksworn,
-        Valkyr,
-        BloodHorn,
-        Shroudborne,
-        Archmage,
-        Thrall,
-        Artillerist,
-        Savant,
-        SkyDancer,
-        Prospector,
-        Belgosch,
-        Drannok,
-        Gorgoi,
-        Strigoi,
-        Sapper,
-        Saboteur,
-        BattleMagus,
-        Sanctifier,
-    }
 
     public enum CharacterSkills {
 
@@ -1433,7 +1382,7 @@ public class Enum {
 
         private long flag;
         private int token;
-        private final int reqLvl;
+        private int reqLvl;
 
         CharacterSkills(long flag, int token, int reqLvl) {
             this.flag = flag;
@@ -1472,6 +1421,8 @@ public class Enum {
         }
     }
 
+    ;
+
     public enum GuildHistoryType {
         JOIN(1),
         LEAVE(4),
@@ -1492,14 +1443,17 @@ public class Enum {
     public enum SexType {
         NONE,
         MALE,
-        FEMALE
+        FEMALE;
     }
 
     public enum ClassType {
-        Fighter(SexType.NONE),
+        FIGHTER,
-        Healer(SexType.NONE),
+        HEALER,
-        Rogue(SexType.NONE),
+        ROGUE,
-        Mage(SexType.NONE),
+        MAGE;
+    }
+
+    public enum PromoteType {
         Assassin(SexType.NONE),
         Barbarian(SexType.NONE),
         Bard(SexType.NONE),
@@ -1524,9 +1478,9 @@ public class Enum {
         Necromancer(SexType.NONE),
         ;
 
-        private final SexType sexRestriction;
+        private SexType sexRestriction;
 
-        ClassType(SexType sexRestriction) {
+        PromoteType(SexType sexRestriction) {
             this.sexRestriction = sexRestriction;
         }
 
@@ -1706,13 +1660,13 @@ public class Enum {
         REGEN,
         FLIGHT,
         LOCATION,
-        MOVEMENTSTATE
+        MOVEMENTSTATE;
     }
 
     public enum ServerType {
         WORLDSERVER,
         LOGINSERVER,
-        NONE
+        NONE;
     }
 
     public enum ChatChannel implements EnumBitSetHelper<ChatChannel> {
@@ -1766,7 +1720,7 @@ public class Enum {
         Thief,
         Warlock,
         Warrior,
-        Wizard
+        Wizard;
 
     }
 
@@ -1774,13 +1728,13 @@ public class Enum {
         RecommendedAlly,
         RecommendedEnemy,
         Ally,
-        Enemy
+        Enemy;
     }
 
     public enum FriendStatus {
         Available,
         Away,
-        Busy
+        Busy;
     }
 
     public enum ProfitType {
@@ -1795,7 +1749,7 @@ public class Enum {
 
         public String dbField;
 
-        ProfitType(String dbField) {
+        private ProfitType(String dbField) {
             this.dbField = dbField;
         }
     }
@@ -1888,15 +1842,17 @@ public class Enum {
         WorldServerInfoSnapshot,
         Shrine,
         Zone,
-        Transaction
+        Transaction;
     }
 
     public enum ContainerType {
         BANK,
         INVENTORY,
-        VAULT
+        VAULT;
     }
 
+    ;
+
     public enum CompoundCurveType {
         DefaultFlat(0),
         DefaultSlope(1),
@@ -2204,7 +2160,7 @@ public class Enum {
 
         private final double value;
 
-        CompoundCurveType(double value) {
+        private CompoundCurveType(double value) {
 
             this.value = value;
         }
@@ -2227,7 +2183,7 @@ public class Enum {
         Sit,
         TakeDamage,
         TerritoryClaim,
-        UnEquip
+        UnEquip;
     }
 
     public enum PowerSubType {
@@ -2237,7 +2193,7 @@ public class Enum {
         DamageType1,
         DamageType2,
         DamageType3,
-        Cancel
+        Cancel;
     }
 
     public enum PowerCategoryType {
@@ -2272,7 +2228,7 @@ public class Enum {
         RECALL,
         SPIREPROOFTELEPORT,
         SPIREDISABLE,
-        THIEF
+        THIEF;
     }
 
     public enum PowerTargetType {
@@ -2291,7 +2247,7 @@ public class Enum {
         JEWELRY,
         WEAPONARMOR,
         ARMOR,
-        ITEM
+        ITEM;
     }
 
     public enum objectMaskType {
@@ -2324,7 +2280,7 @@ public class Enum {
         BANK,
         VAULT,
         FORGE,
-        WAREHOUSE
+        WAREHOUSE;
     }
 
     public enum ItemSlotType implements EnumBitSetHelper<ItemSlotType> {
@@ -2345,7 +2301,7 @@ public class Enum {
         UPARM,
         WINGS,
         BEARD,
-        HAIR
+        HAIR;
     }
 
     public enum CityBoundsType {
@@ -2354,19 +2310,15 @@ public class Enum {
         ZONE(875),
         PLACEMENT(876);
 
-        public final float halfExtents;
+        public final float extents;
 
-        CityBoundsType(float halfExtents) {
+        CityBoundsType(float extents) {
-            this.halfExtents = halfExtents;
+            this.extents = extents;
         }
     }
 
-    public enum GuildCharterType {
+    public enum GuildType {
-        NONE("None", new String[][]{{"None"}}, new String[]{"Thearchy", "Common Rule", "Theocracy", "Republic Rule"},
+        NONE("None", new String[][]{{"None"}}, new String[]{"Thearchy", "Common Rule", "Theocracy", "Republic Rule"}),
-                EnumSet.noneOf(ClassType.class),
-                EnumSet.noneOf(MonsterType.class),
-                EnumSet.noneOf(SexType.class)),
-
         CATHEDRAL("Church of the All-Father", new String[][]{
                 {"Acolyte", "Acolyte"},
                 {"Catechist"},
@@ -2376,12 +2328,7 @@ public class Enum {
                 {"Bishop", "Bishop"},
                 {"Lord Cardinal", "Lady Cardinal"},
                 {"Patriarch", "Matriarch"}},
-                new String[]{"Thearchy", "Common Rule", "Theocracy", "Republic Rule"},
+                new String[]{"Thearchy", "Common Rule", "Theocracy", "Republic Rule"}),
-                EnumSet.of(ClassType.Bard, ClassType.Channeler, ClassType.Crusader, ClassType.Nightstalker,
-                        ClassType.Prelate, ClassType.Priest, ClassType.Sentinel, ClassType.Scout),
-                EnumSet.of(MonsterType.Aelfborn, MonsterType.Centaur, MonsterType.Elf, MonsterType.HalfGiant,
-                        MonsterType.Human),
-                EnumSet.allOf(SexType.class)),
         MILITARY("Military", new String[][]{
                 {"Recruit"},
                 {"Footman"},
@@ -2391,11 +2338,7 @@ public class Enum {
                 {"Captain"},
                 {"General"},
                 {"Lord Marshall", "Lady Marshall"}},
-                new String[]{"Autocracy", "Common Rule", "Council Rule", "Militocracy"},
+                new String[]{"Autocracy", "Common Rule", "Council Rule", "Militocracy"}),
-                EnumSet.of(ClassType.Bard, ClassType.Priest, ClassType.Scout, ClassType.Warlock,
-                        ClassType.Warrior, ClassType.Wizard),
-                EnumSet.of(MonsterType.Centaur, MonsterType.HalfGiant, MonsterType.Human),
-                EnumSet.allOf(SexType.class)),
         TEMPLE("Temple of the Cleansing Flame", new String[][]{
                 {"Aspirant"},
                 {"Novice"},
@@ -2406,11 +2349,7 @@ public class Enum {
                 {"Lictor"},
                 {"Justiciar"},
                 {"Pontifex", "Pontifectrix"}},
-                new String[]{"Despot Rule", "Common Rule", "Protectorship", "Republic Rule"},
+                new String[]{"Despot Rule", "Common Rule", "Protectorship", "Republic Rule"}),
-                EnumSet.of(ClassType.Assassin, ClassType.Bard, ClassType.Channeler, ClassType.Confessor,
-                        ClassType.Nightstalker, ClassType.Priest, ClassType.Scout, ClassType.Templar),
-                EnumSet.of(MonsterType.HalfGiant, MonsterType.Human),
-                EnumSet.allOf(SexType.class)),
         BARBARIAN("Barbarian Clan", new String[][]{
                 {"Barbarian"},
                 {"Skald"},
@@ -2419,11 +2358,7 @@ public class Enum {
                 {"Jarl"},
                 {"Chieftain"},
                 {"Thane"}},
-                new String[]{"Chiefdom", "Common Rule", "Council Rule", "Republic Rule"},
+                new String[]{"Chiefdom", "Common Rule", "Council Rule", "Republic Rule"}),
-                EnumSet.of(ClassType.Barbarian, ClassType.Bard, ClassType.Doomsayer, ClassType.Fury,
-                        ClassType.Priest, ClassType.Scout, ClassType.Thief, ClassType.Warrior),
-                EnumSet.of(MonsterType.Aelfborn, MonsterType.HalfGiant, MonsterType.Human, MonsterType.Minotaur),
-                EnumSet.allOf(SexType.class)),
         RANGER("Ranger's Brotherhood", new String[][]{
                 {"Yeoman"},
                 {"Pathfinder"},
@@ -2432,11 +2367,7 @@ public class Enum {
                 {"Protector"},
                 {"Guardian"},
                 {"Lord Protector", "Lady Protector"}},
-                new String[]{"Despot Rule", "Collectivism", "Council Rule", "Republic Rule"},
+                new String[]{"Despot Rule", "Collectivism", "Council Rule", "Republic Rule"}),
-                EnumSet.of(ClassType.Bard, ClassType.Channeler, ClassType.Druid, ClassType.Priest,
-                        ClassType.Ranger, ClassType.Scout, ClassType.Warrior),
-                EnumSet.of(MonsterType.Aelfborn, MonsterType.Elf, MonsterType.HalfGiant, MonsterType.Human, MonsterType.Shade),
-                EnumSet.allOf(SexType.class)),
         AMAZON("Amazon Temple", new String[][]{
                 {"Amazon Thrall", "Amazon"},
                 {"Amazon Slave", "Amazon Warrior"},
@@ -2444,11 +2375,7 @@ public class Enum {
                 {"Amazon Consort", "Amazon Princess"},
                 {"Amazon Seneschal", "Majestrix"},
                 {"Amazon Regent", "Imperatrix"}},
-                new String[]{"Despot Rule", "Common Rule", "Gynarchy", "Gynocracy"},
+                new String[]{"Despot Rule", "Common Rule", "Gynarchy", "Gynocracy"}),
-                EnumSet.of(ClassType.Bard, ClassType.Druid, ClassType.Fury, ClassType.Huntress,
-                        ClassType.Priest, ClassType.Scout, ClassType.Warrior, ClassType.Wizard),
-                EnumSet.of(MonsterType.Aelfborn, MonsterType.Elf, MonsterType.HalfGiant, MonsterType.Human),
-                EnumSet.of(SexType.FEMALE)),
         NOBLE("Noble House", new String[][]{
                 {"Serf"},
                 {"Vassal"},
@@ -2459,11 +2386,7 @@ public class Enum {
                 {"Duke", "Duchess"},
                 {"King", "Queen"},
                 {"Emperor", "Empress"}},
-                new String[]{"Monarchy", "Common Rule", "Feodality", "Republic"},
+                new String[]{"Monarchy", "Common Rule", "Feodality", "Republic"}),
-                EnumSet.of(ClassType.Assassin, ClassType.Bard, ClassType.Channeler, ClassType.Priest,
-                        ClassType.Scout, ClassType.Thief, ClassType.Warlock, ClassType.Warrior, ClassType.Wizard),
-                EnumSet.of(MonsterType.Aelfborn, MonsterType.HalfGiant, MonsterType.Human),
-                EnumSet.allOf(SexType.class)),
         WIZARD("Wizard's Conclave", new String[][]{
                 {"Apprentice"},
                 {"Neophyte"},
@@ -2472,11 +2395,7 @@ public class Enum {
                 {"Magus"},
                 {"High Magus"},
                 {"Archmagus"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Magocracy"},
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Magocracy"}),
-                EnumSet.of(ClassType.Assassin, ClassType.Bard, ClassType.Channeler, ClassType.Doomsayer,
-                        ClassType.Fury, ClassType.Necromancer, ClassType.Priest, ClassType.Warlock, ClassType.Wizard),
-                EnumSet.of(MonsterType.Aelfborn, MonsterType.Elf, MonsterType.Human, MonsterType.Nephilim, MonsterType.Shade),
-                EnumSet.allOf(SexType.class)),
         MERCENARY("Mercenary Company", new String[][]{
                 {"Soldier"},
                 {"Man-at-Arms"},
@@ -2486,11 +2405,7 @@ public class Enum {
                 {"Commander"},
                 {"High Commander"},
                 {"Warlord"}},
-                new String[]{"Magistrature", "Mob Law", "Council Rule", "Republic Rule"},
+                new String[]{"Magistrature", "Mob Law", "Council Rule", "Republic Rule"}),
-                EnumSet.of(ClassType.Assassin, ClassType.Bard, ClassType.Priest, ClassType.Scout,
-                        ClassType.Thief, ClassType.Warlock, ClassType.Warrior),
-                EnumSet.of(MonsterType.Aelfborn, MonsterType.Aracoix, MonsterType.HalfGiant, MonsterType.Human, MonsterType.Shade),
-                EnumSet.allOf(SexType.class)),
         THIEVES("Thieve's Den", new String[][]{
                 {"Urchin"},
                 {"Footpad"},
@@ -2501,12 +2416,7 @@ public class Enum {
                 {"Treasurer"},
                 {"Grandmaster Thief"},
                 {"Grandfather"}},
-                new String[]{"Despot Rule", "Common Rule", "Oligarchy", "Republic Rule"},
+                new String[]{"Despot Rule", "Common Rule", "Oligarchy", "Republic Rule"}),
-                EnumSet.of(ClassType.Assassin, ClassType.Barbarian, ClassType.Bard, ClassType.Priest,
-                        ClassType.Scout, ClassType.Thief, ClassType.Wizard),
-                EnumSet.of(MonsterType.Aelfborn, MonsterType.Aracoix, MonsterType.Elf, MonsterType.Human, MonsterType.Irekei,
-                        MonsterType.Nephilim, MonsterType.Shade, MonsterType.Vampire),
-                EnumSet.allOf(SexType.class)),
         DWARF("Dwarf Hold", new String[][]{
                 {"Citizen"},
                 {"Master"},
@@ -2514,11 +2424,7 @@ public class Enum {
                 {"Thane"},
                 {"Great Thane"},
                 {"High Thane"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
-                EnumSet.of(ClassType.Crusader, ClassType.Prelate, ClassType.Priest, ClassType.Sentinel,
-                        ClassType.Warrior),
-                EnumSet.of(MonsterType.Dwarf),
-                EnumSet.allOf(SexType.class)),
         HIGHCOURT("High Court", new String[][]{
                 {"Eccekebe"},
                 {"Saedulor"},
@@ -2529,12 +2435,7 @@ public class Enum {
                 {"Dar Thaelostor", "Dar Thaelostril"},
                 {"Aglaeron"},
                 {"Ellestor", "Elestril"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
-                EnumSet.of(ClassType.Assassin, ClassType.Bard, ClassType.Channeler, ClassType.Druid,
-                        ClassType.Necromancer, ClassType.Priest, ClassType.Ranger, ClassType.Scout,
-                        ClassType.Thief, ClassType.Warrior, ClassType.Wizard),
-                EnumSet.of(MonsterType.Elf, MonsterType.Minotaur),
-                EnumSet.allOf(SexType.class)),
         VIRAKT("Virakt", new String[][]{
                 {"Jov'uus"},
                 {"Urikhan"},
@@ -2544,12 +2445,7 @@ public class Enum {
                 {"Khal'uvho"},
                 {"Khar'uus"},
                 {"Kryqh'khalin"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
-                EnumSet.of(ClassType.Assassin, ClassType.Bard, ClassType.Channeler, ClassType.Fury,
-                        ClassType.Huntress, ClassType.Nightstalker, ClassType.Priest, ClassType.Ranger,
-                        ClassType.Scout, ClassType.Thief, ClassType.Warrior, ClassType.Wizard),
-                EnumSet.of(MonsterType.Irekei),
-                EnumSet.allOf(SexType.class)),
         BRIALIA("Coven of Brialia", new String[][]{ // Unknown Rank names
                 {"Devotee"},
                 {"Initiated"},
@@ -2559,11 +2455,7 @@ public class Enum {
                 {"Elder"},
                 {"Hierophant"},
                 {"Witch King", "Witch Queen"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
-                EnumSet.allOf(ClassType.class),
-                EnumSet.allOf(MonsterType.class),
-                EnumSet.allOf(SexType.class)),
-
         UNHOLY("Unholy Legion", new String[][]{ // Unknown Rank names
                 {"Footman"},
                 {"Fell Legionaire"},
@@ -2573,23 +2465,14 @@ public class Enum {
                 {"Dark Master", "Dark Mistress"},
                 {"Dread Master", "Dread Mistress"},
                 {"Dread Lord", "Dread Lady"}},
-                new String[]{"Despot Rule", "Despot Rule", "Council Rule", "Republic Rule"},
+                new String[]{"Despot Rule", "Despot Rule", "Council Rule", "Republic Rule"}),
-                EnumSet.of(ClassType.Assassin, ClassType.Channeler, ClassType.Necromancer, ClassType.Priest,
-                        ClassType.Scout, ClassType.Thief, ClassType.Warlock, ClassType.Warrior,
-                        ClassType.Wizard),
-                EnumSet.of(MonsterType.Human, MonsterType.Shade, MonsterType.Vampire),
-                EnumSet.allOf(SexType.class)),
         SCOURGE("Cult of the Scourge", new String[][]{
                 {"Thrall"},
                 {"Mudir"},
                 {"Dark Brother", "Dark Sister"},
                 {"Hand of the Dark"},
                 {"Dark Father", "Dark Mother"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
-                EnumSet.of(ClassType.Bard, ClassType.Channeler, ClassType.Doomsayer, ClassType.Priest,
-                        ClassType.Scout, ClassType.Warrior, ClassType.Wizard),
-                EnumSet.of(MonsterType.Aelfborn, MonsterType.Human, MonsterType.Minotaur, MonsterType.Nephilim),
-                EnumSet.allOf(SexType.class)),
         PIRATE("Pirate Crew", new String[][]{
                 {"Midshipman", "Midshipwoman"},
                 {"Sailor"},
@@ -2597,10 +2480,7 @@ public class Enum {
                 {"Second Mat"},
                 {"First Mate"},
                 {"Captain"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
-                EnumSet.allOf(ClassType.class),
-                EnumSet.allOf(MonsterType.class),
-                EnumSet.allOf(SexType.class)),
         HERALD("Academy of Heralds", new String[][]{
                 {"Pupil"},
                 {"Scribe"},
@@ -2610,10 +2490,7 @@ public class Enum {
                 {"Scholar"},
                 {"Archivist"},
                 {"Loremaster"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
-                EnumSet.allOf(ClassType.class),
-                EnumSet.allOf(MonsterType.class),
-                EnumSet.allOf(SexType.class)),
         CENTAUR("Centaur Cohort", new String[][]{
                 {"Hoplite"},
                 {"Peltast"},
@@ -2623,12 +2500,7 @@ public class Enum {
                 {"Septenrion"},
                 {"Praetorian"},
                 {"Paragon"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"}),
-                EnumSet.of(ClassType.Barbarian, ClassType.Crusader, ClassType.Druid, ClassType.Huntress,
-                        ClassType.Prelate, ClassType.Priest, ClassType.Ranger, ClassType.Sentinel,
-                        ClassType.Warrior),
-                EnumSet.of(MonsterType.Centaur),
-                EnumSet.allOf(SexType.class)),
         KHREE("Aracoix Kh'ree", new String[][]{
                 {"Duriacor"},
                 {"Exarch"},
@@ -2640,108 +2512,101 @@ public class Enum {
                 {"Erentar"},
                 {"Araceos"},
                 {"Hierarch"}},
-                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"},
-                EnumSet.of(ClassType.Assassin, ClassType.Barbarian, ClassType.Bard, ClassType.Huntress,
-                        ClassType.Priest, ClassType.Ranger, ClassType.Scout, ClassType.Thief,
-                        ClassType.Warlock, ClassType.Warrior),
-                EnumSet.of(MonsterType.Aracoix),
-                EnumSet.allOf(SexType.class));
 
-        public final EnumSet<ClassType> requiredClasses;
+                new String[]{"Despot Rule", "Common Rule", "Council Rule", "Republic Rule"});
-        public final EnumSet<MonsterType> requiredRaces;
+
-        public final EnumSet<SexType> sexRequired;
         private final String name;
         private final String[][] ranks;    //Stored Rank#->Gender(M,F)
         private final String[] leadershipTypes;
 
-        GuildCharterType(String name, String[][] ranks, String[] leadershipTypes, EnumSet<ClassType> requiredClasses,
+        GuildType(String name, String[][] ranks, String[] leadershipTypes) {
-                         EnumSet<MonsterType> requiredRaces, EnumSet<SexType> sexRequired) {
             this.name = name;
             this.ranks = ranks;
             this.leadershipTypes = leadershipTypes;
-            this.requiredClasses = requiredClasses;
-            this.requiredRaces = requiredRaces;
-            this.sexRequired = sexRequired;
         }
 
-        public static GuildCharterType getGuildTypeFromCharter(ItemBase itemBase) {
+        public static GuildType getGuildTypeFromCharter(ItemBase itemBase) {
 
-            GuildCharterType charterType;
+            GuildType charterType;
 
             // Must be a valid charter object
 
             if (itemBase.getType().equals(ItemType.GUILDCHARTER) == false)
-                return GuildCharterType.NONE;    //No guild Type
+                return GuildType.NONE;    //No guild Type
+
+            // No switches on long in java.  Cast to int
+            // when refactor to long uuid's.  Loss won't matter
+            // with values this small.
 
             switch (itemBase.getUUID()) {
 
                 case 559:
-                    charterType = GuildCharterType.CATHEDRAL;
+                    charterType = GuildType.CATHEDRAL;
                     break;
                 case 560:
-                    charterType = GuildCharterType.MILITARY;
+                    charterType = GuildType.MILITARY;
                     break;
                 case 561:
-                    charterType = GuildCharterType.TEMPLE;
+                    charterType = GuildType.TEMPLE;
                     break;
                 case 562:
-                    charterType = GuildCharterType.BARBARIAN;
+                    charterType = GuildType.BARBARIAN;
                     break;
                 case 563:
-                    charterType = GuildCharterType.RANGER;
+                    charterType = GuildType.RANGER;
                     break;
                 case 564:
-                    charterType = GuildCharterType.AMAZON;
+                    charterType = GuildType.AMAZON;
                     break;
                 case 565:
-                    charterType = GuildCharterType.NOBLE;
+                    charterType = GuildType.NOBLE;
                     break;
                 case 566:
-                    charterType = GuildCharterType.WIZARD;
+                    charterType = GuildType.WIZARD;
                     break;
                 case 567:
-                    charterType = GuildCharterType.MERCENARY;
+                    charterType = GuildType.MERCENARY;
                     break;
                 case 568:
-                    charterType = GuildCharterType.THIEVES;
+                    charterType = GuildType.THIEVES;
                     break;
                 case 569:
-                    charterType = GuildCharterType.DWARF;
+                    charterType = GuildType.DWARF;
                     break;
                 case 570:
-                    charterType = GuildCharterType.HIGHCOURT;
+                    charterType = GuildType.HIGHCOURT;
                     break;
                 case 571:
-                    charterType = GuildCharterType.VIRAKT;
+                    charterType = GuildType.VIRAKT;
                     break;
                 case 572:
-                    charterType = GuildCharterType.SCOURGE;
+                    charterType = GuildType.SCOURGE;
                     break;
                 case 573:
-                    charterType = GuildCharterType.KHREE;
+                    charterType = GuildType.KHREE;
                     break;
                 case 574:
-                    charterType = GuildCharterType.CENTAUR;
+                    charterType = GuildType.CENTAUR;
                     break;
                 case 575:
-                    charterType = GuildCharterType.UNHOLY;
+                    charterType = GuildType.UNHOLY;
                     break;
                 case 576:
-                    charterType = GuildCharterType.PIRATE;
+                    charterType = GuildType.PIRATE;
                     break;
                 case 577:
-                    charterType = GuildCharterType.BRIALIA;
+                    charterType = GuildType.BRIALIA;
                     break;
 
                 default:
-                    charterType = GuildCharterType.HERALD;
+                    charterType = GuildType.HERALD;
             }
 
             return charterType;
         }
 
-        public static GuildCharterType getGuildTypeFromInt(int i) {
+        public static GuildType getGuildTypeFromInt(int i) {
-            return GuildCharterType.values()[i];
+            return GuildType.values()[i];
         }
 
         public String getCharterName() {
@@ -2767,15 +2632,12 @@ public class Enum {
             return leadershipTypes[i];
         }
 
-        public boolean canJoin(AbstractCharacter character){
-            return this.requiredRaces.contains(character.absRace) && this.requiredClasses.contains(character.absPromotionClass) && this.sexRequired.contains(character.absGender);
-        }
     }
 
     public enum MinionClass {
         MELEE,
         ARCHER,
-        MAGE
+        MAGE;
     }
 
     public enum MinionType {
@@ -2845,14 +2707,14 @@ public class Enum {
             return race;
         }
 
-        public Boolean isMage() {
+        public Boolean isMage(){
             return this.minionClass.ordinal() == MinionClass.MAGE.ordinal();
         }
     }
 
     public enum GridObjectType {
         STATIC,
-        DYNAMIC
+        DYNAMIC;
     }
 
     public enum SupportMsgType {
@@ -2955,11 +2817,12 @@ public class Enum {
     public enum AccountStatus {
         BANNED,
         ACTIVE,
-        ADMIN
+        ADMIN;
     }
 
     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),
@@ -2984,7 +2847,6 @@ 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),
@@ -2995,12 +2857,13 @@ public class Enum {
         HamletGuard(null, false, true, false, false, false),
         AggroWanderer(null, false, false, true, false, false);
 
-        public final MobBehaviourType BehaviourHelperType;
+        private static HashMap<Integer, MobBehaviourType> _behaviourTypes = new HashMap<>();
-        public final boolean isWimpy;
+        public MobBehaviourType BehaviourHelperType;
-        public final boolean isAgressive;
+        public boolean isWimpy;
-        public final boolean canRoam;
+        public boolean isAgressive;
-        public final boolean callsForHelp;
+        public boolean canRoam;
-        public final boolean respondsToCallForHelp;
+        public boolean callsForHelp;
+        public boolean respondsToCallForHelp;
 
         MobBehaviourType(MobBehaviourType helpeebehaviourType, boolean wimpy, boolean agressive, boolean canroam, boolean callsforhelp, boolean respondstocallforhelp) {
             this.BehaviourHelperType = helpeebehaviourType;
@@ -3015,11 +2878,8 @@ public class Enum {
 
     public enum AIAgentType {
         MOBILE,
-        GUARDCAPTAIN,
-        GUARDMINION,
-        GUARDWALLARCHER,
         PET,
         CHARMED,
-        SIEGEENGINE
+        GUARD;
     }
 }

src/engine/InterestManagement/HeightMap.java

@@ -0,0 +1,706 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+package engine.InterestManagement;
+
+import engine.Enum;
+import engine.gameManager.ConfigManager;
+import engine.gameManager.DbManager;
+import engine.gameManager.ZoneManager;
+import engine.math.Vector2f;
+import engine.math.Vector3fImmutable;
+import engine.objects.AbstractWorldObject;
+import engine.objects.Zone;
+import engine.util.MapLoader;
+import org.pmw.tinylog.Logger;
+
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.HashMap;
+
+public class HeightMap {
+
+    // Class variables
+
+    // Heightmap data for all zones.
+
+    public static final HashMap<Integer, HeightMap> heightmapByLoadNum = new HashMap<>();
+
+    // Bootstrap Tracking
+
+    public static int heightMapsCreated = 0;
+    public static HeightMap PlayerCityHeightMap;
+
+    // Heightmap data for this heightmap
+
+    public BufferedImage heightmapImage;
+
+    private int heightMapID;
+    private int maxHeight;
+    private int fullExtentsX;
+    private int fullExtentsY;
+
+    private float bucketWidthX;
+    private float bucketWidthY;
+    private int zoneLoadID;
+    private float seaLevel = 0;
+    private float outsetX;
+    private float outsetZ;
+    private int[][] pixelColorValues;
+
+    public HeightMap(ResultSet rs) throws SQLException {
+
+        this.heightMapID = rs.getInt("heightMapID");
+        this.maxHeight = rs.getInt("maxHeight");
+        int halfExtentsX = rs.getInt("xRadius");
+        int halfExtentsY = rs.getInt("zRadius");
+        this.zoneLoadID = rs.getInt("zoneLoadID");
+        this.seaLevel = rs.getFloat("seaLevel");
+        this.outsetX = rs.getFloat("outsetX");
+        this.outsetZ = rs.getFloat("outsetZ");
+
+
+        // Cache the full extents to avoid the calculation
+
+        this.fullExtentsX = halfExtentsX * 2;
+        this.fullExtentsY = halfExtentsY * 2;
+
+        this.heightmapImage = null;
+        File imageFile = new File(ConfigManager.DEFAULT_DATA_DIR + "heightmaps/" + this.heightMapID + ".bmp");
+
+        // early exit if no image file was found.  Will log in caller.
+
+        if (!imageFile.exists())
+            return;
+
+        // load the heightmap image.
+
+        try {
+            this.heightmapImage = ImageIO.read(imageFile);
+        } catch (IOException e) {
+            Logger.error("***Error loading heightmap data for heightmap " + this.heightMapID + e.toString());
+        }
+
+        // We needed to flip the image as OpenGL and Shadowbane both use the bottom left corner as origin.
+
+        this.heightmapImage = MapLoader.flipImage(this.heightmapImage);
+
+        // Calculate the data we do not load from table
+
+        float numOfBuckets = this.heightmapImage.getWidth() - 1;
+        float calculatedWidth = this.fullExtentsX / numOfBuckets;
+        this.bucketWidthX = calculatedWidth;
+        this.bucketWidthY = this.bucketWidthX; // This makes no sense.
+
+        // Generate pixel array from image data
+
+        generatePixelData();
+
+        HeightMap.heightmapByLoadNum.put(this.zoneLoadID, this);
+
+        heightMapsCreated++;
+    }
+
+    //Created for PlayerCities
+    public HeightMap() {
+
+        this.heightMapID = 999999;
+        this.maxHeight = 5; // for real...
+        int halfExtentsX = (int) Enum.CityBoundsType.ZONE.extents;
+        int halfExtentsY = (int) Enum.CityBoundsType.ZONE.extents;
+        this.zoneLoadID = 0;
+        this.seaLevel = 0;
+        this.outsetX = 128;
+        this.outsetZ = 128;
+
+
+        // Cache the full extents to avoid the calculation
+
+        this.fullExtentsX = halfExtentsX * 2;
+        this.fullExtentsY = halfExtentsY * 2;
+
+
+        // load the heightmap image.
+
+
+        // We needed to flip the image as OpenGL and Shadowbane both use the bottom left corner as origin.
+
+        this.heightmapImage = null;
+
+        // Calculate the data we do not load from table
+
+        this.bucketWidthX = 1;
+        this.bucketWidthY = 1;
+
+        this.pixelColorValues = new int[this.fullExtentsX + 1][this.fullExtentsY + 1];
+
+        for (int y = 0; y <= this.fullExtentsY; y++) {
+            for (int x = 0; x <= this.fullExtentsX; x++) {
+                pixelColorValues[x][y] = 255;
+            }
+        }
+
+
+        HeightMap.heightmapByLoadNum.put(this.zoneLoadID, this);
+    }
+
+    public HeightMap(Zone zone) {
+
+        this.heightMapID = 999999;
+        this.maxHeight = 0;
+        int halfExtentsX = (int) zone.getBounds().getHalfExtents().x;
+        int halfExtentsY = (int) zone.getBounds().getHalfExtents().y;
+        this.zoneLoadID = 0;
+        this.seaLevel = 0;
+        this.outsetX = 0;
+        this.outsetZ = 0;
+
+        // Cache the full extents to avoid the calculation
+
+        this.fullExtentsX = halfExtentsX * 2;
+        this.fullExtentsY = halfExtentsY * 2;
+
+
+        // We needed to flip the image as OpenGL and Shadowbane both use the bottom left corner as origin.
+
+        this.heightmapImage = null;
+
+        // Calculate the data we do not load from table
+
+        this.bucketWidthX = 1;
+        this.bucketWidthY = 1;
+
+        this.pixelColorValues = new int[this.fullExtentsX + 1][this.fullExtentsY + 1];
+
+        for (int y = 0; y <= this.fullExtentsY; y++) {
+            for (int x = 0; x <= this.fullExtentsX; x++) {
+                pixelColorValues[x][y] = 255;
+            }
+        }
+
+
+        HeightMap.heightmapByLoadNum.put(this.zoneLoadID, this);
+    }
+
+    public static void GeneratePlayerCityHeightMap() {
+
+        HeightMap.PlayerCityHeightMap = new HeightMap();
+
+    }
+
+    public static void GenerateCustomHeightMap(Zone zone) {
+
+        HeightMap heightMap = new HeightMap(zone);
+
+        HeightMap.heightmapByLoadNum.put(zone.getLoadNum(), heightMap);
+
+    }
+
+    public static Zone getNextZoneWithTerrain(Zone zone) {
+
+        Zone nextZone = zone;
+
+        if (zone.getHeightMap() != null)
+            return zone;
+
+        if (zone.equals(ZoneManager.getSeaFloor()))
+            return zone;
+
+        while (nextZone.getHeightMap() == null)
+            nextZone = nextZone.getParent();
+
+        return nextZone;
+    }
+
+    public static float getWorldHeight(AbstractWorldObject worldObject) {
+
+        Vector2f parentLoc = new Vector2f(-1, -1);
+        Zone currentZone = ZoneManager.findSmallestZone(worldObject.getLoc());
+
+        if (currentZone == null)
+            return worldObject.getAltitude();
+
+        currentZone = getNextZoneWithTerrain(currentZone);
+
+        if (currentZone == ZoneManager.getSeaFloor())
+            return currentZone.getAbsY() + worldObject.getAltitude();
+
+        Zone parentZone = getNextZoneWithTerrain(currentZone.getParent());
+        HeightMap heightMap = currentZone.getHeightMap();
+
+        Vector2f zoneLoc = ZoneManager.worldToZoneSpace(worldObject.getLoc(), currentZone);
+        Vector3fImmutable localLocFromCenter = ZoneManager.worldToLocal(worldObject.getLoc(), currentZone);
+
+        if ((parentZone != null) && (parentZone.getHeightMap() != null))
+            parentLoc = ZoneManager.worldToZoneSpace(worldObject.getLoc(), parentZone);
+
+        float interaltitude = currentZone.getHeightMap().getInterpolatedTerrainHeight(zoneLoc);
+
+        float worldAltitude = currentZone.getWorldAltitude();
+
+        float realWorldAltitude = interaltitude + worldAltitude;
+
+        //OUTSET
+
+        if (parentZone != null) {
+
+            float parentXRadius = currentZone.getBounds().getHalfExtents().x;
+            float parentZRadius = currentZone.getBounds().getHalfExtents().y;
+
+            float offsetX = Math.abs((localLocFromCenter.x / parentXRadius));
+            float offsetZ = Math.abs((localLocFromCenter.z / parentZRadius));
+
+            float bucketScaleX = heightMap.outsetX / parentXRadius;
+            float bucketScaleZ = heightMap.outsetZ / parentZRadius;
+
+            if (bucketScaleX <= 0.40000001)
+                bucketScaleX = heightMap.outsetZ / parentXRadius;
+
+            if (bucketScaleX > 0.40000001)
+                bucketScaleX = 0.40000001f;
+
+            if (bucketScaleZ <= 0.40000001)
+                bucketScaleZ = heightMap.outsetX / parentZRadius;
+
+            if (bucketScaleZ > 0.40000001)
+                bucketScaleZ = 0.40000001f;
+
+            float outsideGridSizeX = 1 - bucketScaleX; //32/256
+            float outsideGridSizeZ = 1 - bucketScaleZ;
+            float weight;
+
+            double scale;
+
+            if (offsetX > outsideGridSizeX && offsetX > offsetZ) {
+                weight = (offsetX - outsideGridSizeX) / bucketScaleX;
+                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
+
+                float scaleChild = (float) ((scale + 1) * .5);
+                float scaleParent = 1 - scaleChild;
+
+                float parentAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(parentLoc);
+                float parentCenterAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(currentZone.getLoc(), parentZone));
+
+                parentCenterAltitude += currentZone.getYCoord();
+                parentCenterAltitude += interaltitude;
+
+                float firstScale = parentAltitude * scaleParent;
+                float secondScale = parentCenterAltitude * scaleChild;
+                float outsetALt = firstScale + secondScale;
+
+                outsetALt += currentZone.getParent().getWorldAltitude();
+                realWorldAltitude = outsetALt;
+
+            } else if (offsetZ > outsideGridSizeZ) {
+
+                weight = (offsetZ - outsideGridSizeZ) / bucketScaleZ;
+                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
+
+                float scaleChild = (float) ((scale + 1) * .5);
+                float scaleParent = 1 - scaleChild;
+                float parentAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(parentLoc);
+                float parentCenterAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(currentZone.getLoc(), parentZone));
+
+                parentCenterAltitude += currentZone.getYCoord();
+                parentCenterAltitude += interaltitude;
+                float firstScale = parentAltitude * scaleParent;
+                float secondScale = parentCenterAltitude * scaleChild;
+                float outsetALt = firstScale + secondScale;
+
+                outsetALt += currentZone.getParent().getWorldAltitude();
+                realWorldAltitude = outsetALt;
+            }
+        }
+
+        return realWorldAltitude;
+    }
+
+    public static float getWorldHeight(Vector3fImmutable worldLoc) {
+
+        Vector2f parentLoc = new Vector2f(-1, -1);
+        Zone currentZone = ZoneManager.findSmallestZone(worldLoc);
+
+        if (currentZone == null)
+            return 0;
+
+        currentZone = getNextZoneWithTerrain(currentZone);
+
+        if (currentZone == ZoneManager.getSeaFloor())
+            return currentZone.getAbsY();
+
+        Zone parentZone = getNextZoneWithTerrain(currentZone.getParent());
+        HeightMap heightMap = currentZone.getHeightMap();
+
+        if ((heightMap == null) || (currentZone == ZoneManager.getSeaFloor()))
+            return currentZone.getAbsY();
+
+        Vector2f zoneLoc = ZoneManager.worldToZoneSpace(worldLoc, currentZone);
+        Vector3fImmutable localLocFromCenter = ZoneManager.worldToLocal(worldLoc, currentZone);
+
+        if ((parentZone != null) && (parentZone.getHeightMap() != null))
+            parentLoc = ZoneManager.worldToZoneSpace(worldLoc, parentZone);
+
+        float interaltitude = currentZone.getHeightMap().getInterpolatedTerrainHeight(zoneLoc);
+
+        float worldAltitude = currentZone.getWorldAltitude();
+
+        float realWorldAltitude = interaltitude + worldAltitude;
+
+        //OUTSET
+
+        if (parentZone != null) {
+
+            //			if (currentZone.getHeightMap() != null && parentZone.getHeightMap() != null && parentZone.getParent() != null && parentZone.getParent().getHeightMap() != null)
+            //				return realWorldAltitude;
+
+            float parentXRadius = currentZone.getBounds().getHalfExtents().x;
+            float parentZRadius = currentZone.getBounds().getHalfExtents().y;
+
+            float offsetX = Math.abs((localLocFromCenter.x / parentXRadius));
+            float offsetZ = Math.abs((localLocFromCenter.z / parentZRadius));
+
+            float bucketScaleX = heightMap.outsetX / parentXRadius;
+            float bucketScaleZ = heightMap.outsetZ / parentZRadius;
+
+            float outsideGridSizeX = 1 - bucketScaleX; //32/256
+            float outsideGridSizeZ = 1 - bucketScaleZ;
+            float weight;
+
+            double scale;
+
+
+            if (offsetX > outsideGridSizeX && offsetX > offsetZ) {
+                weight = (offsetX - outsideGridSizeX) / bucketScaleX;
+                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
+
+                float scaleChild = (float) ((scale + 1) * .5);
+                float scaleParent = 1 - scaleChild;
+
+                float parentAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(parentLoc);
+                float parentCenterAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(currentZone.getLoc(), parentZone));
+
+                parentCenterAltitude += currentZone.getYCoord();
+                parentCenterAltitude += interaltitude;
+
+                float firstScale = parentAltitude * scaleParent;
+                float secondScale = parentCenterAltitude * scaleChild;
+                float outsetALt = firstScale + secondScale;
+
+                outsetALt += currentZone.getParent().getWorldAltitude();
+                realWorldAltitude = outsetALt;
+
+            } else if (offsetZ > outsideGridSizeZ) {
+
+                weight = (offsetZ - outsideGridSizeZ) / bucketScaleZ;
+                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
+
+                float scaleChild = (float) ((scale + 1) * .5);
+                float scaleParent = 1 - scaleChild;
+                float parentAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(parentLoc);
+                float parentCenterAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(currentZone.getLoc(), parentZone));
+
+                parentCenterAltitude += currentZone.getYCoord();
+                parentCenterAltitude += interaltitude;
+                float firstScale = parentAltitude * scaleParent;
+                float secondScale = parentCenterAltitude * scaleChild;
+                float outsetALt = firstScale + secondScale;
+
+                outsetALt += currentZone.getParent().getWorldAltitude();
+                realWorldAltitude = outsetALt;
+            }
+        }
+
+        return realWorldAltitude;
+    }
+
+    public static float getOutsetHeight(float interpolatedAltitude, Zone zone, Vector3fImmutable worldLocation) {
+
+        Vector2f parentLoc;
+        float outsetALt = 0;
+
+        if (zone.getParent() == null || zone.getParent().getHeightMap() == null)
+            return interpolatedAltitude + zone.getWorldAltitude();
+
+        if (zone.getParent() != null && zone.getParent().getHeightMap() != null) {
+
+            parentLoc = ZoneManager.worldToZoneSpace(worldLocation, zone.getParent());
+
+            Vector3fImmutable localLocFromCenter = ZoneManager.worldToLocal(worldLocation, zone);
+
+            float parentXRadius = zone.getBounds().getHalfExtents().x;
+            float parentZRadius = zone.getBounds().getHalfExtents().y;
+
+            float bucketScaleX = zone.getHeightMap().outsetX / parentXRadius;
+            float bucketScaleZ = zone.getHeightMap().outsetZ / parentZRadius;
+
+            float outsideGridSizeX = 1 - bucketScaleX; //32/256
+            float outsideGridSizeZ = 1 - bucketScaleZ;
+
+            float weight;
+            double scale;
+
+            float offsetX = Math.abs((localLocFromCenter.x / parentXRadius));
+            float offsetZ = Math.abs((localLocFromCenter.z / parentZRadius));
+
+            if (offsetX > outsideGridSizeX && offsetX > offsetZ) {
+                weight = (offsetX - outsideGridSizeX) / bucketScaleX;
+                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
+
+                float scaleChild = (float) ((scale + 1) * .5);
+                float scaleParent = 1 - scaleChild;
+
+                float parentAltitude = zone.getParent().getHeightMap().getInterpolatedTerrainHeight(parentLoc);
+                float parentCenterAltitude = zone.getParent().getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(zone.getLoc(), zone.getParent()));
+
+                parentCenterAltitude += zone.getYCoord();
+                parentCenterAltitude += interpolatedAltitude;
+
+                float firstScale = parentAltitude * scaleParent;
+                float secondScale = parentCenterAltitude * scaleChild;
+                outsetALt = firstScale + secondScale;
+
+                outsetALt += zone.getParent().getAbsY();
+
+            } else if (offsetZ > outsideGridSizeZ) {
+
+                weight = (offsetZ - outsideGridSizeZ) / bucketScaleZ;
+                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
+
+                float scaleChild = (float) ((scale + 1) * .5);
+                float scaleParent = 1 - scaleChild;
+                float parentAltitude = zone.getParent().getHeightMap().getInterpolatedTerrainHeight(parentLoc);
+                float parentCenterAltitude = zone.getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(zone.getLoc(), zone));
+
+                parentCenterAltitude += zone.getYCoord();
+                parentCenterAltitude += interpolatedAltitude;
+
+                float firstScale = parentAltitude * scaleParent;
+                float secondScale = parentCenterAltitude * scaleChild;
+                outsetALt = firstScale + secondScale;
+
+                outsetALt += zone.getParent().getAbsY();
+            }
+
+        }
+
+        return outsetALt;
+    }
+
+    public static Vector2f getGridOffset(Vector2f gridSquare) {
+
+        int floorX = (int) gridSquare.x;
+        int floorY = (int) gridSquare.y;
+
+        return new Vector2f(gridSquare.x - floorX, gridSquare.y - floorY);
+
+    }
+
+    public static void loadAlHeightMaps() {
+
+        // Load the heightmaps into staging hashmap keyed by HashMapID
+
+        DbManager.HeightMapQueries.LOAD_ALL_HEIGHTMAPS();
+
+        //generate static player city heightmap.
+
+        HeightMap.GeneratePlayerCityHeightMap();
+
+
+        // Clear all heightmap image data as it's no longer needed.
+
+        for (HeightMap heightMap : HeightMap.heightmapByLoadNum.values()) {
+            heightMap.heightmapImage = null;
+        }
+
+        Logger.info(HeightMap.heightmapByLoadNum.size() + " Heightmaps cached.");
+    }
+
+    public static boolean isLocUnderwater(Vector3fImmutable currentLoc) {
+
+        float localAltitude = HeightMap.getWorldHeight(currentLoc);
+        Zone zone = ZoneManager.findSmallestZone(currentLoc);
+
+        if (localAltitude < zone.getSeaLevel())
+            return true;
+
+        return false;
+    }
+
+    public Vector2f getGridSquare(Vector2f zoneLoc) {
+
+        if (zoneLoc.x < 0)
+            zoneLoc.setX(0);
+
+        if (zoneLoc.x > this.fullExtentsX - 1)
+            zoneLoc.setX((this.fullExtentsX - 1) + .9999999f);
+
+        if (zoneLoc.y < 0)
+            zoneLoc.setY(0);
+
+        if (zoneLoc.y > this.fullExtentsY - 1)
+            zoneLoc.setY((this.fullExtentsY - 1) + .9999999f);
+
+        float xBucket = (zoneLoc.x / this.bucketWidthX);
+        float yBucket = (zoneLoc.y / this.bucketWidthY);
+
+        return new Vector2f(xBucket, yBucket);
+    }
+
+    public float getInterpolatedTerrainHeight(Vector2f zoneLoc) {
+
+        Vector2f gridSquare;
+
+        if (zoneLoc.x < 0 || zoneLoc.x > this.fullExtentsX)
+            return -1;
+
+        if (zoneLoc.y < 0 || zoneLoc.y > this.fullExtentsY)
+            return -1;
+
+        int maxX = (int) (this.fullExtentsX / this.bucketWidthX);
+        int maxY = (int) (this.fullExtentsY / this.bucketWidthY);
+
+        //flip the Y so it grabs from the bottom left instead of top left.
+        //zoneLoc.setY(maxZoneHeight - zoneLoc.y);
+
+        gridSquare = getGridSquare(zoneLoc);
+
+        int gridX = (int) gridSquare.x;
+        int gridY = (int) (gridSquare.y);
+
+        if (gridX > maxX)
+            gridX = maxX;
+        if (gridY > maxY)
+            gridY = maxY;
+
+        float offsetX = (gridSquare.x - gridX);
+        float offsetY = gridSquare.y - gridY;
+
+        //get height of the 4 vertices.
+
+        float topLeftHeight = 0;
+        float topRightHeight = 0;
+        float bottomLeftHeight = 0;
+        float bottomRightHeight = 0;
+
+        int nextY = gridY + 1;
+        int nextX = gridX + 1;
+
+        if (nextY > maxY)
+            nextY = gridY;
+
+        if (nextX > maxX)
+            nextX = gridX;
+
+        topLeftHeight = pixelColorValues[gridX][gridY];
+        topRightHeight = pixelColorValues[nextX][gridY];
+        bottomLeftHeight = pixelColorValues[gridX][nextY];
+        bottomRightHeight = pixelColorValues[nextX][nextY];
+
+        float interpolatedHeight;
+
+        interpolatedHeight = topRightHeight * (1 - offsetY) * (offsetX);
+        interpolatedHeight += (bottomRightHeight * offsetY * offsetX);
+        interpolatedHeight += (bottomLeftHeight * (1 - offsetX) * offsetY);
+        interpolatedHeight += (topLeftHeight * (1 - offsetX) * (1 - offsetY));
+
+        interpolatedHeight *= (float) this.maxHeight / 256;  // Scale height
+
+        return interpolatedHeight;
+    }
+
+    public float getInterpolatedTerrainHeight(Vector3fImmutable zoneLoc3f) {
+
+        Vector2f zoneLoc = new Vector2f(zoneLoc3f.x, zoneLoc3f.z);
+
+        Vector2f gridSquare;
+
+        if (zoneLoc.x < 0 || zoneLoc.x > this.fullExtentsX)
+            return -1;
+
+        if (zoneLoc.y < 0 || zoneLoc.y > this.fullExtentsY)
+            return -1;
+
+        //flip the Y so it grabs from the bottom left instead of top left.
+        //zoneLoc.setY(maxZoneHeight - zoneLoc.y);
+
+        gridSquare = getGridSquare(zoneLoc);
+
+        int gridX = (int) gridSquare.x;
+        int gridY = (int) (gridSquare.y);
+
+        float offsetX = (gridSquare.x - gridX);
+        float offsetY = gridSquare.y - gridY;
+
+        //get height of the 4 vertices.
+
+        float topLeftHeight = pixelColorValues[gridX][gridY];
+        float topRightHeight = pixelColorValues[gridX + 1][gridY];
+        float bottomLeftHeight = pixelColorValues[gridX][gridY + 1];
+        float bottomRightHeight = pixelColorValues[gridX + 1][gridY + 1];
+
+        float interpolatedHeight;
+
+        interpolatedHeight = topRightHeight * (1 - offsetY) * (offsetX);
+        interpolatedHeight += (bottomRightHeight * offsetY * offsetX);
+        interpolatedHeight += (bottomLeftHeight * (1 - offsetX) * offsetY);
+        interpolatedHeight += (topLeftHeight * (1 - offsetX) * (1 - offsetY));
+
+        interpolatedHeight *= (float) this.maxHeight / 256;  // Scale height
+
+        return interpolatedHeight;
+    }
+
+    private void generatePixelData() {
+
+        Color color;
+
+        // Generate altitude lookup table for this heightmap
+
+        this.pixelColorValues = new int[this.heightmapImage.getWidth()][this.heightmapImage.getHeight()];
+
+        for (int y = 0; y < this.heightmapImage.getHeight(); y++) {
+            for (int x = 0; x < this.heightmapImage.getWidth(); x++) {
+
+                color = new Color(this.heightmapImage.getRGB(x, y));
+                pixelColorValues[x][y] = color.getRed();
+            }
+        }
+
+    }
+
+    public float getScaledHeightForColor(float color) {
+
+        return (color / 256) * this.maxHeight;
+    }
+
+    public float getBucketWidthX() {
+        return bucketWidthX;
+    }
+
+    public float getBucketWidthY() {
+        return bucketWidthY;
+    }
+
+    public int getHeightMapID() {
+        return heightMapID;
+    }
+
+    public BufferedImage getHeightmapImage() {
+        return heightmapImage;
+    }
+
+    public float getSeaLevel() {
+        return seaLevel;
+    }
+
+}

src/engine/InterestManagement/InterestManager.java

@@ -140,7 +140,7 @@ public enum InterestManager implements Runnable {
 
             else {
                 if (pc != null)
-                    if (pcc.getSeeInvis() < pc.hidden)
+                    if (pcc.getSeeInvis() < pc.getHidden())
                         continue;
 
                 if (!cc.sendMsg(uom)) {
@@ -340,7 +340,7 @@ public enum InterestManager implements Runnable {
                     if (loadedPlayer.getObjectUUID() == player.getObjectUUID())
                         continue;
 
-                    if (player.getSeeInvis() < loadedPlayer.hidden)
+                    if (player.getSeeInvis() < loadedPlayer.getHidden())
                         continue;
 
                     if (loadedPlayer.safemodeInvis())
@@ -372,7 +372,7 @@ public enum InterestManager implements Runnable {
 
             if (playerLoadedObject.getObjectType().equals(GameObjectType.PlayerCharacter)) {
                 PlayerCharacter loadedPlayer = (PlayerCharacter) playerLoadedObject;
-                if (player.getSeeInvis() < loadedPlayer.hidden)
+                if (player.getSeeInvis() < loadedPlayer.getHidden())
                     toRemove.add(playerLoadedObject);
                 else if (loadedPlayer.safemodeInvis())
                     toRemove.add(playerLoadedObject);
@@ -437,7 +437,7 @@ public enum InterestManager implements Runnable {
 
                     // dont load if invis
 
-                    if (player.getSeeInvis() < awopc.hidden)
+                    if (player.getSeeInvis() < awopc.getHidden())
                         continue;
 
                     lcm = new LoadCharacterMsg(awopc, PlayerCharacter.hideNonAscii());
@@ -467,7 +467,7 @@ public enum InterestManager implements Runnable {
                     if (awonpc.despawned == true)
                         continue;
 
-                    awonpc.playerAgroMap.put(player.getObjectUUID(), 0f);
+                    awonpc.playerAgroMap.put(player.getObjectUUID(), false);
                     ((Mob) awonpc).setCombatTarget(null);
                     lcm = new LoadCharacterMsg(awonpc, PlayerCharacter.hideNonAscii());
 
@@ -480,7 +480,7 @@ public enum InterestManager implements Runnable {
                     if (!awonpc.isAlive())
                         continue;
 
-                    awonpc.playerAgroMap.put(player.getObjectUUID(), 0f);
+                    awonpc.playerAgroMap.put(player.getObjectUUID(), false);
 
                     if ((awonpc.agentType.equals(Enum.AIAgentType.MOBILE)))
                         ((Mob) awonpc).setCombatTarget(null);

src/engine/InterestManagement/Terrain.java

@@ -1,230 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-package engine.InterestManagement;
-
-import engine.gameManager.ZoneManager;
-import engine.math.Vector2f;
-import engine.math.Vector3fImmutable;
-import engine.objects.Zone;
-import org.pmw.tinylog.Logger;
-
-import java.util.HashMap;
-
-import static java.lang.Math.PI;
-
-public class Terrain {
-    public static final HashMap<Integer, short[][]> _heightmap_pixel_cache = new HashMap<>();
-    public short[][] terrain_pixel_data;
-    public Vector2f terrain_size = new Vector2f();
-    public Vector2f cell_size = new Vector2f();
-    public Vector2f cell_count = new Vector2f();
-    public float terrain_scale;
-    public Vector2f blend_values = new Vector2f();
-    public Vector2f blend_ratio = new Vector2f();
-    public int heightmap;
-    Zone zone;
-
-    public Terrain(Zone zone) {
-
-        this.zone = zone;
-        this.heightmap = this.zone.template.terrain_image;
-
-        // Configure PLANAR zones to use the same 16x16 pixel image
-        // that all similar terrains share.  (See JSON)
-
-        if (this.zone.template.terrain_type.equals("PLANAR"))
-            this.heightmap = 1006300;  // all 0
-
-        // Load pixel data for this terrain from cache
-
-        this.terrain_pixel_data = Terrain._heightmap_pixel_cache.get(heightmap);
-
-        if (terrain_pixel_data == null)
-            Logger.error("Pixel map empty for zone: " + this.zone.getObjectUUID() + ":" + this.zone.zoneName);
-
-        // Configure terrain based on zone properties
-
-        this.terrain_size.x = this.zone.major_radius * 2;
-        this.terrain_size.y = this.zone.minor_radius * 2;
-
-        this.cell_count.x = this.terrain_pixel_data.length - 1;
-        this.cell_count.y = this.terrain_pixel_data[0].length - 1;
-
-        this.cell_size.x = terrain_size.x / this.cell_count.x;
-        this.cell_size.y = terrain_size.y / this.cell_count.y;
-
-        // Blending configuration. These ratios are used to calculate
-        // the blending area between child and parent terrains when
-        // they are stitched together.
-
-        this.blend_values.x = this.zone.template.max_blend;
-        this.blend_values.y = this.zone.template.min_blend;
-
-        Vector2f major_blend = new Vector2f(this.blend_values.x / this.zone.major_radius,
-                this.blend_values.y / this.zone.major_radius);
-
-        Vector2f minor_blend = new Vector2f(this.blend_values.x / this.zone.minor_radius,
-                this.blend_values.y / this.zone.minor_radius);
-
-        if (major_blend.y > 0.4f)
-            blend_ratio.x = major_blend.y;
-        else
-            blend_ratio.x = Math.min(major_blend.x, 0.4f);
-
-        if (minor_blend.y > 0.4f)
-            blend_ratio.y = minor_blend.y;
-        else
-            blend_ratio.y = Math.min(minor_blend.x, 0.4f);
-
-        // Scale coefficient for this terrain
-
-        this.terrain_scale = this.zone.template.terrain_max_y / 255f;
-    }
-
-    public static Zone getNextZoneWithTerrain(Zone zone) {
-
-        // Not all zones have a terrain.  Some are for display only
-        // and heights returned are from the parent heightmap.  This
-        // is controlled in the JSON via the has_terrain_gen field.
-
-        Zone terrain_zone = zone;
-
-        if (zone == null)
-            return ZoneManager.seaFloor;
-
-        if (zone.terrain != null)
-            return zone;
-
-        if (zone.equals(ZoneManager.seaFloor))
-            return zone;
-
-        while (terrain_zone.terrain == null)
-            terrain_zone = terrain_zone.parent;
-
-        return terrain_zone;
-    }
-
-    public static float getWorldHeight(Zone zone, Vector3fImmutable world_loc) {
-
-        // Retrieve the next zone with a terrain defined.
-
-        Zone terrainZone = getNextZoneWithTerrain(zone);
-        Zone parentZone = getNextZoneWithTerrain(zone.parent);
-
-        // Transform world loc into zone space coordinate system
-
-        Vector2f terrainLoc = ZoneManager.worldToTerrainSpace(world_loc, terrainZone);
-        Vector2f parentLoc = ZoneManager.worldToTerrainSpace(world_loc, parentZone);
-
-        // Offset from origin needed for blending function
-
-        Vector2f terrainOffset = ZoneManager.worldToZoneOffset(world_loc, terrainZone);
-
-        // Interpolate height for this position in both terrains
-
-        float interpolatedChildHeight = terrainZone.terrain.getInterpolatedTerrainHeight(terrainLoc);
-        interpolatedChildHeight += terrainZone.global_height;
-
-        float interpolatedParentTerrainHeight = parentZone.terrain.getInterpolatedTerrainHeight(parentLoc);
-        interpolatedParentTerrainHeight += parentZone.global_height;
-
-        // Blend between terrains
-
-        float blendCoefficient = terrainZone.terrain.getTerrainBlendCoefficient(terrainOffset);
-
-        float terrainHeight = interpolatedChildHeight * blendCoefficient;
-        terrainHeight += interpolatedParentTerrainHeight * (1 - blendCoefficient);
-
-        return terrainHeight;
-
-    }
-
-    public static float getWorldHeight(Vector3fImmutable world_loc) {
-
-        Zone currentZone = ZoneManager.findSmallestZone(world_loc);
-
-        return getWorldHeight(currentZone, world_loc);
-
-    }
-
-    public Vector2f getTerrainCell(Vector2f terrain_loc) {
-
-        // Calculate terrain cell with offset
-
-        Vector2f terrain_cell = new Vector2f(terrain_loc.x / this.cell_size.x, terrain_loc.y / this.cell_size.y);
-
-        // Clamp values when standing directly on pole
-
-        terrain_cell.x = Math.max(0, Math.min(this.cell_count.x - 1, terrain_cell.x));
-        terrain_cell.y = Math.max(0, Math.min(this.cell_count.y - 1, terrain_cell.y));
-
-        return terrain_cell;
-    }
-
-    public float getInterpolatedTerrainHeight(Vector2f terrain_loc) {
-
-        float interpolatedHeight;
-
-        // Early exit for guild zones
-
-        if (this.zone.guild_zone)
-            return 5.0f;
-
-        // Determine terrain and offset from top left vertex
-
-        Vector2f terrain_cell = getTerrainCell(terrain_loc);
-
-        int pixel_x = (int) Math.floor(terrain_cell.x);
-        int pixel_y = (int) Math.floor(terrain_cell.y);
-
-        Vector2f pixel_offset = new Vector2f(terrain_cell.x % 1, terrain_cell.y % 1);
-
-        // 4 surrounding vertices from the pixel array.
-
-        short top_left_pixel = terrain_pixel_data[pixel_x][pixel_y];
-        short top_right_pixel = terrain_pixel_data[pixel_x + 1][pixel_y];
-        short bottom_left_pixel = terrain_pixel_data[pixel_x][pixel_y + 1];
-        short bottom_right_pixel = terrain_pixel_data[pixel_x + 1][pixel_y + 1];
-
-        // Interpolate between the 4 vertices
-
-        interpolatedHeight = top_left_pixel * (1 - pixel_offset.x) * (1 - pixel_offset.y);
-        interpolatedHeight += top_right_pixel * (1 - pixel_offset.y) * (pixel_offset.x);
-        interpolatedHeight += (bottom_left_pixel * (1 - pixel_offset.x) * pixel_offset.y);
-        interpolatedHeight += (bottom_right_pixel * pixel_offset.y * pixel_offset.x);
-
-        interpolatedHeight *= this.terrain_scale; // Scale height
-
-        return interpolatedHeight;
-
-    }
-
-    public float getTerrainBlendCoefficient(Vector2f zone_offset) {
-
-        // Normalize terrain offset
-
-        Vector2f normalizedOffset = new Vector2f(Math.abs(zone_offset.x) / this.zone.template.major_radius,
-                Math.abs(zone_offset.y) / this.zone.template.minor_radius);
-
-        float blendCoefficient;
-
-        if (normalizedOffset.x <= 1 - blend_ratio.x || normalizedOffset.x <= normalizedOffset.y) {
-
-            if (normalizedOffset.y < 1 - blend_ratio.y)
-                return 1;
-
-            blendCoefficient = (normalizedOffset.y - (1 - blend_ratio.y)) / blend_ratio.y;
-        } else
-            blendCoefficient = (normalizedOffset.x - (1 - blend_ratio.x)) / blend_ratio.x;
-
-        blendCoefficient = (float) Math.atan((0.5f - blendCoefficient) * PI);
-
-        return (blendCoefficient + 1) * 0.5f;
-    }
-}

src/engine/db/archive/CityRecord.java

@@ -67,7 +67,7 @@ public class CityRecord extends DataRecord {
         cityRecord.locX = cityRecord.city.getTOL().getLoc().x;
         cityRecord.locY = -cityRecord.city.getTOL().getLoc().z; // flip sign on 'y' coordinate
 
-        cityRecord.zoneHash = cityRecord.city.getParent().hash;
+        cityRecord.zoneHash = cityRecord.city.getParent().getHash();
 
         if (cityRecord.eventType.equals(Enum.RecordEventType.CREATE))
             cityRecord.establishedDatetime = cityRecord.city.established;

src/engine/db/archive/GuildRecord.java

@@ -89,7 +89,7 @@ public class GuildRecord extends DataRecord {
         guildRecord.guildHash = guildRecord.guild.getHash();
         guildRecord.guildID = guildRecord.guild.getObjectUUID();
         guildRecord.guildName = guildRecord.guild.getName();
-        guildRecord.charterName = Enum.GuildCharterType.getGuildTypeFromInt(guildRecord.guild.getCharter()).getCharterName();
+        guildRecord.charterName = Enum.GuildType.getGuildTypeFromInt(guildRecord.guild.getCharter()).getCharterName();
 
         guildRecord.GLHash = DataWarehouse.hasher.encrypt(guildRecord.guild.getGuildLeaderUUID());
 

src/engine/db/archive/MineRecord.java

@@ -52,7 +52,7 @@ public class MineRecord extends DataRecord {
             mineRecord.eventType = eventType;
         }
 
-        mineRecord.zoneHash = mine.getParentZone().hash;
+        mineRecord.zoneHash = mine.getParentZone().getHash();
 
         if (character.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
             player = (PlayerCharacter) character;

src/engine/db/archive/PvpRecord.java

@@ -281,7 +281,7 @@ public class PvpRecord extends DataRecord {
         outStatement.setInt(8, this.victim.getLevel());
 
         outStatement.setString(9, DataWarehouse.hasher.encrypt(zone.getObjectUUID()));
-        outStatement.setString(10, zone.zoneName);
+        outStatement.setString(10, zone.getName());
         outStatement.setFloat(11, this.location.getX());
         outStatement.setFloat(12, -this.location.getZ()); // flip sign on 'y' coordinate
         outStatement.setBoolean(13, this.pvpExp);

src/engine/db/handlers/dbBuildingHandler.java

@@ -13,7 +13,6 @@ import engine.Enum;
 import engine.Enum.DbObjectType;
 import engine.Enum.ProtectionState;
 import engine.Enum.TaxType;
-import engine.gameManager.BuildingManager;
 import engine.gameManager.DbManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
@@ -28,7 +27,6 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class dbBuildingHandler extends dbHandlerBase {
 
@@ -90,12 +88,14 @@ public class dbBuildingHandler extends dbHandlerBase {
         return removeFromBuildings(b);
     }
 
-    public ArrayList<Building> GET_ALL_BUILDINGS() {
+    public ArrayList<Building> GET_ALL_BUILDINGS_FOR_ZONE(Zone zone) {
 
         ArrayList<Building> buildings = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_building`.*, `object`.`parent` FROM `object` INNER JOIN `obj_building` ON `obj_building`.`UID` = `object`.`UID` ORDER BY  `object`.`UID` ASC;")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_building`.*, `object`.`parent` FROM `object` INNER JOIN `obj_building` ON `obj_building`.`UID` = `object`.`UID` WHERE `object`.`parent` = ?;")) {
+
+            preparedStatement.setLong(1, zone.getObjectUUID());
 
             ResultSet rs = preparedStatement.executeQuery();
             buildings = getObjectsFromRs(rs, 1000);
@@ -425,28 +425,26 @@ public class dbBuildingHandler extends dbHandlerBase {
         return false;
     }
 
-    public void LOAD_BUILDING_FRIENDS() {
+    public void LOAD_ALL_FRIENDS_FOR_BUILDING(Building building) {
+
+        if (building == null)
+            return;
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_friends`")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_friends` WHERE `buildingUID` = ?")) {
 
+            preparedStatement.setInt(1, building.getObjectUUID());
             ResultSet rs = preparedStatement.executeQuery();
 
             while (rs.next()) {
                 BuildingFriends friend = new BuildingFriends(rs);
-
+                switch (friend.getFriendType()) {
-                // Create map if it does not yet exist
-
-                if (!BuildingManager._buildingFriends.containsKey(friend.buildingUID))
-                    BuildingManager._buildingFriends.put(friend.buildingUID, new ConcurrentHashMap<>());
-
-                switch (friend.friendType) {
                     case 7:
-                        BuildingManager._buildingFriends.get(friend.buildingUID).put(friend.playerUID, friend);
+                        building.getFriends().put(friend.getPlayerUID(), friend);
                         break;
                     case 8:
                     case 9:
-                        BuildingManager._buildingFriends.get(friend.buildingUID).put(friend.guildUID, friend);
+                        building.getFriends().put(friend.getGuildUID(), friend);
                         break;
                 }
             }
@@ -457,29 +455,26 @@ public class dbBuildingHandler extends dbHandlerBase {
 
     }
 
-    public void LOAD_BUILDING_CONDEMNED() {
+    public void LOAD_ALL_CONDEMNED_FOR_BUILDING(Building building) {
+
+        if (building == null)
+            return;
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_condemned`")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_condemned` WHERE `buildingUID` = ?")) {
 
+            preparedStatement.setInt(1, building.getObjectUUID());
             ResultSet rs = preparedStatement.executeQuery();
 
             while (rs.next()) {
-
                 Condemned condemned = new Condemned(rs);
-
+                switch (condemned.getFriendType()) {
-                // Create map if it does not yet exist
-
-                if (!BuildingManager._buildingCondemned.containsKey(condemned.buildingUUID))
-                    BuildingManager._buildingCondemned.put(condemned.buildingUUID, new ConcurrentHashMap<>());
-
-                switch (condemned.friendType) {
                     case 2:
-                        BuildingManager._buildingCondemned.get(condemned.buildingUUID).put(condemned.playerUID, condemned);
+                        building.getCondemned().put(condemned.getPlayerUID(), condemned);
                         break;
                     case 4:
                     case 5:
-                        BuildingManager._buildingCondemned.get(condemned.buildingUUID).put(condemned.guildUID, condemned);
+                        building.getCondemned().put(condemned.getGuildUID(), condemned);
                         break;
                 }
             }
@@ -489,27 +484,35 @@ public class dbBuildingHandler extends dbHandlerBase {
         }
     }
 
-    public void LOAD_BARRACKS_PATROL_POINTS() {
+    public ArrayList<Vector3fImmutable> LOAD_PATROL_POINTS(Building building) {
+
+        if (building == null)
+            return null;
+
+        ArrayList<Vector3fImmutable> patrolPoints = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_patrol_points`")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_patrol_points` WHERE `buildingUID` = ?")) {
+
+            preparedStatement.setInt(1, building.getObjectUUID());
+
 
             ResultSet rs = preparedStatement.executeQuery();
 
             while (rs.next()) {
-
+                float x1 = rs.getFloat("patrolX");
-                int buildingUUID = rs.getInt("buildingUID");
+                float y1 = rs.getFloat("patrolY");
-
+                float z1 = rs.getFloat("patrolZ");
-                if (!BuildingManager._buildingPatrolPoints.containsKey(buildingUUID))
+                Vector3fImmutable patrolPoint = new Vector3fImmutable(x1, y1, z1);
-                    BuildingManager._buildingPatrolPoints.put(buildingUUID, new ArrayList<>());
+                patrolPoints.add(patrolPoint);
-
-                Vector3fImmutable patrolPoint = new Vector3fImmutable(rs.getFloat("patrolX"), rs.getFloat("patrolY"), rs.getFloat("patrolZ"));
-                BuildingManager._buildingPatrolPoints.get(buildingUUID).add(patrolPoint);
             }
 
         } catch (SQLException e) {
             Logger.error(e);
         }
+
+        return patrolPoints;
+
     }
 
     public boolean ADD_TO_CONDEMNLIST(final long parentUID, final long playerUID, final long guildID, final int friendType) {
@@ -719,10 +722,10 @@ public class dbBuildingHandler extends dbHandlerBase {
                      + "WHERE`buildingUID` = ? AND `playerUID` = ? AND `guildUID` = ? AND `friendType` = ?")) {
 
             preparedStatement.setBoolean(1, active);
-            preparedStatement.setInt(2, condemn.buildingUUID);
+            preparedStatement.setInt(2, condemn.getParent());
-            preparedStatement.setInt(3, condemn.playerUID);
+            preparedStatement.setInt(3, condemn.getPlayerUID());
-            preparedStatement.setInt(4, condemn.guildUID);
+            preparedStatement.setInt(4, condemn.getGuildUID());
-            preparedStatement.setInt(5, condemn.friendType);
+            preparedStatement.setInt(5, condemn.getFriendType());
 
             return (preparedStatement.executeUpdate() > 0);
 

src/engine/db/handlers/dbCityHandler.java

@@ -34,19 +34,16 @@ public class dbCityHandler extends dbHandlerBase {
             case "zone":
                 Zone zone = new Zone(rs);
                 DbManager.addToCache(zone);
-                zone.runAfterLoad();
                 list.add(zone);
                 break;
             case "building":
                 Building building = new Building(rs);
                 DbManager.addToCache(building);
-                building.runAfterLoad();
                 list.add(building);
                 break;
             case "city":
                 City city = new City(rs);
                 DbManager.addToCache(city);
-                city.runAfterLoad();
                 list.add(city);
                 break;
         }
@@ -99,12 +96,14 @@ public class dbCityHandler extends dbHandlerBase {
         return objectList;
     }
 
-    public ArrayList<City> GET_ALL_CITIES() {
+    public ArrayList<City> GET_CITIES_BY_ZONE(final int objectUUID) {
 
         ArrayList<City> cityList = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_city`.*, `object`.`parent` FROM `obj_city` INNER JOIN `object` ON `object`.`UID` = `obj_city`.`UID` ORDER BY `object`.`UID` ASC;")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_city`.*, `object`.`parent` FROM `obj_city` INNER JOIN `object` ON `object`.`UID` = `obj_city`.`UID` WHERE `object`.`parent`=?;")) {
+
+            preparedStatement.setLong(1, objectUUID);
 
             ResultSet rs = preparedStatement.executeQuery();
             cityList = getObjectsFromRs(rs, 100);

src/engine/db/handlers/dbGuildHandler.java

@@ -695,4 +695,24 @@ public class dbGuildHandler extends dbHandlerBase {
         }
     }
 
+    //TODO uncomment this when finished with guild history warehouse integration
+//	public HashMap<Integer, GuildRecord> GET_WAREHOUSE_GUILD_HISTORY(){
+//		
+//		HashMap<Integer, GuildRecord> tempMap = new HashMap<>();
+//		prepareCallable("SELECT * FROM `warehouse_guildhistory` WHERE `eventType` = 'CREATE'");
+//		try {
+//			ResultSet rs = executeQuery();
+//			
+//			while (rs.next()) {
+//				GuildRecord guildRecord = new GuildRecord(rs);
+//				tempMap.put(guildRecord.guildID, guildRecord);
+//			}
+//		}catch (Exception e){
+//			Logger.error(e);
+//		}
+//		return tempMap;
+//		
+//	}
+
+
 }

src/engine/db/handlers/dbHeightMapHandler.java

@@ -0,0 +1,43 @@
+package engine.db.handlers;
+
+import engine.InterestManagement.HeightMap;
+import engine.gameManager.DbManager;
+import org.pmw.tinylog.Logger;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class dbHeightMapHandler extends dbHandlerBase {
+
+    public dbHeightMapHandler() {
+
+
+    }
+
+    public void LOAD_ALL_HEIGHTMAPS() {
+
+        HeightMap thisHeightmap;
+        HeightMap.heightMapsCreated = 0;
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_zone_heightmap INNER JOIN static_zone_size ON static_zone_size.loadNum = static_zone_heightmap.zoneLoadID")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+
+            while (rs.next()) {
+                thisHeightmap = new HeightMap(rs);
+
+                if (thisHeightmap.getHeightmapImage() == null) {
+                    Logger.info("Imagemap for " + thisHeightmap.getHeightMapID() + " was null");
+                    continue;
+                }
+            }
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+    }
+
+}

src/engine/db/handlers/dbItemBaseHandler.java

@@ -86,7 +86,6 @@ public class dbItemBaseHandler extends dbHandlerBase {
             while (rs.next()) {
                 recordsRead++;
                 itemBase = new ItemBase(rs);
-
                 ItemBase.addToCache(itemBase);
             }
 

src/engine/db/handlers/dbMobHandler.java

@@ -11,6 +11,7 @@ package engine.db.handlers;
 
 import engine.gameManager.DbManager;
 import engine.objects.Mob;
+import engine.objects.Zone;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;
 
@@ -27,27 +28,31 @@ public class dbMobHandler extends dbHandlerBase {
         this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
-    public Mob PERSIST(Mob toAdd) {
+    public Mob ADD_MOB(Mob toAdd) {
 
         Mob mobile = null;
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("CALL `mob_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("CALL `mob_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);")) {
 
-            preparedStatement.setLong(1, toAdd.parentZoneUUID);
+            preparedStatement.setLong(1, toAdd.getParentZoneID());
-            preparedStatement.setInt(2, toAdd.loadID);
+            preparedStatement.setInt(2, toAdd.getMobBaseID());
-            preparedStatement.setInt(3, toAdd.guildUUID);
+            preparedStatement.setInt(3, toAdd.getGuildUUID());
-            preparedStatement.setFloat(4, toAdd.bindLoc.x);
+            preparedStatement.setFloat(4, toAdd.getSpawnX());
-            preparedStatement.setFloat(5, toAdd.bindLoc.y);
+            preparedStatement.setFloat(5, toAdd.getSpawnY());
-            preparedStatement.setFloat(6, toAdd.bindLoc.z);
+            preparedStatement.setFloat(6, toAdd.getSpawnZ());
             preparedStatement.setInt(7, 0);
-            preparedStatement.setFloat(8, toAdd.spawnRadius);
+            preparedStatement.setFloat(8, toAdd.getSpawnRadius());
-            preparedStatement.setInt(9, toAdd.spawnDelay);
+            preparedStatement.setInt(9, toAdd.getTrueSpawnTime());
-            preparedStatement.setInt(10, toAdd.contractUUID);
+
-            preparedStatement.setInt(11, toAdd.buildingUUID);
+            if (toAdd.getContract() != null)
-            preparedStatement.setInt(12, toAdd.level);
+                preparedStatement.setInt(10, toAdd.getContract().getContractID());
-            preparedStatement.setString(13, toAdd.firstName);
+            else
-            preparedStatement.setString(14, toAdd.behaviourType.toString());
+                preparedStatement.setInt(10, 0);
+
+            preparedStatement.setInt(11, toAdd.getBuildingID());
+            preparedStatement.setInt(12, toAdd.getLevel());
+            preparedStatement.setString(13, toAdd.getFirstName());
 
             ResultSet rs = preparedStatement.executeQuery();
 
@@ -64,23 +69,6 @@ public class dbMobHandler extends dbHandlerBase {
         return mobile;
     }
 
-    public ArrayList<Mob> GET_ALL_MOBS() {
-
-        ArrayList<Mob> mobileList = new ArrayList<>();
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_mob`.*, `object`.`parent` FROM `object` INNER JOIN `obj_mob` ON `obj_mob`.`UID` = `object`.`UID` ORDER BY `object`.`UID` ASC;")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-            mobileList = getObjectsFromRs(rs, 1000);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-
-        return mobileList;
-    }
-
     public boolean updateUpgradeTime(Mob mob, DateTime upgradeDateTime) {
 
         try (Connection connection = DbManager.getConnection();
@@ -118,17 +106,17 @@ public class dbMobHandler extends dbHandlerBase {
         return row_count;
     }
 
-    public void LOAD_GUARD_MINIONS(Mob guardCaptain) {
+    public void LOAD_PATROL_POINTS(Mob captain) {
 
         try (Connection connection = DbManager.getConnection();
              PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_guards` WHERE `captainUID` = ?")) {
 
-            preparedStatement.setInt(1, guardCaptain.getObjectUUID());
+            preparedStatement.setInt(1, captain.getObjectUUID());
             ResultSet rs = preparedStatement.executeQuery();
 
             while (rs.next()) {
-                String minionName = rs.getString("minionName");
+                String name = rs.getString("name");
-                Mob toCreate = Mob.createGuardMinion(guardCaptain, guardCaptain.getLevel(), minionName);
+                Mob toCreate = Mob.createGuardMob(captain, captain.getGuild(), captain.getParentZone(), captain.building.getLoc(), captain.getLevel(), name);
 
                 if (toCreate == null)
                     return;
@@ -143,13 +131,15 @@ public class dbMobHandler extends dbHandlerBase {
         }
     }
 
-    public boolean ADD_GUARD_MINION(final long captainUID, final String minionName) {
+    public boolean ADD_TO_GUARDS(final long captainUID, final int mobBaseID, final String name, final int slot) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_guards` (`captainUID`, `minionName`) VALUES (?,?)")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_guards` (`captainUID`, `mobBaseID`,`name`, `slot`) VALUES (?,?,?,?)")) {
 
             preparedStatement.setLong(1, captainUID);
-            preparedStatement.setString(2, minionName);
+            preparedStatement.setInt(2, mobBaseID);
+            preparedStatement.setString(3, name);
+            preparedStatement.setInt(4, slot);
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -159,13 +149,14 @@ public class dbMobHandler extends dbHandlerBase {
         }
     }
 
-    public boolean REMOVE_GUARD_MINION(final long captainUID, final String minionName) {
+    public boolean REMOVE_FROM_GUARDS(final long captainUID, final int mobBaseID, final int slot) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=? AND `minionName`=? LIMIT 1;")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=? AND `mobBaseID`=? AND `slot` =?")) {
 
             preparedStatement.setLong(1, captainUID);
-            preparedStatement.setString(2, minionName);
+            preparedStatement.setInt(2, mobBaseID);
+            preparedStatement.setInt(3, slot);
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -175,19 +166,24 @@ public class dbMobHandler extends dbHandlerBase {
         }
     }
 
-    public boolean REMOVE_ALL_MINIONS(final long captainUID) {
+
+    public ArrayList<Mob> GET_ALL_MOBS_FOR_ZONE(Zone zone) {
+
+        ArrayList<Mob> mobileList = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=?;")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_mob`.*, `object`.`parent` FROM `object` INNER JOIN `obj_mob` ON `obj_mob`.`UID` = `object`.`UID` WHERE `object`.`parent` = ?;")) {
 
-            preparedStatement.setLong(1, captainUID);
+            preparedStatement.setLong(1, zone.getObjectUUID());
 
-            return (preparedStatement.executeUpdate() > 0);
+            ResultSet rs = preparedStatement.executeQuery();
+            mobileList = getObjectsFromRs(rs, 1000);
 
         } catch (SQLException e) {
             Logger.error(e);
-            return false;
         }
+
+        return mobileList;
     }
 
     public Mob GET_MOB(final int objectUUID) {

src/engine/db/handlers/dbNPCHandler.java

@@ -15,6 +15,7 @@ import engine.math.Vector3fImmutable;
 import engine.objects.NPC;
 import engine.objects.NPCProfits;
 import engine.objects.ProducedItem;
+import engine.objects.Zone;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;
 
@@ -93,12 +94,14 @@ public class dbNPCHandler extends dbHandlerBase {
         return row_count;
     }
 
-    public ArrayList<NPC> GET_ALL_NPCS() {
+    public ArrayList<NPC> GET_ALL_NPCS_FOR_ZONE(Zone zone) {
 
         ArrayList<NPC> npcList = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_npc`.*, `object`.`parent` FROM `object` INNER JOIN `obj_npc` ON `obj_npc`.`UID` = `object`.`UID` ORDER BY `object`.`UID` ASC;")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_npc`.*, `object`.`parent` FROM `object` INNER JOIN `obj_npc` ON `obj_npc`.`UID` = `object`.`UID` WHERE `object`.`parent` = ?;")) {
+
+            preparedStatement.setLong(1, zone.getObjectUUID());
 
             ResultSet rs = preparedStatement.executeQuery();
             npcList = getObjectsFromRs(rs, 1000);
@@ -240,8 +243,12 @@ public class dbNPCHandler extends dbHandlerBase {
 
     public boolean UPDATE_EQUIPSET(NPC npc, int equipSetID) {
 
+        // Column name must match what NPC/Mob loaders read ("equipmentSet").
+        // Using the wrong column here causes the update to fail silently and
+        // dev command to report "Unable to find Equipset" despite a valid ID.
+
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_npc` SET `equipsetID`=? WHERE `UID`=?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_npc` SET `equipmentSet`=? WHERE `UID`=?")) {
 
             preparedStatement.setInt(1, equipSetID);
             preparedStatement.setLong(2, npc.getObjectUUID());
@@ -464,4 +471,4 @@ public class dbNPCHandler extends dbHandlerBase {
             return false;
         }
     }
-}
+}

src/engine/db/handlers/dbPowerHandler.java

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

src/engine/db/handlers/dbRuneBaseHandler.java

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

src/engine/db/handlers/dbWarehouseHandler.java

@@ -109,7 +109,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_locks`=? WHERE `UID` = ?")) {
 
             preparedStatement.setLong(1, locks);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -125,7 +125,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_gold`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -141,7 +141,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_stone`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -157,7 +157,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_truesteel`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -173,7 +173,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_iron`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -189,7 +189,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_adamant`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -205,7 +205,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_lumber`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -221,7 +221,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_oak`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -237,7 +237,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_bronzewood`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -253,7 +253,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_mandrake`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -269,7 +269,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_coal`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -285,7 +285,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_agate`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -301,7 +301,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_diamond`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -317,7 +317,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_onyx`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -333,7 +333,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_azoth`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -349,7 +349,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_orichalk`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -365,7 +365,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_antimony`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -381,7 +381,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_sulfur`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -397,7 +397,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_quicksilver`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -413,7 +413,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_galvor`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -429,7 +429,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_wormwood`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -445,7 +445,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_obsidian`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -461,7 +461,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_bloodstone`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -477,7 +477,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_mithril`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, amount);
-            preparedStatement.setInt(2, wh.UID);
+            preparedStatement.setInt(2, wh.getUID());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -545,7 +545,7 @@ public class dbWarehouseHandler extends dbHandlerBase {
             while (rs.next()) {
                 warehouse = new Warehouse(rs);
                 warehouse.runAfterLoad();
-                Warehouse.loadAllTransactions(warehouse);
+                warehouse.loadAllTransactions();
             }
 
         } catch (SQLException e) {

src/engine/db/handlers/dbZoneHandler.java

@@ -12,8 +12,8 @@ package engine.db.handlers;
 import engine.Enum;
 import engine.gameManager.DbManager;
 import engine.gameManager.ZoneManager;
+import engine.math.Vector2f;
 import engine.objects.Zone;
-import engine.objects.ZoneTemplate;
 import org.pmw.tinylog.Logger;
 
 import java.sql.Connection;
@@ -29,21 +29,25 @@ public class dbZoneHandler extends dbHandlerBase {
         this.localObjectType = Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
-    public ArrayList<Zone> GET_ALL_ZONES() {
+    public ArrayList<Zone> GET_ALL_NODES(Zone zone) {
-
+        ArrayList<Zone> wsmList = new ArrayList<>();
-        ArrayList<Zone> zoneList = new ArrayList<>();
+        wsmList.addAll(zone.getNodes());
-
+        if (zone.absX == 0.0f) {
-        try (Connection connection = DbManager.getConnection();
+            zone.absX = zone.getXCoord();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_zone`.*, `object`.`parent` FROM `object` INNER JOIN `obj_zone` ON `obj_zone`.`UID` = `object`.`UID` ORDER BY `object`.`UID` ASC;")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-            zoneList = getObjectsFromRs(rs, 2000);
-
-        } catch (SQLException e) {
-            Logger.error(e);
         }
-
+        if (zone.absY == 0.0f) {
-        return zoneList;
+            zone.absY = zone.getYCoord();
+        }
+        if (zone.absZ == 0.0f) {
+            zone.absZ = zone.getZCoord();
+        }
+        for (Zone child : zone.getNodes()) {
+            child.absX = child.getXCoord() + zone.absX;
+            child.absY = child.getYCoord() + zone.absY;
+            child.absZ = child.getZCoord() + zone.absZ;
+            wsmList.addAll(this.GET_ALL_NODES(child));
+        }
+        return wsmList;
     }
 
     public Zone GET_BY_UID(long ID) {
@@ -68,38 +72,43 @@ public class dbZoneHandler extends dbHandlerBase {
         return zone;
     }
 
-    public void LOAD_ALL_ZONE_TEMPLATES() {
+    public ArrayList<Zone> GET_MAP_NODES(final int objectUUID) {
+
+        ArrayList<Zone> zoneList = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_zone_templates")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_zone`.*, `object`.`parent` FROM `object` INNER JOIN `obj_zone` ON `obj_zone`.`UID` = `object`.`UID` WHERE `object`.`parent` = ?;")) {
+
+            preparedStatement.setLong(1, objectUUID);
 
             ResultSet rs = preparedStatement.executeQuery();
-
+            zoneList = getObjectsFromRs(rs, 2000);
-            while (rs.next()) {
-                ZoneTemplate zoneTemplate = new ZoneTemplate(rs);
-                ZoneManager._zone_templates.put(zoneTemplate.templateID, zoneTemplate);
-            }
-
-            // Add player city
-
-            ZoneTemplate zoneTemplate = new ZoneTemplate();
-
-            zoneTemplate.templateID = 0;
-            zoneTemplate.sea_level_type = "PARENT";
-            zoneTemplate.sea_level = 0;
-            zoneTemplate.max_blend = 128;
-            zoneTemplate.min_blend = 128;
-            zoneTemplate.terrain_max_y = 5;
-            zoneTemplate.major_radius = (int) Enum.CityBoundsType.ZONE.halfExtents;
-            zoneTemplate.minor_radius = (int) Enum.CityBoundsType.ZONE.halfExtents;
-            zoneTemplate.terrain_type = "PLANAR";
-
-            ZoneManager._zone_templates.put(zoneTemplate.templateID, zoneTemplate);
 
         } catch (SQLException e) {
             Logger.error(e);
         }
 
+        return zoneList;
+    }
+
+    public void LOAD_ZONE_EXTENTS() {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_zone_size`;")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+
+            while (rs.next()) {
+                Vector2f zoneSize = new Vector2f();
+                int loadNum = rs.getInt("loadNum");
+                zoneSize.x = rs.getFloat("xRadius");
+                zoneSize.y = rs.getFloat("zRadius");
+                ZoneManager._zone_size_data.put(loadNum, zoneSize);
+            }
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
     }
 
     public boolean DELETE_ZONE(final Zone zone) {

src/engine/devcmd/cmds/AddMobCmd.java

@@ -9,16 +9,18 @@
 
 package engine.devcmd.cmds;
 
-import engine.Enum;
+import engine.Enum.GameObjectType;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.ChatManager;
+import engine.gameManager.DbManager;
 import engine.gameManager.ZoneManager;
-import engine.objects.AbstractGameObject;
+import engine.math.Vector3fImmutable;
-import engine.objects.Mob;
+import engine.objects.*;
-import engine.objects.PlayerCharacter;
-import engine.objects.Zone;
 import org.pmw.tinylog.Logger;
 
+/**
+ * @author Eighty
+ */
 public class AddMobCmd extends AbstractDevCmd {
 
     public AddMobCmd() {
@@ -35,8 +37,27 @@ public class AddMobCmd extends AbstractDevCmd {
 
         Zone zone = ZoneManager.findSmallestZone(pc.getLoc());
 
-        int loadID;
+        if (words[0].equals("all")) {
 
+            for (AbstractGameObject mobbaseAGO : DbManager.getList(GameObjectType.MobBase)) {
+                MobBase mb = (MobBase) mobbaseAGO;
+                int loadID = mb.getObjectUUID();
+                Mob mob = Mob.createMob(loadID, Vector3fImmutable.getRandomPointInCircle(pc.getLoc(), 100),
+                        null, true, zone, null, 0, "", 1);
+                if (mob != null) {
+                    mob.updateDatabase();
+                    this.setResult(String.valueOf(mob.getDBID()));
+                } else {
+                    throwbackError(pc, "Failed to create mob of type " + loadID);
+                    Logger.error("Failed to create mob of type "
+                            + loadID);
+                }
+            }
+            return;
+        }
+
+
+        int loadID;
         try {
             loadID = Integer.parseInt(words[0]);
         } catch (NumberFormatException e) {
@@ -50,19 +71,20 @@ public class AddMobCmd extends AbstractDevCmd {
             return; // NaN
         }
 
+
         if (zone == null) {
             throwbackError(pc, "Failed to find zone to place mob in.");
             return;
         }
 
-        if (zone.guild_zone) {
+        if (zone.isPlayerCity()) {
             throwbackError(pc, "Cannot use ./mob on Player cities. Try ./servermob instead.");
             return;
         }
 
-        Mob mob = Mob.createMob(loadID, pc.getLoc(),
-                null, zone, null, null, "", 1, Enum.AIAgentType.MOBILE);
 
+        Mob mob = Mob.createMob(loadID, pc.getLoc(),
+                null, true, zone, null, 0, "", 1);
         if (mob != null) {
             mob.updateDatabase();
             ChatManager.chatSayInfo(pc,

src/engine/devcmd/cmds/AuditHeightMapCmd.java

@@ -0,0 +1,70 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.InterestManagement.HeightMap;
+import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.ZoneManager;
+import engine.math.Vector2f;
+import engine.math.Vector3fImmutable;
+import engine.objects.AbstractGameObject;
+import engine.objects.PlayerCharacter;
+import engine.objects.Zone;
+
+public class AuditHeightMapCmd extends AbstractDevCmd {
+
+    public AuditHeightMapCmd() {
+        super("auditheightmap");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pcSender, String[] words,
+                          AbstractGameObject target) {
+
+        int count = Integer.parseInt(words[0]);
+        long start = System.currentTimeMillis();
+        for (int i = 0; i < count; i++) {
+
+
+            Zone currentZone = ZoneManager.findSmallestZone(pcSender.getLoc());
+
+
+            Vector3fImmutable currentLoc = Vector3fImmutable.getRandomPointInCircle(currentZone.getLoc(), currentZone.getBounds().getHalfExtents().x < currentZone.getBounds().getHalfExtents().y ? currentZone.getBounds().getHalfExtents().x : currentZone.getBounds().getHalfExtents().y);
+
+            Vector2f zoneLoc = ZoneManager.worldToZoneSpace(currentLoc, currentZone);
+
+            if (currentZone != null && currentZone.getHeightMap() != null) {
+                float altitude = currentZone.getHeightMap().getInterpolatedTerrainHeight(zoneLoc);
+                float outsetAltitude = HeightMap.getOutsetHeight(altitude, currentZone, pcSender.getLoc());
+            }
+
+        }
+        long end = System.currentTimeMillis();
+
+        long delta = end - start;
+
+        this.throwbackInfo(pcSender, "Audit Heightmap took " + delta + " ms to run " + count + " times!");
+
+
+    }
+
+
+    @Override
+    protected String _getUsageString() {
+        return "' /auditmobs [zone.UUID]'";
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Audits all the mobs in a zone.";
+
+    }
+
+}

src/engine/devcmd/cmds/AuditMobsCmd.java

@@ -40,8 +40,8 @@ public class AuditMobsCmd extends AbstractDevCmd {
 
                     if (size >= count) {
                         plusplus++;
-                        throwbackInfo(pcSender, zoneMicro.zoneName + " at location  " + zoneMicro.getLoc().toString() + " has " + size + " mobs. ");
+                        throwbackInfo(pcSender, zoneMicro.getName() + " at location  " + zoneMicro.getLoc().toString() + " has " + size + " mobs. ");
-                        System.out.println(zoneMicro.zoneName + " at location  " + zoneMicro.getLoc().toString() + " has " + size + " mobs. ");
+                        System.out.println(zoneMicro.getName() + " at location  " + zoneMicro.getLoc().toString() + " has " + size + " mobs. ");
                     }
 
 
@@ -80,7 +80,7 @@ public class AuditMobsCmd extends AbstractDevCmd {
         //ConcurrentHashMap<Mob, Long> respawnMap = Mob.getRespawnMap();
         //		ConcurrentHashMap<Mob, Long> despawnMap = Mob.getDespawnMap();
 
-        throwbackInfo(pcSender, zone.zoneName + ", numMobs: " + zone.zoneMobSet.size());
+        throwbackInfo(pcSender, zone.getName() + ", numMobs: " + zone.zoneMobSet.size());
         throwbackInfo(pcSender, "UUID, dbID, inRespawnMap, isAlive, activeAI, Loc");
 
 

src/engine/devcmd/cmds/GetHeightCmd.java

@@ -9,10 +9,11 @@
 
 package engine.devcmd.cmds;
 
-import engine.InterestManagement.Terrain;
+import engine.InterestManagement.HeightMap;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.ZoneManager;
 import engine.math.Vector2f;
+import engine.math.Vector3fImmutable;
 import engine.objects.AbstractGameObject;
 import engine.objects.PlayerCharacter;
 import engine.objects.Zone;
@@ -21,79 +22,205 @@ public class GetHeightCmd extends AbstractDevCmd {
 
     public GetHeightCmd() {
         super("getHeight");
+        this.addCmdString("height");
     }
 
     @Override
-    protected void _doCmd(PlayerCharacter playerCharacter, String[] words,
+    protected void _doCmd(PlayerCharacter pc, String[] words,
                           AbstractGameObject target) {
 
-        Zone currentZone;
+        boolean end = true;
-        Zone parentZone;
-        Zone heightmapZone;
 
-        currentZone = ZoneManager.findSmallestZone(playerCharacter.getLoc());
+        float height = HeightMap.getWorldHeight(pc);
-        heightmapZone = Terrain.getNextZoneWithTerrain(currentZone);
-        parentZone = Terrain.getNextZoneWithTerrain(currentZone.parent);
 
-        Vector2f childZoneLoc = ZoneManager.worldToTerrainSpace(playerCharacter.getLoc(), heightmapZone);
+        this.throwbackInfo(pc, "Altitude : " + height);
-        Vector2f childZoneOffset = ZoneManager.worldToZoneOffset(playerCharacter.getLoc(), heightmapZone);
-        Vector2f normalizedOffset = new Vector2f(Math.abs(childZoneOffset.x) / heightmapZone.template.major_radius,
-                Math.abs(childZoneOffset.y) / heightmapZone.template.minor_radius);
-        Vector2f parentZoneLoc = ZoneManager.worldToTerrainSpace(playerCharacter.getLoc(), parentZone);
 
-        float childHeight = heightmapZone.terrain.getInterpolatedTerrainHeight(childZoneLoc);
+        this.throwbackInfo(pc, "Character Height: " + pc.getCharacterHeight());
-        childHeight = childHeight + heightmapZone.global_height;
+        this.throwbackInfo(pc, "Character Height to start swimming: " + pc.centerHeight);
 
-        float parentHeight = parentZone.terrain.getInterpolatedTerrainHeight(parentZoneLoc);
+        Zone zone = ZoneManager.findSmallestZone(pc.getLoc());
-        parentHeight += parentZone.global_height;
+        this.throwbackInfo(pc, "Water Level : " + zone.getSeaLevel());
+        this.throwbackInfo(pc, "Character Water Level Above : " + (pc.getCharacterHeight() + height - zone.getSeaLevel()));
 
-        float blendedHeight = Terrain.getWorldHeight(currentZone, playerCharacter.getLoc());
+        if (end)
+            return;
 
-        Vector2f terrainCell = heightmapZone.terrain.getTerrainCell(childZoneLoc);
+        Vector2f gridSquare;
-        Vector2f cell_offset = new Vector2f(terrainCell.x % 1, terrainCell.y % 1);
+        Vector2f gridOffset;
+        Vector2f parentGrid;
+        Vector2f parentLoc = new Vector2f(-1, -1);
 
-        terrainCell.x = (float) Math.floor(terrainCell.x);
+        Zone currentZone = ZoneManager.findSmallestZone(pc.getLoc());
-        terrainCell.y = (float) Math.floor(terrainCell.y);
+
+        if (currentZone == null)
+            return;
+
+        Zone parentZone = currentZone.getParent();
+
+        HeightMap heightMap = currentZone.getHeightMap();
 
 
-        short top_left_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x][(int) terrainCell.y];
+        //find the next parents heightmap if the currentzone heightmap is null.
-        short top_right_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x + 1][(int) terrainCell.y];
+        while (heightMap == null) {
-        short bottom_left_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x][(int) terrainCell.y + 1];
-        short bottom_right_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x + 1][(int) terrainCell.y + 1];
 
-        this.throwbackInfo(playerCharacter, "Current Zone : " + currentZone.zoneName);
+            if (currentZone == ZoneManager.getSeaFloor()) {
-        this.throwbackInfo(playerCharacter, "Heightmap Zone : " + heightmapZone.zoneName);
+                this.throwbackInfo(pc, "Could not find a heightmap to get height.");
-        this.throwbackInfo(playerCharacter, "Parent Zone: " + parentZone.zoneName);
+                break;
+            }
 
-        this.throwbackInfo(playerCharacter, "Player loc: " + "[" + playerCharacter.loc.x + "]" + "[" + playerCharacter.loc.y + "]" + "[" + playerCharacter.loc.z + "]");
+            this.throwbackError(pc, "Heightmap does not exist for " + currentZone.getName());
+            this.throwbackInfo(pc, "Using parent zone instead: ");
+            currentZone = currentZone.getParent();
+            heightMap = currentZone.getHeightMap();
+        }
 
-        this.throwbackInfo(playerCharacter, "Terrain Cell : " + "[" + terrainCell.x + "]" + "[" + terrainCell.y + "]");
-        this.throwbackInfo(playerCharacter, "Cell Offset : " + "[" + cell_offset.x + "]" + "[" + cell_offset.y + "]");
-        this.throwbackInfo(playerCharacter, "Pixels : " + "[" + top_left_pixel + "]" + "[" + top_right_pixel + "]");
-        this.throwbackInfo(playerCharacter, "Pixels : " + "[" + bottom_left_pixel + "]" + "[" + bottom_right_pixel + "]");
 
-        this.throwbackInfo(playerCharacter, "Child Zone Offset: " + "[" + childZoneOffset.x + "]" + "[" + childZoneOffset.y + "]");
+        if ((heightMap == null) || (currentZone == ZoneManager.getSeaFloor())) {
-        this.throwbackInfo(playerCharacter, "Normalized offset: " + "[" + normalizedOffset.x + "]" + "[" + normalizedOffset.y + "]");
+            this.throwbackInfo(pc, currentZone.getName() + " has no heightmap ");
-        this.throwbackInfo(playerCharacter, "template blend Values: (max/min): " + heightmapZone.template.max_blend + " /" + heightmapZone.template.min_blend);
+            this.throwbackInfo(pc, "Current altitude: " + currentZone.absY);
-        this.throwbackInfo(playerCharacter, "terrain values (max/min): " + heightmapZone.terrain.blend_values.x + " /" + heightmapZone.terrain.blend_values.y);
+            return;
-        this.throwbackInfo(playerCharacter, "Blend coefficient: " + heightmapZone.terrain.getTerrainBlendCoefficient(childZoneOffset));
+        }
 
-        this.throwbackInfo(playerCharacter, "------------");
+        Vector2f zoneLoc = ZoneManager.worldToZoneSpace(pc.getLoc(), currentZone);
+
+        Vector3fImmutable seaFloorLocalLoc = ZoneManager.worldToLocal(pc.getLoc(), ZoneManager.getSeaFloor());
+        this.throwbackInfo(pc, "SeaFloor Local : " + seaFloorLocalLoc.x + " , " + seaFloorLocalLoc.y);
+
+
+        this.throwbackInfo(pc, "Local Zone Location : " + zoneLoc.x + " , " + zoneLoc.y);
+        Vector3fImmutable localLocFromCenter = ZoneManager.worldToLocal(pc.getLoc(), currentZone);
+        Vector3fImmutable parentLocFromCenter = ZoneManager.worldToLocal(pc.getLoc(), currentZone.getParent());
+        this.throwbackInfo(pc, "Local Zone Location from center : " + localLocFromCenter);
+        this.throwbackInfo(pc, "parent Zone Location from center : " + parentLocFromCenter);
+
+        Vector2f parentZoneLoc = ZoneManager.worldToZoneSpace(pc.getLoc(), currentZone.getParent());
+        this.throwbackInfo(pc, "Parent Zone Location from Bottom Left : " + parentZoneLoc);
+
+        if ((parentZone != null) && (parentZone.getHeightMap() != null)) {
+            parentLoc = ZoneManager.worldToZoneSpace(pc.getLoc(), parentZone);
+            parentGrid = parentZone.getHeightMap().getGridSquare(parentLoc);
+        } else
+            parentGrid = new Vector2f(-1, -1);
+
+        gridSquare = heightMap.getGridSquare(zoneLoc);
+        gridOffset = HeightMap.getGridOffset(gridSquare);
+
+        float interaltitude = currentZone.getHeightMap().getInterpolatedTerrainHeight(zoneLoc);
+
+        this.throwbackInfo(pc, currentZone.getName());
+        this.throwbackInfo(pc, "Current Grid Square: " + gridSquare.x + " , " + gridSquare.y);
+        this.throwbackInfo(pc, "Grid Offset: " + gridOffset.x + " , " + gridOffset.y);
+        this.throwbackInfo(pc, "Parent Grid: " + parentGrid.x + " , " + parentGrid.y);
+
+        if (parentGrid.x != -1) {
+            float parentAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(parentLoc);
+            this.throwbackInfo(pc, "Parent ALTITUDE: " + (parentAltitude));
+            this.throwbackInfo(pc, "Parent Interpolation: " + (parentAltitude + parentZone.getWorldAltitude()));
+        }
+        this.throwbackInfo(pc, "interpolated height: " + interaltitude);
+
+        this.throwbackInfo(pc, "interpolated height with World: " + (interaltitude + currentZone.getWorldAltitude()));
+
+        float realWorldAltitude = interaltitude + currentZone.getWorldAltitude();
+
+        //OUTSET
+        if (parentZone != null) {
+            float parentXRadius = currentZone.getBounds().getHalfExtents().x;
+            float parentZRadius = currentZone.getBounds().getHalfExtents().y;
+
+            float offsetX = Math.abs((localLocFromCenter.x / parentXRadius));
+            float offsetZ = Math.abs((localLocFromCenter.z / parentZRadius));
+
+            float bucketScaleX = 100 / parentXRadius;
+            float bucketScaleZ = 200 / parentZRadius;
+
+            float outsideGridSizeX = 1 - bucketScaleX; //32/256
+            float outsideGridSizeZ = 1 - bucketScaleZ;
+            float weight;
+
+            double scale;
+
+
+            if (offsetX > outsideGridSizeX && offsetX > offsetZ) {
+                weight = (offsetX - outsideGridSizeX) / bucketScaleX;
+                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
+
+                float scaleChild = (float) ((scale + 1) * .5);
+                float scaleParent = 1 - scaleChild;
+
+
+                float parentAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(parentLoc);
+                float parentCenterAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(currentZone.getLoc(), parentZone));
+
+                parentCenterAltitude += currentZone.getYCoord();
+                parentCenterAltitude += interaltitude;
+
+                float firstScale = parentAltitude * scaleParent;
+                float secondScale = parentCenterAltitude * scaleChild;
+                float outsetALt = firstScale + secondScale;
+
+                outsetALt += currentZone.getParent().getAbsY();
+                realWorldAltitude = outsetALt;
+
+            } else if (offsetZ > outsideGridSizeZ) {
+
+                weight = (offsetZ - outsideGridSizeZ) / bucketScaleZ;
+                scale = Math.atan2((.5 - weight) * 3.1415927, 1);
+
+                float scaleChild = (float) ((scale + 1) * .5);
+                float scaleParent = 1 - scaleChild;
+                float parentAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(parentLoc);
+                float parentCenterAltitude = parentZone.getHeightMap().getInterpolatedTerrainHeight(ZoneManager.worldToZoneSpace(currentZone.getLoc(), parentZone));
+
+                parentCenterAltitude += currentZone.getYCoord();
+                parentCenterAltitude += interaltitude;
+                float firstScale = parentAltitude * scaleParent;
+                float secondScale = parentCenterAltitude * scaleChild;
+                float outsetALt = firstScale + secondScale;
+
+                outsetALt += currentZone.getParent().getAbsY();
+                realWorldAltitude = outsetALt;
+
+
+            }
+        }
+
+        float strMod = pc.statStrBase - 40;
+
+        strMod *= .00999999998f;
+
+        strMod += 1f;
+
+        float radius = 0;
+        switch (pc.getRaceID()) {
+            case 2017:
+                radius = 3.1415927f;
+            case 2000:
+
+
+        }
+        strMod *= 1.5707964f;
+
+        strMod += 3.1415927f;
+
+        strMod -= .5f;
+
+
+        realWorldAltitude += strMod;
+
+        this.throwbackInfo(pc, "interpolated height with World: " + realWorldAltitude);
 
-        this.throwbackInfo(playerCharacter, "Child Height at loc: " + Math.ceil(childHeight));
-        this.throwbackInfo(playerCharacter, "Parent Height at loc: " + Math.ceil(parentHeight));
-        this.throwbackInfo(playerCharacter, "Blended Height (Ceil): " + blendedHeight + " (" + Math.ceil(blendedHeight) + ")");
 
     }
 
     @Override
     protected String _getHelpString() {
-        return "Queries heightmap engine";
+        return "Temporarily Changes SubRace";
     }
 
     @Override
     protected String _getUsageString() {
-        return "' /getheight";
+        return "' /subrace mobBaseID";
     }
 
 }

src/engine/devcmd/cmds/GetOffsetCmd.java

@@ -48,7 +48,7 @@ public class GetOffsetCmd extends AbstractDevCmd {
         float difY = pcSender.getLoc().y - zone.absY;
         float difZ = pcSender.getLoc().z - zone.absZ;
 
-        throwbackInfo(pcSender, zone.zoneName + ": (x: " + difX + ", y: " + difY + ", z: " + difZ + ')');
+        throwbackInfo(pcSender, zone.getName() + ": (x: " + difX + ", y: " + difY + ", z: " + difZ + ')');
     }
 
     @Override

src/engine/devcmd/cmds/GetZoneCmd.java

@@ -51,7 +51,7 @@ public class GetZoneCmd extends AbstractDevCmd {
         }
 
         for (Zone zone : allIn)
-            throwbackInfo(pcSender, zone.zoneName + "; UUID: " + zone.getObjectUUID() + ", loadNum: " + zone.templateID);
+            throwbackInfo(pcSender, zone.getName() + "; UUID: " + zone.getObjectUUID() + ", loadNum: " + zone.getLoadNum());
     }
 
     @Override

src/engine/devcmd/cmds/GotoCmd.java

@@ -81,7 +81,7 @@ public class GotoCmd extends AbstractDevCmd {
                 continue;
             Zone zone = city.getParent();
             if (zone != null) {
-                if (zone.isNPCCity || zone.guild_zone)
+                if (zone.isNPCCity() || zone.isPlayerCity())
                     loc = Vector3fImmutable.getRandomPointOnCircle(zone.getLoc(), MBServerStatics.TREE_TELEPORT_RADIUS);
                 else
                     loc = zone.getLoc();
@@ -97,10 +97,10 @@ public class GotoCmd extends AbstractDevCmd {
                 Zone zone = (Zone) zoneAgo;
                 if (zone == null)
                     continue;
-                if (!zone.zoneName.equalsIgnoreCase(cityName))
+                if (!zone.getName().equalsIgnoreCase(cityName))
                     continue;
                 if (zone != null) {
-                    if (zone.isNPCCity || zone.guild_zone)
+                    if (zone.isNPCCity() || zone.isPlayerCity())
                         loc = Vector3fImmutable.getRandomPointOnCircle(zone.getLoc(), MBServerStatics.TREE_TELEPORT_RADIUS);
                     else
                         loc = zone.getLoc();

src/engine/devcmd/cmds/HotzoneCmd.java

@@ -40,7 +40,7 @@ public class HotzoneCmd extends AbstractDevCmd {
         String input = data.toString().trim();
 
         if (input.length() == 0) {
-            outString = "Current hotZone: " + ZoneManager.hotZone.zoneName + "\r\n";
+            outString = "Current hotZone: " + ZoneManager.hotZone.getName() + "\r\n";
             outString += "Available hotZones: " + ZoneManager.availableHotZones();
             throwbackInfo(playerCharacter, outString);
             return;
@@ -48,7 +48,7 @@ public class HotzoneCmd extends AbstractDevCmd {
 
         if (input.equalsIgnoreCase("random")) {
             ZoneManager.generateAndSetRandomHotzone();
-            outString = "New hotZone: " + ZoneManager.hotZone.zoneName + "\r\n";
+            outString = "New hotZone: " + ZoneManager.hotZone.getName() + "\r\n";
             outString += "Available hotZones: " + ZoneManager.availableHotZones();
             throwbackInfo(playerCharacter, outString);
             return;

src/engine/devcmd/cmds/InfoCmd.java

@@ -387,7 +387,7 @@ public class InfoCmd extends AbstractDevCmd {
                     output += newline;
                     output += "EquipSet: " + targetNPC.getEquipmentSetID();
                     output += newline;
-                    output += "Parent Zone LoadNum : " + targetNPC.getParentZone().templateID;
+                    output += "Parent Zone LoadNum : " + targetNPC.getParentZone().getLoadNum();
 
                 }
 
@@ -440,9 +440,7 @@ 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;
@@ -473,7 +471,7 @@ public class InfoCmd extends AbstractDevCmd {
                 output += "EquipSet: " + targetMob.equipmentSetID;
                 output += newline;
                 try {
-                    output += "Parent Zone LoadNum : " + targetMob.getParentZone().templateID;
+                    output += "Parent Zone LoadNum : " + targetMob.getParentZone().getLoadNum();
                 } catch (Exception ex) {
                     //who cares
                 }

src/engine/devcmd/cmds/ItemInfoCmd.java

@@ -1,80 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.Enum;
-import engine.Enum.BuildingGroup;
-import engine.Enum.GameObjectType;
-import engine.Enum.TargetColor;
-import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.BuildingManager;
-import engine.gameManager.SessionManager;
-import engine.math.Vector3fImmutable;
-import engine.objects.*;
-import engine.util.StringUtils;
-
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.concurrent.ConcurrentHashMap;
-
-
-/**
- * @author
- */
-public class ItemInfoCmd extends AbstractDevCmd {
-
-    public ItemInfoCmd() {
-        super("iteminfo");
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pc, String[] words,AbstractGameObject target) {
-        if (pc == null) {
-            return;
-        }
-        if(target.getObjectType().equals(GameObjectType.Item) == false){
-            throwbackInfo(pc, "Must Select An Item");
-            return;
-        }
-        Item item = (Item)target;
-        String newline = "\r\n ";
-        String output = "";
-        output += "Required Races:" + newline;
-        for(Enum.MonsterType required : item.getItemBase().requiredRaces)
-            output += "     " + required.name() + newline;
-        output += "Restricted Races:" + newline;
-        for(Enum.MonsterType required : item.getItemBase().restrictedRaces)
-            output += "     " + required.name() + newline;
-        output += "Required Classes:" + newline;
-        for(Enum.ClassType required : item.getItemBase().requiredClasses)
-            output += "     " + required.name() + newline;
-        output += "Restricted Classes:" + newline;
-        for(Enum.ClassType required : item.getItemBase().restrictedClasses)
-            output += "     " + required.name() + newline;
-        output += "Required Disciplines:" + newline;
-        for(Enum.DisciplineType required : item.getItemBase().requiredDiscs)
-            output += "     " + required.name() + newline;
-        output += "Restricted Disciplines:" + newline;
-        for(Enum.DisciplineType required : item.getItemBase().restrictedDiscs)
-            output += "     " + required.name() + newline;
-        throwbackInfo(pc, output);
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Gets information on an Object.";
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /iteminfo'";
-    }
-
-}

src/engine/devcmd/cmds/MakeBaneCmd.java

@@ -111,12 +111,12 @@ public class MakeBaneCmd extends AbstractDevCmd {
             return;
         }
 
-        if (!zone.guild_zone) {
+        if (!zone.isPlayerCity()) {
             throwbackError(pc, "This is not a player city.");
             return;
         }
 
-        City city = City.getCity(zone.playerCityUUID);
+        City city = City.getCity(zone.getPlayerCityUUID());
         if (city == null) {
             throwbackError(pc, "Unable to find the city associated with this zone.");
             return;
@@ -167,7 +167,7 @@ public class MakeBaneCmd extends AbstractDevCmd {
             return;
         }
         stone.addEffectBit((1 << 19));
-        BuildingManager.setRank(stone, (byte) rank);
+        stone.setRank((byte) rank);
         stone.setMaxHitPoints(blueprint.getMaxHealth(stone.getRank()));
         stone.setCurrentHitPoints(stone.getMaxHitPoints());
         BuildingManager.setUpgradeDateTime(stone, null, 0);

src/engine/devcmd/cmds/PrintEffectsCmd.java

@@ -1,67 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.devcmd.AbstractDevCmd;
-import engine.objects.*;
-
-import java.util.HashMap;
-
-/**
- *
- */
-
-public class PrintEffectsCmd extends AbstractDevCmd {
-
-    public PrintEffectsCmd() {
-        super("printeffects");
-        //		super("printstats", MBServerStatics.ACCESS_LEVEL_ADMIN);
-    }
-
-    public static ItemBase getWeaponBase(int slot, HashMap<Integer, MobEquipment> equip) {
-        if (equip.containsKey(slot)) {
-            MobEquipment item = equip.get(slot);
-            if (item != null && item.getItemBase() != null) {
-                return item.getItemBase();
-            }
-        }
-        return null;
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pc, String[] words,
-                          AbstractGameObject target) {
-
-        AbstractCharacter tar;
-
-        if (target != null && target instanceof AbstractCharacter) {
-            tar = (AbstractCharacter) target;
-
-            String newline = "\r\n ";
-            String output = "Effects For Character: " + tar.getName() + newline;
-
-            for(String effect : tar.effects.keySet()){
-                output += effect + newline;
-            }
-            throwbackInfo(pc, output);
-        }
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Returns the player's current stats";
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /printstats'";
-    }
-
-}

src/engine/devcmd/cmds/PrintRunesCmd.java

@@ -1,67 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.devcmd.cmds;
-
-import engine.devcmd.AbstractDevCmd;
-import engine.objects.*;
-
-import java.util.HashMap;
-
-/**
- *
- */
-
-public class PrintRunesCmd extends AbstractDevCmd {
-
-    public PrintRunesCmd() {
-        super("printrunes");
-        //		super("printstats", MBServerStatics.ACCESS_LEVEL_ADMIN);
-    }
-
-    public static ItemBase getWeaponBase(int slot, HashMap<Integer, MobEquipment> equip) {
-        if (equip.containsKey(slot)) {
-            MobEquipment item = equip.get(slot);
-            if (item != null && item.getItemBase() != null) {
-                return item.getItemBase();
-            }
-        }
-        return null;
-    }
-
-    @Override
-    protected void _doCmd(PlayerCharacter pc, String[] words,
-                          AbstractGameObject target) {
-
-        AbstractCharacter tar;
-
-        if (target != null && target instanceof AbstractCharacter) {
-            tar = (AbstractCharacter) target;
-
-            String newline = "\r\n ";
-            String output = "Applied Runes For Character: " + ((AbstractCharacter) target).getName() + newline;
-
-            for(CharacterRune rune : ((AbstractCharacter)target).runes){
-                output += rune.getRuneBaseID() + " " + rune.getRuneBase().getName() + newline;
-            }
-            throwbackInfo(pc, output);
-        }
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Returns the player's current stats";
-    }
-
-    @Override
-    protected String _getUsageString() {
-        return "' /printstats'";
-    }
-
-}

src/engine/devcmd/cmds/PrintStatsCmd.java

@@ -103,19 +103,15 @@ public class PrintStatsCmd extends AbstractDevCmd {
             main = getWeaponBase(1, equip);
         ItemBase off = null;
 
-        if(equip != null){
+        if (equip != null)
-           if(equip.get(2) != null && !equip.get(2).getItemBase().isShield()){
+            getWeaponBase(2, equip);
-                //off hand weapon
+        if (main == null && off == null) {
-                out += "Attack Rating: " + tar.atrHandTwo + newline;
+            out += "Main Hand: atr: " + tar.getAtrHandOne() + ", damage: " + tar.getMinDamageHandOne() + " to " + tar.getMaxDamageHandOne() + ", speed: " + tar.getSpeedHandOne() + ", range: 6" + newline;
-                out += "Damage: " + tar.minDamageHandTwo + " - " + tar.maxDamageHandTwo + newline;
+        } else {
-                out += "Range: " + tar.rangeHandTwo + newline;
+            if (main != null)
-               out += "Attack Speed: " + tar.speedHandTwo + newline;
+                out += "Main Hand: atr: " + tar.getAtrHandOne() + ", damage: " + tar.getMinDamageHandOne() + " to " + tar.getMaxDamageHandOne() + ", speed: " + tar.getSpeedHandOne() + ", range: " + main.getRange() + newline;
-            } else{
+            if (off != null)
-               out += "Attack Rating: " + tar.atrHandOne + newline;
+                out += "Main Hand: atr: " + tar.getAtrHandTwo() + ", damage: " + tar.getMinDamageHandTwo() + " to " + tar.getMaxDamageHandTwo() + ", speed: " + tar.getSpeedHandTwo() + ", range: " + off.getRange() + newline;
-               out += "Damage: " + tar.minDamageHandOne + " - " + tar.maxDamageHandOne + newline;
-               out += "Range: " + tar.rangeHandOne + newline;
-               out += "Attack Speed: " + tar.speedHandOne + newline;
-            }
         }
         out += "isAlive: " + tar.isAlive() + ", Combat: " + tar.isCombat() + newline;
 

src/engine/devcmd/cmds/PurgeObjectsCmd.java

@@ -42,7 +42,7 @@ public class PurgeObjectsCmd extends AbstractDevCmd {
 
     private static void PurgeWalls(Zone zone, PlayerCharacter pc) {
 
-        if (!zone.guild_zone)
+        if (!zone.isPlayerCity())
             return;
 
         for (Building building : zone.zoneBuildingSet) {
@@ -59,25 +59,22 @@ public class PurgeObjectsCmd extends AbstractDevCmd {
 
 
                 if (npc != null) {
-                    for (Integer minionUUID : npc.minions) {
+                    for (Mob mob : npc.getSiegeMinionMap().keySet()) {
-                        Mob mob = Mob.getMob(minionUUID);
                         WorldGrid.RemoveWorldObject(mob);
                         WorldGrid.removeObject(mob, pc);
-
+                        //Mob.getRespawnMap().remove(mob);
                         if (mob.getParentZone() != null)
                             mob.getParentZone().zoneMobSet.remove(mob);
                     }
-
                     DbManager.NPCQueries.DELETE_NPC(npc);
                     DbManager.removeFromCache(GameObjectType.NPC,
                             npc.getObjectUUID());
                     WorldGrid.RemoveWorldObject(npc);
                 } else if (mobA != null) {
-                    for (Integer minionUUID : mobA.minions) {
+                    for (Mob mob : mobA.getSiegeMinionMap().keySet()) {
-                        Mob mob = Mob.getMob(minionUUID);
                         WorldGrid.RemoveWorldObject(mob);
                         WorldGrid.removeObject(mob, pc);
-
+                        //Mob.getRespawnMap().remove(mob);
                         if (mob.getParentZone() != null)
                             mob.getParentZone().zoneMobSet.remove(mob);
                     }
@@ -154,11 +151,10 @@ public class PurgeObjectsCmd extends AbstractDevCmd {
 
 
             if (npc != null) {
-                for (Integer minionUUID : npc.minions) {
+                for (Mob mob : npc.getSiegeMinionMap().keySet()) {
-                    Mob mob = Mob.getMob(minionUUID);
                     WorldGrid.RemoveWorldObject(mob);
                     WorldGrid.removeObject(mob, pc);
-
+                    //Mob.getRespawnMap().remove(mob);
                     if (mob.getParentZone() != null)
                         mob.getParentZone().zoneMobSet.remove(mob);
                 }
@@ -167,11 +163,10 @@ public class PurgeObjectsCmd extends AbstractDevCmd {
                         npc.getObjectUUID());
                 WorldGrid.RemoveWorldObject(npc);
             } else if (mobA != null) {
-                for (Integer minionUUID : mobA.minions) {
+                for (Mob mob : mobA.getSiegeMinionMap().keySet()) {
-                    Mob mob = Mob.getMob(minionUUID);
                     WorldGrid.RemoveWorldObject(mob);
                     WorldGrid.removeObject(mob, pc);
-
+                    //Mob.getRespawnMap().remove(mob);
                     if (mob.getParentZone() != null)
                         mob.getParentZone().zoneMobSet.remove(mob);
                 }

src/engine/devcmd/cmds/RealmInfoCmd.java

@@ -60,12 +60,12 @@ public class RealmInfoCmd extends AbstractDevCmd {
         outString += ")";
         outString += newline;
 
-        outString += " Zone: " + serverZone.zoneName;
+        outString += " Zone: " + serverZone.getName();
 
         outString += newline;
 
-        if (serverZone.parent != null)
+        if (serverZone.getParent() != null)
-            outString += " Parent: " + serverZone.parent.zoneName;
+            outString += " Parent: " + serverZone.getParent().getName();
         else
             outString += "Parent: NONE";
 

src/engine/devcmd/cmds/RegionCmd.java

@@ -9,10 +9,9 @@
 
 package engine.devcmd.cmds;
 
-import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.BuildingManager;
+import engine.objects.AbstractGameObject;
-import engine.objects.*;
+import engine.objects.PlayerCharacter;
 
 import java.lang.reflect.Field;
 
@@ -26,28 +25,42 @@ public class RegionCmd extends AbstractDevCmd {
     protected void _doCmd(PlayerCharacter pc, String[] words,
                           AbstractGameObject target) {
 
-        String newline = "\r\n ";
-        String output;
-        output = "Target Region Information:" + newline;
 
-        Building building = BuildingManager.getBuildingAtLocation(((AbstractCharacter) target).loc);
+        if (pc.region == null) {
-        if(building == null){
-            this.throwbackInfo(pc, "No Building At This Location.") ;
-        }
-        Regions region = ((AbstractCharacter)target).region;
-        if (region == null) {
             this.throwbackInfo(pc, "No Region Found.");
             return;
         }
 
-        if(region != null) {
+
-            output += "Player Info: " + ((AbstractCharacter) target).getName() + newline;
+        String newLine = System.getProperty("line.separator");
-            output +=  "Region Building: " + building.getName() + newline;
+        String result = "";
-            output +=  "Region Height: " + region.lerpY((AbstractCharacter)target) + newline;
+        result += (pc.region.getClass().getSimpleName());
-            output +=  "is Stairs: " + region.isStairs() + newline;
+        result += (" {");
-            output += "is Outside: " + region.isOutside();
+        result += (newLine);
-            this.throwbackInfo(pc, output);
+        Field[] fields = pc.region.getClass().getDeclaredFields();
+
+        //print field names paired with their values
+        for (Field field : fields) {
+            field.setAccessible(true);
+            result += (" ");
+            try {
+
+                if (field.getName().contains("Furniture"))
+                    continue;
+                result += (field.getName());
+                result += (": ");
+                //requires access to private field:
+                result += (field.get(pc.region).toString());
+            } catch (IllegalAccessException ex) {
+                System.out.println(ex);
+            }
+            result.trim();
+            result += (newLine);
         }
+        result += ("}");
+
+        this.throwbackInfo(pc, result.toString());
+
 
     }
 

src/engine/devcmd/cmds/RemoveBaneCmd.java

@@ -34,12 +34,12 @@ public class RemoveBaneCmd extends AbstractDevCmd {
             return;
         }
 
-        if (!zone.guild_zone) {
+        if (!zone.isPlayerCity()) {
             throwbackError(pc, "This is not a player city.");
             return;
         }
 
-        City city = City.getCity(zone.playerCityUUID);
+        City city = City.getCity(zone.getPlayerCityUUID());
         if (city == null) {
             throwbackError(pc, "Unable to find the city associated with this zone.");
             return;

src/engine/devcmd/cmds/RemoveObjectCmd.java

@@ -11,9 +11,13 @@ package engine.devcmd.cmds;
 
 import engine.Enum.BuildingGroup;
 import engine.Enum.DbObjectType;
+import engine.Enum.GameObjectType;
 import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.*;
+import engine.gameManager.BuildingManager;
+import engine.gameManager.ChatManager;
+import engine.gameManager.DbManager;
+import engine.gameManager.ZoneManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
 
@@ -127,23 +131,56 @@ public class RemoveObjectCmd extends AbstractDevCmd {
             building.disableSpire(false);
 
         if ((building.getBlueprint() != null) && (building.getBlueprint().getBuildingGroup() == BuildingGroup.WAREHOUSE)) {
-            City city = City.getCity(building.getParentZone().playerCityUUID);
+            City city = City.getCity(building.getParentZone().getPlayerCityUUID());
             if (city != null) {
                 city.setWarehouseBuildingID(0);
             }
             Warehouse.warehouseByBuildingUUID.remove(building.getObjectUUID());
         }
 
+
         //remove cached shrines.
         if ((building.getBlueprintUUID() != 0)
                 && (building.getBlueprint().getBuildingGroup() == BuildingGroup.SHRINE))
             Shrine.RemoveShrineFromCacheByBuilding(building);
 
-        // Remove hirelings for this building
+        for (AbstractCharacter ac : building.getHirelings().keySet()) {
+            NPC npc = null;
+            Mob mobA = null;
 
-        for (AbstractCharacter abstractCharacter : building.getHirelings().keySet())
+            if (ac.getObjectType() == GameObjectType.NPC)
-            BuildingManager.removeHireling(building, abstractCharacter);
+                npc = (NPC) ac;
+            else if (ac.getObjectType() == GameObjectType.Mob)
+                mobA = (Mob) ac;
 
+            if (npc != null) {
+                for (Mob mob : npc.getSiegeMinionMap().keySet()) {
+                    WorldGrid.RemoveWorldObject(mob);
+                    WorldGrid.removeObject(mob, pc);
+                    //Mob.getRespawnMap().remove(mob);
+                    if (mob.getParentZone() != null)
+                        mob.getParentZone().zoneMobSet.remove(mob);
+                }
+                DbManager.NPCQueries.DELETE_NPC(npc);
+                DbManager.removeFromCache(npc);
+                WorldGrid.RemoveWorldObject(npc);
+                WorldGrid.removeObject(npc, pc);
+            } else if (mobA != null) {
+                for (Mob mob : mobA.getSiegeMinionMap().keySet()) {
+                    WorldGrid.RemoveWorldObject(mob);
+                    WorldGrid.removeObject(mob, pc);
+                    //Mob.getRespawnMap().remove(mob);
+                    if (mob.getParentZone() != null)
+                        mob.getParentZone().zoneMobSet.remove(mob);
+                }
+                DbManager.MobQueries.DELETE_MOB(mobA);
+                DbManager.removeFromCache(mobA);
+                WorldGrid.RemoveWorldObject(mobA);
+                WorldGrid.removeObject(mobA, pc);
+            }
+
+
+        }
         Zone zone = building.getParentZone();
         DbManager.BuildingQueries.DELETE_FROM_DATABASE(building);
         DbManager.removeFromCache(building);
@@ -172,13 +209,11 @@ public class RemoveObjectCmd extends AbstractDevCmd {
         if (npc.building != null)
             npc.building.getHirelings().remove(npc);
 
-        for (Integer minionUUID : npc.minions) {
+        for (Mob mob : npc.getSiegeMinionMap().keySet()) {
-            Mob minionMob = Mob.getMob(minionUUID);
+            WorldGrid.RemoveWorldObject(mob);
-            WorldGrid.RemoveWorldObject(minionMob);
+            WorldGrid.removeObject(mob, pc);
-            WorldGrid.removeObject(minionMob, pc);
+            if (mob.getParentZone() != null)
-
+                mob.getParentZone().zoneMobSet.remove(mob);
-            if (minionMob.getParentZone() != null)
-                minionMob.getParentZone().zoneMobSet.remove(minionMob);
         }
 
         DbManager.NPCQueries.DELETE_NPC(npc);

src/engine/devcmd/cmds/SetBaneActiveCmd.java

@@ -41,12 +41,12 @@ public class SetBaneActiveCmd extends AbstractDevCmd {
             return;
         }
 
-        if (!zone.guild_zone) {
+        if (!zone.isPlayerCity()) {
             throwbackError(pc, "This is not a player city.");
             return;
         }
 
-        City city = City.getCity(zone.playerCityUUID);
+        City city = City.getCity(zone.getPlayerCityUUID());
         if (city == null) {
             throwbackError(pc, "Unable to find the city associated with this zone.");
             return;

src/engine/devcmd/cmds/SetForceRenameCityCmd.java

@@ -31,9 +31,9 @@ public class SetForceRenameCityCmd extends AbstractDevCmd {
         if (zone == null)
             return;
         boolean rename = words[0].equalsIgnoreCase("true") ? true : false;
-        if (zone.playerCityUUID == 0)
+        if (zone.getPlayerCityUUID() == 0)
             return;
-        City city = City.getCity(zone.playerCityUUID);
+        City city = City.getCity(zone.getPlayerCityUUID());
         if (city == null)
             return;
         city.setForceRename(rename);

src/engine/devcmd/cmds/SetRankCmd.java

@@ -57,7 +57,7 @@ public class SetRankCmd extends AbstractDevCmd {
                     Blueprint blueprint = targetBuilding.getBlueprint();
 
                     if (blueprint == null) {
-                        BuildingManager.setRank(targetBuilding, targetRank);
+                        targetBuilding.setRank(targetRank);
                         ChatManager.chatSayInfo(player, "Building ranked without blueprint" + targetBuilding.getObjectUUID());
                         return;
                     }
@@ -68,8 +68,9 @@ public class SetRankCmd extends AbstractDevCmd {
                     }
 
                     // Set the current targetRank
+                    int lastMeshID = targetBuilding.getMeshUUID();
+                    targetBuilding.setRank(targetRank);
 
-                    BuildingManager.setRank(targetBuilding, targetRank);
                     ChatManager.chatSayInfo(player, "Rank set for building with ID " + targetBuilding.getObjectUUID() + " to rank " + targetRank);
                     break;
                 case NPC:
@@ -113,7 +114,7 @@ public class SetRankCmd extends AbstractDevCmd {
 
             // Set the current targetRank
             int lastMeshID = targetBuilding.getMeshUUID();
-            BuildingManager.setRank(targetBuilding, targetRank);
+            targetBuilding.setRank(targetRank);
 
             if (lastMeshID != targetBuilding.getMeshUUID())
                 targetBuilding.refresh(true);

src/engine/devcmd/cmds/SetSubRaceCmd.java

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

src/engine/devcmd/cmds/SlotNpcCmd.java

@@ -53,7 +53,7 @@ public class SlotNpcCmd extends AbstractDevCmd {
         if (stringIndex == -1)
             return false;
 
-        // Validate we have a correct building group name
+        // Validate we have a corrent building group name
 
         for (BuildingGroup group : BuildingGroup.values()) {
             if (group.name().equals(userInput[0].toUpperCase()))
@@ -114,7 +114,8 @@ public class SlotNpcCmd extends AbstractDevCmd {
 
                 if (!DbManager.ContractQueries.updateAllowedBuildings(contract, contract.getAllowedBuildings().toLong())) {
                     Logger.error("Failed to update Database for Contract Allowed buildings");
-                    ChatManager.chatSystemError(pc, "Failed to update Database for Contract Allowed buildings. ");
+                    ChatManager.chatSystemError(pc, "Failed to update Database for Contract Allowed buildings. " +
+                            "Contact A CCR, oh wait, you are a CCR. You're Fubared.");
                     return;
                 }
 
@@ -124,7 +125,8 @@ public class SlotNpcCmd extends AbstractDevCmd {
                 contract.getAllowedBuildings().remove(buildingGroup);
                 if (!DbManager.ContractQueries.updateAllowedBuildings(contract, contract.getAllowedBuildings().toLong())) {
                     Logger.error("Failed to update Database for Contract Allowed buildings");
-                    ChatManager.chatSystemError(pc, "Failed to update Database for Contract Allowed buildings. ");
+                    ChatManager.chatSystemError(pc, "Failed to update Database for Contract Allowed buildings. " +
+                            "Contact A CCR, oh wait, you are a CCR. You're Fubared.");
                     return;
                 }
 
@@ -136,14 +138,14 @@ public class SlotNpcCmd extends AbstractDevCmd {
 
     @Override
     protected String _getHelpString() {
-        return "Toggles a building group on a targeted npc";
+        return "Sets a building slot on a targeted npc";
     }
 
     // Class methods
 
     @Override
     protected String _getUsageString() {
-        String usage = "/npcslot [BuildingGroup] on-off \n";
+        String usage = "/npcslot [BuildingType] on-off \n";
 
         for (BuildingGroup group : BuildingGroup.values()) {
             usage += group.name() + ' ';

src/engine/devcmd/cmds/SplatMobCmd.java

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

src/engine/devcmd/cmds/SummonCmd.java

@@ -40,7 +40,7 @@ public class SummonCmd extends AbstractDevCmd {
                 Zone zone = ZoneManager.findSmallestZone(pc.getLoc());
                 String location = "Somewhere";
                 if (zone != null)
-                    location = zone.zoneName;
+                    location = zone.getName();
                 RecvSummonsRequestMsg rsrm = new RecvSummonsRequestMsg(pc.getObjectType().ordinal(), pc.getObjectUUID(), pc.getFirstName(),
                         location, false);
                 toSummon.getClientConnection().sendMsg(rsrm);

src/engine/devcmd/cmds/ZoneInfoCmd.java

@@ -73,41 +73,44 @@ public class ZoneInfoCmd extends AbstractDevCmd {
         output = "Target Information:" + newline;
         output += StringUtils.addWS("UUID: " + objectUUID, 20);
         output += newline;
-        output += "name: " + zone.zoneName;
+        output += "name: " + zone.getName();
         output += newline;
-        output += "loadNum: " + zone.templateID;
+        output += "loadNum: " + zone.getLoadNum();
-        if (zone.parent != null) {
+        if (zone.getParent() != null) {
-            output += StringUtils.addWS(", parent: " + zone.parent.getObjectUUID(), 30);
+            output += StringUtils.addWS(", parent: " + zone.getParent().getObjectUUID(), 30);
-            output += "Parentabs: x: " + zone.parent.absX + ", y: " + zone.parent.absY + ", z: " + zone.parent.absZ;
+            output += "Parentabs: x: " + zone.getParent().getAbsX() + ", y: " + zone.getParent().getAbsY() + ", z: " + zone.getParent().getAbsZ();
 
         } else
             output += StringUtils.addWS(", parent: none", 30);
         output += newline;
-        output += "absLoc: x: " + zone.absX + ", y: " + zone.absY + ", z: " + zone.absZ;
+        output += "absLoc: x: " + zone.getAbsX() + ", y: " + zone.getAbsY() + ", z: " + zone.getAbsZ();
         output += newline;
-        output += "offset: x: " + zone.xOffset + ", y: " + zone.yOffset + ", z: " + zone.zOffset;
+        output += "offset: x: " + zone.getXCoord() + ", y: " + zone.getYCoord() + ", z: " + zone.getZCoord();
         output += newline;
-        output += "radius: x: " + zone.bounds.getHalfExtents().x + ", z: " + zone.bounds.getHalfExtents().y;
+        output += "radius: x: " + zone.getBounds().getHalfExtents().x + ", z: " + zone.getBounds().getHalfExtents().y;
         output += newline;
 
-        if (zone.terrain != null) {
+        if (zone.getHeightMap() != null) {
-            output += "Terrain image: " + zone.template.terrain_image;
+            output += "HeightMap ID: " + zone.getHeightMap().getHeightMapID();
             output += newline;
-        }
+            output += "Bucket Width X : " + zone.getHeightMap().getBucketWidthX();
+            output += newline;
+            output += "Bucket Width Y : " + zone.getHeightMap().getBucketWidthY();
 
-        output += "radius: x: " + zone.bounds.getHalfExtents().x + ", z: " + zone.bounds.getHalfExtents().y;
+        }
+        output += "radius: x: " + zone.getBounds().getHalfExtents().x + ", z: " + zone.getBounds().getHalfExtents().y;
         output += newline;
         //		output += "minLvl = " + zone.getMinLvl() + " | maxLvl = " + zone.getMaxLvl();
         output += newline;
-        output += "Sea Level = " + zone.sea_level;
+        output += "Sea Level = " + zone.getSeaLevel();
         output += newline;
-        output += "World Altitude = " + zone.global_height;
+        output += "World Altitude = " + zone.getWorldAltitude();
         throwbackInfo(player, output);
 
         City city = ZoneManager.getCityAtLocation(player.getLoc());
 
         output += newline;
-        output += (city == null) ? "None" : city.getParent().zoneName;
+        output += (city == null) ? "None" : city.getParent().getName();
 
         if (city != null) {
 
@@ -120,14 +123,14 @@ public class ZoneInfoCmd extends AbstractDevCmd {
         } else {
             output = "children:";
 
-            ArrayList<Zone> nodes = zone.nodes;
+            ArrayList<Zone> nodes = zone.getNodes();
 
             if (nodes.isEmpty())
                 output += " none";
 
             for (Zone child : nodes) {
                 output += newline;
-                output += child.zoneName + " (" + child.templateID + ')';
+                output += child.getName() + " (" + child.getLoadNum() + ')';
             }
         }
         throwbackInfo(player, output);

src/engine/devcmd/cmds/ZoneSetCmd.java

@@ -40,7 +40,7 @@ public class ZoneSetCmd extends AbstractDevCmd {
 
         zone = ZoneManager.findSmallestZone(playerCharacter.getLoc());
 
-        throwbackInfo(playerCharacter, zone.zoneName + " (" + zone.templateID + ") " + zone.getObjectUUID());
+        throwbackInfo(playerCharacter, zone.getName() + " (" + zone.getLoadNum() + ") " + zone.getObjectUUID());
 
         // NPC
 

src/engine/devcmd/cmds/aiInfoCmd.java

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

src/engine/gameManager/BuildingManager.java

@@ -31,7 +31,6 @@ import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
 
 public enum BuildingManager {
@@ -41,9 +40,6 @@ public enum BuildingManager {
     public static HashMap<Integer, ArrayList<BuildingLocation>> _stuckLocations = new HashMap<>();
     public static HashMap<Integer, ArrayList<BuildingLocation>> _slotLocations = new HashMap<>();
 
-    public static HashMap<Integer, ConcurrentHashMap<Integer, BuildingFriends>> _buildingFriends = new HashMap<>();
-    public static HashMap<Integer, ConcurrentHashMap<Integer, Condemned>> _buildingCondemned = new HashMap<>();
-    public static HashMap<Integer, ArrayList<Vector3fImmutable>> _buildingPatrolPoints = new HashMap<>();
     public static int getAvailableSlot(Building building) {
 
         ArrayList<BuildingLocation> slotLocations = _slotLocations.get(building.meshUUID);
@@ -108,6 +104,7 @@ public enum BuildingManager {
         if (building == null)
             return false;
 
+
         if (building.getRank() == -1)
             return false;
 
@@ -115,25 +112,26 @@ public enum BuildingManager {
             return true;
 
         //individual friend.
-        if (building.getFriends() != null && building.getFriends().get(player.getObjectUUID()) != null)
+        if (building.getFriends().get(player.getObjectUUID()) != null)
             return true;
 
-        //Admins can access stuff
+        //Admin's can access stuff
 
         if (player.isCSR())
             return true;
 
         //Guild stuff
 
-        if (building.getGuild().isGuildLeader(player.getObjectUUID()))
+
+        if (building.getGuild() != null && building.getGuild().isGuildLeader(player.getObjectUUID()))
             return true;
 
         if (building.getFriends().get(player.getGuild().getObjectUUID()) != null
-                && building.getFriends().get(player.getGuild().getObjectUUID()).friendType == 8)
+                && building.getFriends().get(player.getGuild().getObjectUUID()).getFriendType() == 8)
             return true;
 
         if (building.getFriends().get(player.getGuild().getObjectUUID()) != null
-                && building.getFriends().get(player.getGuild().getObjectUUID()).friendType == 9
+                && building.getFriends().get(player.getGuild().getObjectUUID()).getFriendType() == 9
                 && GuildStatusController.isInnerCouncil(player.getGuildStatus()))
             return true;
 
@@ -234,15 +232,15 @@ public enum BuildingManager {
                         ChatManager.chatSystemInfo(player, "You can not carry any more of that item.");
                         return false;
                     }
-                    if (warehouse.resources.get(resourceBase) == null)
+                    if (warehouse.getResources().get(resourceBase) == null)
                         continue;
 
-                    int resourceAmount = warehouse.resources.get(resourceBase);
+                    int resourceAmount = warehouse.getResources().get(resourceBase);
 
                     if (resourceAmount <= 0)
                         continue;
 
-                    if (Warehouse.loot(warehouse, player, resourceBase, resourceAmount, true))
+                    if (warehouse.loot(player, resourceBase, resourceAmount, true))
                         ChatManager.chatInfoInfo(player, "You have looted " + resourceAmount + ' ' + resourceBase.getName());
                 }
                 break;
@@ -310,72 +308,6 @@ public enum BuildingManager {
 
     }
 
-    public static void removeHireling(Building building, AbstractCharacter hireling) {
-
-        if (hireling.getObjectType().equals(GameObjectType.Mob)) {
-
-            Mob guardCaptain = (Mob) hireling;
-
-            // Clear minions from database if a guard captain
-
-            if (guardCaptain.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN))
-                DbManager.MobQueries.REMOVE_ALL_MINIONS(hireling.getObjectUUID());
-        }
-
-        // Clear minions from world
-
-        for (Integer minionUUID : hireling.minions) {
-            Mob minionMob = Mob.getMob(minionUUID);
-            DbManager.removeFromCache(minionMob);
-            WorldGrid.RemoveWorldObject(minionMob);
-            WorldGrid.unloadObject(minionMob);
-
-            if (minionMob.getParentZone() != null)
-                minionMob.getParentZone().zoneMobSet.remove(minionMob);
-        }
-
-        // Remove hireling from building
-
-        building.getHirelings().remove(hireling);
-
-        // Remove from zone mob set
-
-        if (hireling.getObjectType().equals(GameObjectType.Mob)) {
-
-            Mob hirelingMob = (Mob) hireling;
-
-            if (hirelingMob.getParentZone() != null)
-                if (hirelingMob.getParentZone().zoneMobSet.contains(hirelingMob))
-                    hirelingMob.getParentZone().zoneMobSet.remove(hireling);
-
-        }
-
-        if (hireling.getObjectType().equals(GameObjectType.NPC)) {
-
-            NPC hirelingNPC = (NPC) hireling;
-
-            if (hirelingNPC.getParentZone() != null)
-                if (hirelingNPC.getParentZone().zoneNPCSet.contains(hirelingNPC))
-                    hirelingNPC.getParentZone().zoneNPCSet.remove(hireling);
-
-        }
-
-        // Unload hireling from world
-
-        DbManager.removeFromCache(hireling);
-        WorldGrid.RemoveWorldObject(hireling);
-        WorldGrid.removeObject(hireling);
-
-        // Delete hireling from database
-
-        if (hireling.getObjectType().equals(GameObjectType.Mob))
-            DbManager.MobQueries.DELETE_MOB((Mob) hireling);
-        else
-            DbManager.NPCQueries.DELETE_NPC((NPC) hireling);
-
-    }
-
-
     public static void cleanupHirelings(Building building) {
 
         // Early exit:  Cannot have hirelings in a building
@@ -388,18 +320,42 @@ public enum BuildingManager {
 
         if (building.getRank() < 1) {
 
-            for (AbstractCharacter slottedNPC : building.getHirelings().keySet())
+            for (AbstractCharacter slottedNPC : building.getHirelings().keySet()) {
-                BuildingManager.removeHireling(building, slottedNPC);
 
+                if (slottedNPC.getObjectType() == Enum.GameObjectType.NPC)
+                    ((NPC) slottedNPC).remove();
+                else if (slottedNPC.getObjectType() == Enum.GameObjectType.Mob)
+                    NPCManager.removeMobileFromBuilding(((Mob) slottedNPC), building);
+            }
             return;
         }
 
         // Delete hireling if building has deranked.
-
         for (AbstractCharacter hireling : building.getHirelings().keySet()) {
 
+            NPC npc = null;
+            Mob mob = null;
+
+            if (hireling.getObjectType() == Enum.GameObjectType.NPC)
+                npc = (NPC) hireling;
+            else if (hireling.getObjectType() == Enum.GameObjectType.Mob)
+                mob = (Mob) hireling;
+
             if (building.getHirelings().get(hireling) > building.getBlueprint().getSlotsForRank(building.getRank()))
-                BuildingManager.removeHireling(building, hireling);
+
+                if (npc != null) {
+                    if (!npc.remove())
+                        Logger.error("Failed to remove npc " + npc.getObjectUUID()
+                                + "from Building " + building.getObjectUUID());
+                    else
+                        building.getHirelings().remove(npc);
+                } else if (mob != null) {
+                    if (!NPCManager.removeMobileFromBuilding(mob, building))
+                        Logger.error("Failed to remove npc " + npc.getObjectUUID()
+                                + "from Building " + building.getObjectUUID());
+                    else
+                        building.getHirelings().remove(npc);
+                }
 
         }
 
@@ -496,18 +452,18 @@ public enum BuildingManager {
 
             Condemned condemn = building.getCondemned().get(player.getObjectUUID());
 
-            if (condemn != null && condemn.active)
+            if (condemn != null && condemn.isActive())
                 return true;
 
             if (player.getGuild() != null) {
 
                 Condemned guildCondemn = building.getCondemned().get(player.getGuild().getObjectUUID());
 
-                if (guildCondemn != null && guildCondemn.active)
+                if (guildCondemn != null && guildCondemn.isActive())
                     return true;
 
                 Condemned nationCondemn = building.getCondemned().get(player.getGuild().getNation().getObjectUUID());
-                return nationCondemn != null && nationCondemn.active && nationCondemn.friendType == Condemned.NATION;
+                return nationCondemn != null && nationCondemn.isActive() && nationCondemn.getFriendType() == Condemned.NATION;
             } else {
                 //TODO ADD ERRANT KOS CHECK
             }
@@ -515,18 +471,18 @@ public enum BuildingManager {
 
             Condemned condemn = building.getCondemned().get(player.getObjectUUID());
 
-            if (condemn != null && condemn.active)
+            if (condemn != null && condemn.isActive())
                 return false;
 
             if (player.getGuild() != null) {
 
                 Condemned guildCondemn = building.getCondemned().get(player.getGuild().getObjectUUID());
 
-                if (guildCondemn != null && guildCondemn.active)
+                if (guildCondemn != null && guildCondemn.isActive())
                     return false;
 
                 Condemned nationCondemn = building.getCondemned().get(player.getGuild().getNation().getObjectUUID());
-                return nationCondemn == null || !nationCondemn.active || nationCondemn.friendType != Condemned.NATION;
+                return nationCondemn == null || !nationCondemn.isActive() || nationCondemn.getFriendType() != Condemned.NATION;
             } else {
                 //TODO ADD ERRANT KOS CHECK
             }
@@ -545,7 +501,7 @@ public enum BuildingManager {
 
         NPC npc = null;
 
-        npc = NPC.createNPC(pirateName, NpcID.getObjectUUID(), NpcLoc, building.getGuild(), zone, (short) rank, building);
+        npc = NPC.createNPC(pirateName, NpcID.getObjectUUID(), NpcLoc, null, zone, (short) rank, building);
 
         if (npc == null)
             return false;
@@ -574,63 +530,41 @@ public enum BuildingManager {
         else
             rank = 10;
 
-        Mob mobile;
+        Mob mob;
         NPC npc;
 
         if (NPC.ISWallArcher(contract)) {
 
-            mobile = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, building, contract, pirateName, rank, Enum.AIAgentType.GUARDWALLARCHER);
+            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), true, zone, building, contract.getContractID(), pirateName, rank);
 
-            if (mobile == null)
+            if (mob == null)
                 return false;
 
-            // Configure AI and write new mobile to disk
+            mob.setLoc(mob.getLoc());
-
-            mobile.behaviourType = Enum.MobBehaviourType.GuardWallArcher;
-            mobile = DbManager.MobQueries.PERSIST(mobile);
-
-            // Spawn new mobile
-
-            mobile.setLoc(mobile.getLoc());
 
             return true;
         }
 
         if (NPC.ISGuardCaptain(contract.getContractID())) {
 
-            mobile = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, building, contract, pirateName, rank, Enum.AIAgentType.GUARDCAPTAIN);
+            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), true, zone, building, contract.getContractID(), pirateName, rank);
 
-            if (mobile == null)
+            if (mob == null)
                 return false;
 
-            // Configure AI and write new mobile to disk
+            mob.setLoc(mob.getLoc());
-
-            mobile.behaviourType = Enum.MobBehaviourType.GuardCaptain;
-            mobile = DbManager.MobQueries.PERSIST(mobile);
-
-            // Spawn new mobile
-
-            mobile.setLoc(mobile.getLoc());
 
             return true;
         }
-
         if (contract.getContractID() == 910) {
 
             //guard dog
-            mobile = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, building, contract, pirateName, rank, Enum.AIAgentType.GUARDCAPTAIN);
+            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), true, zone, building, contract.getContractID(), pirateName, rank);
 
-            if (mobile == null)
+            if (mob == null)
                 return false;
 
-            // Configure AI and write new mobile to disk
+            mob.setLoc(mob.getLoc());
-
-            mobile.behaviourType = Enum.MobBehaviourType.GuardCaptain;
-            mobile = DbManager.MobQueries.PERSIST(mobile);
-
-            // Spawn new mobile
-
-            mobile.setLoc(mobile.getLoc());
 
             return true;
         }
@@ -853,110 +787,4 @@ public enum BuildingManager {
         }
 
     }
-
-    public static void rebuildMine(Building mineBuilding) {
-        setRank(mineBuilding, 1);
-        mineBuilding.meshUUID = mineBuilding.getBlueprint().getMeshForRank(mineBuilding.rank);
-
-        // New rank mean new max hit points.
-
-        mineBuilding.healthMax = mineBuilding.getBlueprint().getMaxHealth(mineBuilding.rank);
-        mineBuilding.setCurrentHitPoints(mineBuilding.healthMax);
-        mineBuilding.getBounds().setBounds(mineBuilding);
-    }
-
-    public static void setRank(Building building, int rank) {
-
-        int newMeshUUID;
-        boolean success;
-
-
-        // If this building has no blueprint then set rank and exit immediatly.
-
-        if (building.blueprintUUID == 0 || building.getBlueprint() != null && building.getBlueprint().getBuildingGroup().equals(BuildingGroup.MINE)) {
-            building.rank = rank;
-            DbManager.BuildingQueries.CHANGE_RANK(building.getObjectUUID(), rank);
-            return;
-        }
-
-        // Delete any upgrade jobs before doing anything else.  It won't quite work
-        // if in a few lines we happen to delete this building.
-
-        JobContainer jc = building.getTimers().get("UPGRADE");
-
-        if (jc != null) {
-            if (!JobScheduler.getInstance().cancelScheduledJob(jc))
-                Logger.error("failed to cancel existing upgrade job.");
-        }
-
-        // Attempt write to database, or delete the building
-        // if we are destroying it.
-
-        if (rank == -1)
-            success = DbManager.BuildingQueries.DELETE_FROM_DATABASE(building);
-        else
-            success = DbManager.BuildingQueries.updateBuildingRank(building, rank);
-
-        if (success == false) {
-            Logger.error("Error writing to database UUID: " + building.getObjectUUID());
-            return;
-        }
-
-        building.isDeranking.compareAndSet(false, true);
-
-        // Change the building's rank
-
-        building.rank = rank;
-
-        // New rank means new mesh
-        newMeshUUID = building.getBlueprint().getMeshForRank(building.rank);
-
-        if ((building.getBlueprint().getBuildingGroup() == BuildingGroup.TOL)&& (building.rank == 8))
-            newMeshUUID = Realm.getRealmMesh(building.getCity());
-
-        building.meshUUID = newMeshUUID;
-
-        // New rank mean new max hitpoints.
-
-        building.healthMax = building.getBlueprint().getMaxHealth(building.rank);
-        building.setCurrentHitPoints(building.healthMax);
-
-        if (building.getUpgradeDateTime() != null)
-            setUpgradeDateTime(building, null, 0);
-
-        // If we destroyed this building make sure to turn off
-        // protection
-
-        if (building.rank == -1)
-            building.protectionState = Enum.ProtectionState.NONE;
-
-        // update object to clients
-
-        building.refresh(true);
-
-        if (building.getBounds() != null)
-            building.getBounds().setBounds(building);
-
-        // Cleanup hirelings resulting from rank change
-
-        cleanupHirelings(building);
-
-        building.isDeranking.compareAndSet(true, false);
-    }
-
-    public static Building getBuildingAtLocation(Vector3fImmutable loc) {
-
-        for (AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(loc, 64, MBServerStatics.MASK_BUILDING)) {
-            Building building = (Building) awo;
-
-            if (building == null)
-                continue;
-
-            if (Bounds.collide(loc, building.getBounds()))
-                return building;
-
-        }
-        return null;
-    }
-
 }

src/engine/gameManager/ChatManager.java

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

src/engine/gameManager/CombatManager.java

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

src/engine/gameManager/ConfigManager.java

@@ -30,7 +30,6 @@ public enum ConfigManager {
 
     MB_BIND_ADDR,
     MB_EXTERNAL_ADDR,
-
     // Database connection config
 
     MB_DATABASE_ADDRESS,
@@ -67,7 +66,6 @@ public enum ConfigManager {
     MB_WORLD_GREETING,
     MB_WORLD_KEYCLONE_MAX,
     MB_USE_RUINS,
-    MB_RULESET,
 
     // Mobile AI modifiers
     MB_AI_CAST_FREQUENCY,
@@ -136,6 +134,7 @@ public enum ConfigManager {
         File file = new File("mbbranch.sh");
 
         if (file.exists() && !file.isDirectory()) {
+
             String[] command = {"./mbbranch.sh"};
 
             try {

src/engine/gameManager/DbManager.java

@@ -22,7 +22,6 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.util.EnumMap;
-import java.util.EnumSet;
 import java.util.concurrent.ConcurrentHashMap;
 
 public enum DbManager {
@@ -71,6 +70,7 @@ public enum DbManager {
     public static final dbBlueprintHandler BlueprintQueries = new dbBlueprintHandler();
     public static final dbBoonHandler BoonQueries = new dbBoonHandler();
     public static final dbShrineHandler ShrineQueries = new dbShrineHandler();
+    public static final dbHeightMapHandler HeightMapQueries = new dbHeightMapHandler();
     public static final dbRunegateHandler RunegateQueries = new dbRunegateHandler();
 
     public static final dbPowerHandler PowerQueries = new dbPowerHandler();
@@ -267,40 +267,6 @@ public enum DbManager {
 
     }
 
-    public static <E extends java.lang.Enum<E>> EnumSet<E> parseEnumSet(String mysqlSet, Class<E> enumClass) {
-
-        // Create empty output set of the passed Enum class
-
-        EnumSet<E> enumSet = EnumSet.noneOf(enumClass);
-
-        // Early exit for empty sets
-
-        if (mysqlSet.isEmpty())
-            return enumSet;
-
-        // Split set string and trim each element
-
-        String[] elements = mysqlSet.split(";");
-
-        for (String element : elements) {
-
-            element = element.trim();
-
-            // Parse the element into an enum; add to the output set
-
-            try {
-                E enumConstant = java.lang.Enum.valueOf(enumClass, element);
-                enumSet.add(enumConstant);
-            } catch (Exception e) {
-                Logger.error(" Parse error: " + mysqlSet);
-            }
-        }
-
-        // Return the output set
-
-        return enumSet;
-    }
-
     public static void printCacheCount(PlayerCharacter pc) {
         ChatManager.chatSystemInfo(pc, "Cache Lists");
 
@@ -359,5 +325,4 @@ public enum DbManager {
 
         Logger.info("Database configured with " + connectionCount + " connections");
     }
-
 }

src/engine/gameManager/DevCmdManager.java

@@ -46,11 +46,9 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new GetZoneCmd());
         DevCmdManager.registerDevCmd(new ZoneSetCmd());
         DevCmdManager.registerDevCmd(new PrintBankCmd());
-        DevCmdManager.registerDevCmd(new PrintEffectsCmd());
         DevCmdManager.registerDevCmd(new PrintEquipCmd());
         DevCmdManager.registerDevCmd(new PrintInventoryCmd());
         DevCmdManager.registerDevCmd(new PrintVaultCmd());
-        DevCmdManager.registerDevCmd(new PrintRunesCmd());
         DevCmdManager.registerDevCmd(new PrintStatsCmd());
         DevCmdManager.registerDevCmd(new PrintSkillsCmd());
         DevCmdManager.registerDevCmd(new PrintPowersCmd());
@@ -58,7 +56,6 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new PrintResistsCmd());
         DevCmdManager.registerDevCmd(new PrintLocationCmd());
         DevCmdManager.registerDevCmd(new InfoCmd());
-        DevCmdManager.registerDevCmd(new ItemInfoCmd());
         DevCmdManager.registerDevCmd(new aiInfoCmd());
         DevCmdManager.registerDevCmd(new SimulateBootyCmd());
         DevCmdManager.registerDevCmd(new GetHeightCmd());
@@ -131,6 +128,7 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new SetForceRenameCityCmd());
         DevCmdManager.registerDevCmd(new GotoObj());
         DevCmdManager.registerDevCmd(new convertLoc());
+        DevCmdManager.registerDevCmd(new AuditHeightMapCmd());
         DevCmdManager.registerDevCmd(new UnloadFurnitureCmd());
         DevCmdManager.registerDevCmd(new SetNpcEquipSetCmd());
         DevCmdManager.registerDevCmd(new SetBuildingAltitudeCmd());
@@ -145,6 +143,7 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new ApplyBonusCmd());
         DevCmdManager.registerDevCmd(new AuditFailedItemsCmd());
         DevCmdManager.registerDevCmd(new SlotTestCmd());
+
     }
 
     private static void registerDevCmd(AbstractDevCmd cmd) {

src/engine/gameManager/GuildManager.java

@@ -200,13 +200,5 @@ public enum GuildManager {
 
         }
     }
-    public static Boolean meetsLoreRequirements(Guild guild, PlayerCharacter player){
-        Enum.GuildCharterType charter = guild.getGuildType();
-        if(charter.requiredClasses.contains(player.absPromotionClass))
-            if(charter.requiredRaces.contains(player.absRace))
-                if(charter.sexRequired.contains(player.absGender))
-                    return true;
 
-        return false;
-    }
 }

src/engine/gameManager/LootManager.java

@@ -86,7 +86,7 @@ public enum LootManager {
                 if(ib == null)
                     break;
                 if (ib.isDiscRune() || ib.getName().toLowerCase().contains("of the gods")) {
-                    ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + mob.getParentZone().zoneName + " has found the " + ib.getName() + ". Are you tough enough to take it?");
+                    ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + mob.getParentZone().getName() + " has found the " + ib.getName() + ". Are you tough enough to take it?");
                     chatMsg.setMessageType(10);
                     chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
                     DispatchMessage.dispatchMsgToAll(chatMsg);
@@ -330,8 +330,6 @@ public enum LootManager {
 
     public static void GenerateEquipmentDrop(Mob mob) {
 
-        if(mob.behaviourType.equals(Enum.MobBehaviourType.HamletGuard))
-            return; // safehold guards don't drop their equipment
         //do equipment here
         int dropCount = 0;
         if (mob.getEquip() != null)

src/engine/gameManager/MaintenanceManager.java

@@ -45,27 +45,22 @@ public enum MaintenanceManager {
         // Deduct upkeep and build list of buildings
         // which did not have funds available
 
-        try {
+        for (Building building : maintList) {
-            for (Building building : maintList)
+
-                if (chargeUpkeep(building) == false)
+            if (chargeUpkeep(building) == false)
-                    derankList.add(building);
+                derankList.add(building);
-        } catch (Exception e) {
-            Logger.error(e);
         }
         // Reset maintenance dates for these buildings
 
-        for (Building building : maintList)
+        for (Building building : maintList) {
             setMaintDateTime(building, LocalDateTime.now().plusDays(7));
 
+        }
         // Derak or destroy buildings that did not
         // have funds available.
 
-        try {
+        for (Building building : derankList)
-            for (Building building : derankList)
+            building.destroyOrDerank(null);
-                building.destroyOrDerank(null);
-        } catch (Exception e) {
-            Logger.error(e);
-        }
 
         Logger.info("Structures: " + buildingList.size() + " Maint: " + maintList.size() + " Derank: " + derankList.size());
     }
@@ -184,7 +179,7 @@ public enum MaintenanceManager {
         if ((overDraft > 0))
             if ((building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.SHRINE) == false) &&
                     (warehouse != null) && building.assetIsProtected() == true &&
-                    (warehouse.resources.get(ItemBase.GOLD_ITEM_BASE)) >= overDraft) {
+                    (warehouse.getResources().get(ItemBase.GOLD_ITEM_BASE)) >= overDraft) {
                 hasFunds = true;
             }
 
@@ -199,22 +194,22 @@ public enum MaintenanceManager {
                 hasResources = false;
             else {
 
-                resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580000));
+                resourceValue = warehouse.getResources().get(Warehouse.stoneIB);
 
                 if (resourceValue < 1500)
                     hasResources = false;
 
-                resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580004));
+                resourceValue = warehouse.getResources().get(Warehouse.lumberIB);
 
                 if (resourceValue < 1500)
                     hasResources = false;
 
-                resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580017));
+                resourceValue = warehouse.getResources().get(Warehouse.galvorIB);
 
                 if (resourceValue < 5)
                     hasResources = false;
 
-                resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580018));
+                resourceValue = warehouse.getResources().get(Warehouse.wormwoodIB);
 
                 if (resourceValue < 5)
                     hasResources = false;
@@ -247,11 +242,11 @@ public enum MaintenanceManager {
 
         if (overDraft > 0) {
 
-            resourceValue = warehouse.resources.get(ItemBase.getItemBase(7));
+            resourceValue = warehouse.getResources().get(Warehouse.goldIB);
 
             if (DbManager.WarehouseQueries.updateGold(warehouse, resourceValue - overDraft) == true) {
-                warehouse.resources.put(ItemBase.getItemBase(7), resourceValue - overDraft);
+                warehouse.getResources().put(Warehouse.goldIB, resourceValue - overDraft);
-                Warehouse.AddTransactionToWarehouse(warehouse, Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.GOLD, 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;
@@ -267,11 +262,11 @@ public enum MaintenanceManager {
 
         // Withdraw Stone
 
-        resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580000));
+        resourceValue = warehouse.getResources().get(Warehouse.stoneIB);
 
         if (DbManager.WarehouseQueries.updateStone(warehouse, resourceValue - 1500) == true) {
-            warehouse.resources.put(ItemBase.getItemBase(1580000), resourceValue - 1500);
+            warehouse.getResources().put(Warehouse.stoneIB, resourceValue - 1500);
-            Warehouse.AddTransactionToWarehouse(warehouse, Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.STONE, 1500);
+            warehouse.AddTransactionToWarehouse(Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.STONE, 1500);
         } else {
             Logger.error("stone update failed for warehouse of UUID:" + warehouse.getObjectUUID());
             return true;
@@ -279,11 +274,11 @@ public enum MaintenanceManager {
 
         // Withdraw Lumber
 
-        resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580004));
+        resourceValue = warehouse.getResources().get(Warehouse.lumberIB);
 
         if (DbManager.WarehouseQueries.updateLumber(warehouse, resourceValue - 1500) == true) {
-            warehouse.resources.put(ItemBase.getItemBase(1580004), resourceValue - 1500);
+            warehouse.getResources().put(Warehouse.lumberIB, resourceValue - 1500);
-            Warehouse.AddTransactionToWarehouse(warehouse, Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.LUMBER, 1500);
+            warehouse.AddTransactionToWarehouse(Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.LUMBER, 1500);
         } else {
             Logger.error("lumber update failed for warehouse of UUID:" + warehouse.getObjectUUID());
             return true;
@@ -291,21 +286,21 @@ public enum MaintenanceManager {
 
         // Withdraw Galvor
 
-        resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580017));
+        resourceValue = warehouse.getResources().get(Warehouse.galvorIB);
 
         if (DbManager.WarehouseQueries.updateGalvor(warehouse, resourceValue - 5) == true) {
-            warehouse.resources.put(ItemBase.getItemBase(1580017), resourceValue - 5);
+            warehouse.getResources().put(Warehouse.galvorIB, resourceValue - 5);
-            Warehouse.AddTransactionToWarehouse(warehouse, Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.GALVOR, 5);
+            warehouse.AddTransactionToWarehouse(Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.GALVOR, 5);
         } else {
             Logger.error("galvor update failed for warehouse of UUID:" + warehouse.getObjectUUID());
             return true;
         }
 
-        resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580018));
+        resourceValue = warehouse.getResources().get(Warehouse.wormwoodIB);
 
         if (DbManager.WarehouseQueries.updateWormwood(warehouse, resourceValue - 5) == true) {
-            warehouse.resources.put(ItemBase.getItemBase(1580018), resourceValue - 5);
+            warehouse.getResources().put(Warehouse.wormwoodIB, resourceValue - 5);
-            Warehouse.AddTransactionToWarehouse(warehouse, Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.WORMWOOD, 5);
+            warehouse.AddTransactionToWarehouse(Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.WORMWOOD, 5);
         } else {
             Logger.error("wyrmwood update failed for warehouse of UUID:" + warehouse.getObjectUUID());
         }

src/engine/gameManager/MovementManager.java

@@ -116,8 +116,8 @@ public enum MovementManager {
 
         // if inside a building, convert both locations from the building local reference frame to the world reference frame
 
-        if (msg.getInBuildingUUID() > 0) {
+        if (msg.getTargetID() > 0) {
-            Building building = BuildingManager.getBuildingFromCache(msg.getInBuildingUUID());
+            Building building = BuildingManager.getBuildingFromCache(msg.getTargetID());
             if (building != null) {
 
                 Vector3fImmutable convertLocEnd = new Vector3fImmutable(ZoneManager.convertLocalToWorld(building, endLocation));
@@ -128,8 +128,8 @@ public enum MovementManager {
                 //                }
                 //                else {
                 toMove.setInBuilding(msg.getInBuilding());
-                toMove.setInFloorID(msg.getInBuildingFloor());
+                toMove.setInFloorID(msg.getUnknown01());
-                toMove.setInBuildingID(msg.getInBuildingUUID());
+                toMove.setInBuildingID(msg.getTargetID());
                 msg.setStartCoord(ZoneManager.convertWorldToLocal(building, toMove.getLoc()));
 
                 if (toMove.getObjectType() == GameObjectType.PlayerCharacter) {
@@ -174,9 +174,9 @@ public enum MovementManager {
                 msg.setStartCoord(ZoneManager.convertWorldToLocal(Regions.GetBuildingForRegion(toMove.region), toMove.getLoc()));
                 msg.setEndCoord(ZoneManager.convertWorldToLocal(regionBuilding, endLocation));
                 msg.setInBuilding(toMove.region.level);
-                msg.setInBuildingFloor(toMove.region.room);
+                msg.setUnknown01(toMove.region.room);
-                msg.setStartLocType(GameObjectType.Building.ordinal());
+                msg.setTargetType(GameObjectType.Building.ordinal());
-                msg.setInBuildingUUID(regionBuilding.getObjectUUID());
+                msg.setTargetID(regionBuilding.getObjectUUID());
             }
 
         } else {
@@ -185,8 +185,8 @@ public enum MovementManager {
             toMove.setInBuilding(-1);
             msg.setStartCoord(toMove.getLoc());
             msg.setEndCoord(endLocation);
-            msg.setStartLocType(0);
+            msg.setTargetType(0);
-            msg.setInBuildingUUID(0);
+            msg.setTargetID(0);
         }
 
         //checks sync between character and server, if out of sync, teleport player to original position and return.
@@ -233,7 +233,7 @@ public enum MovementManager {
         toMove.cancelOnMove();
 
         //cancel any attacks for manual move.
-        if ((toMove.getObjectType() == GameObjectType.PlayerCharacter) && msg.getInitiatedFromAttack() == 0)
+        if ((toMove.getObjectType() == GameObjectType.PlayerCharacter) && msg.getUnknown02() == 0)
             toMove.setCombatTarget(null);
 
 
@@ -267,7 +267,7 @@ public enum MovementManager {
         Zone serverZone = null;
 
         serverZone = ZoneManager.findSmallestZone(player.getLoc());
-        cityObject = (City) DbManager.getFromCache(GameObjectType.City, serverZone.playerCityUUID);
+        cityObject = (City) DbManager.getFromCache(GameObjectType.City, serverZone.getPlayerCityUUID());
 
         // Do not send group messages if player is on grid
 
@@ -464,20 +464,34 @@ public enum MovementManager {
         }
     }
 
-    public static void translocate(AbstractCharacter teleporter, Vector3fImmutable targetLoc) {
+    public static void translocate(AbstractCharacter teleporter, Vector3fImmutable targetLoc, Regions region) {
 
 
         if (targetLoc == null)
             return;
-        teleporter.stopMovement(targetLoc);
+
         Vector3fImmutable oldLoc = new Vector3fImmutable(teleporter.getLoc());
-        teleporter.setLoc(targetLoc);
+
+        teleporter.stopMovement(targetLoc);
+        teleporter.setRegion(region);
+
+        //mobs ignore region sets for now.
+        if (teleporter.getObjectType().equals(GameObjectType.Mob)) {
+            teleporter.setInBuildingID(0);
+            teleporter.setInBuilding(-1);
+            teleporter.setInFloorID(-1);
+            TeleportToPointMsg msg = new TeleportToPointMsg(teleporter, targetLoc.getX(), targetLoc.getY(), targetLoc.getZ(), 0, -1, -1);
+            DispatchMessage.dispatchMsgToInterestArea(oldLoc, teleporter, msg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, false, false);
+            return;
+        }
+        TeleportToPointMsg msg = new TeleportToPointMsg(teleporter, targetLoc.getX(), targetLoc.getY(), targetLoc.getZ(), 0, -1, -1);
+        //we shouldnt need to send teleport message to new area, as loadjob should pick it up.
+        //	DispatchMessage.dispatchMsgToInterestArea(teleporter, msg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
+        DispatchMessage.dispatchMsgToInterestArea(oldLoc, teleporter, msg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
+
         if (teleporter.getObjectType().equals(GameObjectType.PlayerCharacter))
             InterestManager.INTERESTMANAGER.HandleLoadForTeleport((PlayerCharacter) teleporter);
 
-        TeleportToPointMsg msg = new TeleportToPointMsg(teleporter, teleporter.loc.getX(), teleporter.loc.getY(), teleporter.loc.getZ(), 0, -1, -1);
-        DispatchMessage.dispatchMsgToInterestArea(oldLoc, teleporter, msg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
-
     }
 
     private static void syncLoc(AbstractCharacter ac, Vector3fImmutable clientLoc, boolean useClientLoc) {

src/engine/gameManager/NPCManager.java

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

src/engine/gameManager/PowersManager.java

@@ -9,7 +9,7 @@
 package engine.gameManager;
 
 import engine.Enum.*;
-import engine.InterestManagement.Terrain;
+import engine.InterestManagement.HeightMap;
 import engine.InterestManagement.WorldGrid;
 import engine.db.handlers.dbEffectsBaseHandler;
 import engine.db.handlers.dbPowerHandler;
@@ -53,10 +53,13 @@ public enum PowersManager {
     public static HashMap<Integer, AbstractPowerAction> powerActionsByID = new HashMap<>();
     public static HashMap<String, Integer> ActionTokenByIDString = new HashMap<>();
     public static HashMap<String, Integer> AnimationOverrides = new HashMap<>();
-    public static HashMap<Integer, ArrayList<RunePowerEntry>> _allRunePowers;
+    public static HashMap<Integer, ArrayList<MobPowerEntry>> AllMobPowers;
-    public static HashMap<Integer, ArrayList<RuneSkillAdjustEntry>> _allRuneSkillAdjusts;
     private static JobScheduler js;
 
+    private PowersManager() {
+
+    }
+
     public static void initPowersManager(boolean fullPowersLoad) {
 
         if (fullPowersLoad)
@@ -100,16 +103,6 @@ public enum PowersManager {
         }
     }
 
-    public static ArrayList<RunePowerEntry> getPowersForRune(int rune_id) {
-
-        ArrayList<RunePowerEntry> powerEntries = PowersManager._allRunePowers.get(rune_id);
-
-        if (powerEntries == null)
-            powerEntries = new ArrayList<>();
-
-        return powerEntries;
-    }
-
     // This pre-loads all powers and effects
     public static void InitializePowers() {
 
@@ -170,19 +163,6 @@ public enum PowersManager {
     public static void usePower(final PerformActionMsg msg, ClientConnection origin,
                                 boolean sendCastToSelf) {
 
-        if(ConfigManager.MB_RULESET.getValue() == "LORE") {
-            PowersBase pb = PowersManager.powersBaseByToken.get(msg.getPowerUsedID());
-            PlayerCharacter caster = origin.getPlayerCharacter();
-            PlayerCharacter target = PlayerCharacter.getFromCache(msg.getTargetID());
-            if(pb != null && pb.isHarmful == false) {
-                if (caster.guild.equals(Guild.getErrantGuild()))
-                    return;
-
-                if (target != null && caster.guild.getGuildType().equals(target.guild.getGuildType()) == false)
-                    return;
-            }
-        }
-
         if (usePowerA(msg, origin, sendCastToSelf)) {
             // Cast failed for some reason, reset timer
 
@@ -859,6 +839,8 @@ public enum PowersManager {
             return;
         }
 
+        playerCharacter.setHateValue(pb.getHateValue(trains));
+
         //Send Cast Message.
 //		PerformActionMsg castMsg = new PerformActionMsg(msg);
 //		castMsg.setNumTrains(9999);
@@ -909,6 +891,8 @@ public enum PowersManager {
             //Power is aiding a target, handle aggro if combat target is a Mob.
             if (!pb.isHarmful() && target.getObjectType() == GameObjectType.PlayerCharacter) {
                 PlayerCharacter pcTarget = (PlayerCharacter) target;
+                if (!pb.isHarmful())
+                    Mob.HandleAssistedAggro(playerCharacter, pcTarget);
             }
 
             // update target of used power timer
@@ -1271,13 +1255,7 @@ public enum PowersManager {
 
             return;
         }
-        if(ConfigManager.MB_RULESET.getValue() == "LORE") {
+
-            if (pc.guild.getGuildType().equals(target.guild.getGuildType()) == false) {
-                ChatManager.chatInfoError(pc,
-                        "Cannot summon player outside your charter.");
-                return;
-            }
-        }
         PerformActionMsg pam = new PerformActionMsg(msg.getPowerToken(), msg
                 .getTrains(), msg.getSourceType(), msg.getSourceID(), target
                 .getObjectType().ordinal(), target.getObjectUUID(), 0f, 0f, 0f, 1, 0);
@@ -1791,7 +1769,7 @@ public enum PowersManager {
                 } else {
                     targetLoc = tl;
                     try {
-                        targetLoc = targetLoc.setY(Terrain.getWorldHeight(targetLoc)); //on ground
+                        targetLoc = targetLoc.setY(HeightMap.getWorldHeight(targetLoc)); //on ground
                     } catch (Exception e) {
                         Logger.error(e);
                         targetLoc = tl;
@@ -1993,7 +1971,7 @@ public enum PowersManager {
                 } else {
                     targetLoc = tl;
                     try {
-                        targetLoc = targetLoc.setY(Terrain.getWorldHeight(targetLoc)); //on ground
+                        targetLoc = targetLoc.setY(HeightMap.getWorldHeight(targetLoc)); //on ground
                     } catch (Exception e) {
                         Logger.error(e);
                     }

src/engine/gameManager/ZoneManager.java

@@ -9,7 +9,8 @@
 package engine.gameManager;
 
 import engine.Enum;
-import engine.InterestManagement.Terrain;
+import engine.db.archive.CityRecord;
+import engine.db.archive.DataWarehouse;
 import engine.math.Bounds;
 import engine.math.Vector2f;
 import engine.math.Vector3f;
@@ -17,7 +18,6 @@ import engine.math.Vector3fImmutable;
 import engine.objects.Building;
 import engine.objects.City;
 import engine.objects.Zone;
-import engine.objects.ZoneTemplate;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
@@ -36,8 +36,6 @@ public enum ZoneManager {
 
     ZONEMANAGER;
 
-    public static HashMap<Integer, ZoneTemplate> _zone_templates = new HashMap<>();
-
     public static final Set<Zone> macroZones = Collections.newSetFromMap(new ConcurrentHashMap<>());
     private static final ConcurrentHashMap<Integer, Zone> zonesByID = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD);
     private static final ConcurrentHashMap<Integer, Zone> zonesByUUID = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD);
@@ -47,9 +45,9 @@ public enum ZoneManager {
     public static Instant hotZoneLastUpdate;
     public static Zone hotZone = null;
     public static int hotZoneCycle = 0;  // Used with HOTZONE_DURATION from config.
-
+    public static HashMap<Integer, Vector2f> _zone_size_data = new HashMap<>();
     /* Instance variables */
-    public static Zone seaFloor = null;
+    private static Zone seaFloor = null;
 
     // Find all zones coordinates fit into, starting with Sea Floor
 
@@ -62,8 +60,8 @@ public enum ZoneManager {
 
         if (zone != null) {
             allIn.add(zone);
-            while (zone.parent != null) {
+            while (zone.getParent() != null) {
-                zone = zone.parent;
+                zone = zone.getParent();
                 allIn.add(zone);
             }
         }
@@ -72,7 +70,7 @@ public enum ZoneManager {
 
     // Find smallest zone coordinates fit into.
 
-    public static Zone findSmallestZone(final Vector3fImmutable loc) {
+    public static final Zone findSmallestZone(final Vector3fImmutable loc) {
 
         Zone zone = ZoneManager.seaFloor;
 
@@ -85,13 +83,13 @@ public enum ZoneManager {
 
             childFound = false;
 
-            ArrayList<Zone> nodes = zone.nodes;
+            ArrayList<Zone> nodes = zone.getNodes();
 
             // Logger.info("soze", "" + nodes.size());
             if (nodes != null)
                 for (Zone child : nodes) {
 
-                    if (Bounds.collide(loc, child.bounds)) {
+                    if (Bounds.collide(loc, child.getBounds()) == true) {
                         zone = child;
                         childFound = true;
                         break;
@@ -101,6 +99,16 @@ public enum ZoneManager {
         return zone;
     }
 
+    public static void addZone(final int zoneID, final Zone zone) {
+
+        ZoneManager.zonesByID.put(zoneID, zone);
+
+        ZoneManager.zonesByUUID.put(zone.getObjectUUID(), zone);
+
+        ZoneManager.zonesByName.put(zone.getName().toLowerCase(), zone);
+
+    }
+
     // Returns the number of available hotZones
     // remaining in this cycle (1am)
 
@@ -121,8 +129,8 @@ public enum ZoneManager {
     public static void resetHotZones() {
 
         for (Zone zone : ZoneManager.macroZones)
-            if (zone.wasHotzonw)
+            if (zone.hasBeenHotzone)
-                zone.wasHotzonw = false;
+                zone.hasBeenHotzone = false;
 
     }
 
@@ -139,18 +147,18 @@ public enum ZoneManager {
         return ZoneManager.zonesByName.get(zoneName);
     }
 
-    public static Collection<Zone> getAllZones() {
+    public static final Collection<Zone> getAllZones() {
         return ZoneManager.zonesByUUID.values();
     }
 
-    public static void setHotZone(final Zone zone) {
+    public static final void setHotZone(final Zone zone) {
 
         if (!zone.isMacroZone())
             return;
 
         ZoneManager.hotZone = zone;
         ZoneManager.hotZoneCycle = 1;  // Used with HOTZONE_DURATION from config.
-        zone.wasHotzonw = true;
+        zone.hasBeenHotzone = true;
         ZoneManager.hotZoneLastUpdate = LocalDateTime.now().withMinute(0).withSecond(0).atZone(ZoneId.systemDefault()).toInstant();
 
     }
@@ -160,32 +168,37 @@ public enum ZoneManager {
         if (ZoneManager.hotZone == null)
             return false;
 
-        return (Bounds.collide(loc, ZoneManager.hotZone.bounds));
+        return (Bounds.collide(loc, ZoneManager.hotZone.getBounds()) == true);
     }
 
-    public static void populateZoneCollections(final Zone zone) {
+    public static Zone getSeaFloor() {
+        return ZoneManager.seaFloor;
+    }
+
+    public static void setSeaFloor(final Zone value) {
+        ZoneManager.seaFloor = value;
+    }
+
+    public static final void populateWorldZones(final Zone zone) {
+
+        int loadNum = zone.getLoadNum();
 
         // Zones are added to separate
         // collections for quick access
         // based upon their type.
 
-        ZoneManager.zonesByID.put(zone.templateID, zone);
-
-        ZoneManager.zonesByUUID.put(zone.getObjectUUID(), zone);
-
-        ZoneManager.zonesByName.put(zone.zoneName.toLowerCase(), zone);
-
         if (zone.isMacroZone()) {
             addMacroZone(zone);
             return;
         }
 
-        if (zone.guild_zone) {
+
-            ZoneManager.playerCityZones.add(zone);
+        if (zone.isPlayerCity()) {
+            addPlayerCityZone(zone);
             return;
         }
 
-        if (zone.isNPCCity)
+        if (zone.isNPCCity())
             addNPCCityZone(zone);
 
     }
@@ -195,10 +208,15 @@ public enum ZoneManager {
     }
 
     private static void addNPCCityZone(final Zone zone) {
-        zone.isNPCCity = true;
+        zone.setNPCCity(true);
         ZoneManager.npcCityZones.add(zone);
     }
 
+    public static final void addPlayerCityZone(final Zone zone) {
+        zone.setPlayerCity(true);
+        ZoneManager.playerCityZones.add(zone);
+    }
+
     public static final void generateAndSetRandomHotzone() {
 
         Zone hotZone;
@@ -231,23 +249,23 @@ public enum ZoneManager {
 
     public static final boolean validHotZone(Zone zone) {
 
-        if (zone.peace_zone == (byte) 1)
+        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;
 
-        if (zone.nodes.isEmpty())
-            return false;
-
         //no duplicate hotZones
 
-        if (zone.wasHotzonw == true)
+        if (zone.hasBeenHotzone == true)
             return false;
 
         // Enforce min level
 
-        if (zone.min_level < Integer.parseInt(ConfigManager.MB_HOTZONE_MIN_LEVEL.getValue()))
+        if (zone.minLvl < Integer.parseInt(ConfigManager.MB_HOTZONE_MIN_LEVEL.getValue()))
             return false;
 
         if (ZoneManager.hotZone != null)
@@ -259,50 +277,55 @@ public enum ZoneManager {
     // Converts world coordinates to coordinates local to a given zone.
 
     public static Vector3fImmutable worldToLocal(Vector3fImmutable worldVector,
-                                                 Zone zone) {
+                                                 Zone serverZone) {
 
         Vector3fImmutable localCoords;
 
-        localCoords = new Vector3fImmutable(worldVector.x - zone.absX,
+        localCoords = new Vector3fImmutable(worldVector.x - serverZone.absX,
-                worldVector.y - zone.absY, worldVector.z
+                worldVector.y - serverZone.absY, worldVector.z
-                - zone.absZ);
+                - serverZone.absZ);
 
         return localCoords;
     }
 
-    public static Vector2f worldToZoneOffset(Vector3fImmutable worldLoc,
+    public static Vector2f worldToZoneSpace(Vector3fImmutable worldVector,
-                                             Zone zone) {
+                                            Zone serverZone) {
-
-        Vector2f zoneLoc;
-
-        zoneLoc = new Vector2f(worldLoc.x, worldLoc.z).subtract(zone.getLoc().x, zone.getLoc().z);
-        zoneLoc.y *= -1;
-
-        return zoneLoc;
-
-    }
-
-    public static Vector2f worldToTerrainSpace(Vector3fImmutable worldLoc,
-                                               Zone zone) {
 
         Vector2f localCoords;
         Vector2f zoneOrigin;
 
         // Top left corner of zone is calculated in world space by the center and it's extents.
 
-        zoneOrigin = new Vector2f(zone.getLoc().x, zone.getLoc().z);
+        zoneOrigin = new Vector2f(serverZone.getLoc().x, serverZone.getLoc().z);
-        zoneOrigin = zoneOrigin.subtract(new Vector2f(zone.bounds.getHalfExtents().x, zone.bounds.getHalfExtents().y));
+        zoneOrigin = zoneOrigin.subtract(new Vector2f(serverZone.getBounds().getHalfExtents().x, serverZone.getBounds().getHalfExtents().y));
 
         // Local coordinate in world space translated to an offset from the calculated zone origin.
 
-        localCoords = new Vector2f(worldLoc.x, worldLoc.z);
+        localCoords = new Vector2f(worldVector.x, worldVector.z);
         localCoords = localCoords.subtract(zoneOrigin);
 
+        localCoords.setY((serverZone.getBounds().getHalfExtents().y * 2) - localCoords.y);
+
+
+        // TODO : Make sure this value does not go outside the zone's bounds.
+
         return localCoords;
     }
 
     // Converts local zone coordinates to world coordinates
 
+    public static Vector3fImmutable localToWorld(Vector3fImmutable worldVector,
+                                                 Zone serverZone) {
+
+        Vector3fImmutable worldCoords;
+
+        worldCoords = new Vector3fImmutable(worldVector.x + serverZone.absX,
+                worldVector.y + serverZone.absY, worldVector.z
+                + serverZone.absZ);
+
+        return worldCoords;
+    }
+
 
     /**
      * Converts from local (relative to this building) to world.
@@ -318,10 +341,9 @@ public enum ZoneManager {
         if (building.getBounds().getQuaternion() == null)
             return building.getLoc();
 
-        // handle building rotation
-
         Vector3fImmutable rotatedLocal = Vector3fImmutable.rotateAroundPoint(Vector3fImmutable.ZERO, localPos, building.getBounds().getQuaternion());
 
+        // handle building rotation
         // handle building translation
 
         return building.getLoc().add(rotatedLocal.x, rotatedLocal.y, rotatedLocal.z);
@@ -331,10 +353,12 @@ public enum ZoneManager {
     //used for regions, Building bounds not set yet.
     public static Vector3f convertLocalToWorld(Building building, Vector3f localPos, Bounds bounds) {
 
-        // handle building rotation
+        // convert from SB rotation value to radians
+
 
         Vector3f rotatedLocal = Vector3f.rotateAroundPoint(Vector3f.ZERO, localPos, bounds.getQuaternion());
 
+        // handle building rotation
         // handle building translation
 
         return new Vector3f(building.getLoc().add(rotatedLocal.x, rotatedLocal.y, rotatedLocal.z));
@@ -357,11 +381,13 @@ public enum ZoneManager {
     public static City getCityAtLocation(Vector3fImmutable worldLoc) {
 
         Zone currentZone;
+        ArrayList<Zone> zoneList;
+        City city;
 
         currentZone = ZoneManager.findSmallestZone(worldLoc);
 
-        if (currentZone.guild_zone)
+        if (currentZone.isPlayerCity())
-            return City.getCity(currentZone.playerCityUUID);
+            return City.getCity(currentZone.getPlayerCityUUID());
 
         return null;
     }
@@ -384,16 +410,16 @@ public enum ZoneManager {
 
 
         treeBounds = Bounds.borrow();
-        treeBounds.setBounds(new Vector2f(positionX, positionZ), new Vector2f(Enum.CityBoundsType.PLACEMENT.halfExtents, Enum.CityBoundsType.PLACEMENT.halfExtents), 0.0f);
+        treeBounds.setBounds(new Vector2f(positionX, positionZ), new Vector2f(Enum.CityBoundsType.PLACEMENT.extents, Enum.CityBoundsType.PLACEMENT.extents), 0.0f);
 
-        zoneList = currentZone.nodes;
+        zoneList = currentZone.getNodes();
 
         for (Zone zone : zoneList) {
 
             if (zone.isContinent())
                 continue;
 
-            if (Bounds.collide(treeBounds, zone.bounds, 0.0f))
+            if (Bounds.collide(treeBounds, zone.getBounds(), 0.0f))
                 validLocation = false;
         }
 
@@ -401,36 +427,30 @@ public enum ZoneManager {
         return validLocation;
     }
 
-    public static float calculateGlobalZoneHeight(Zone zone) {
+    public static void loadCities(Zone zone) {
 
-        float worldAltitude = MBServerStatics.SEA_FLOOR_ALTITUDE;
+        ArrayList<City> cities = DbManager.CityQueries.GET_CITIES_BY_ZONE(zone.getObjectUUID());
 
-        // Seafloor
+        for (City city : cities) {
 
-        if (ZoneManager.seaFloor.equals(zone))
+            city.setParent(zone);
-            return worldAltitude;
+            city.setObjectTypeMask(MBServerStatics.MASK_CITY);
+            city.setLoc(city.getLoc()); // huh?
 
-        // Children of seafloor
+//not player city, must be npc city..
 
-        if (ZoneManager.seaFloor.equals(zone.parent))
+            if (!zone.isPlayerCity())
-            return worldAltitude + zone.yOffset;
+                zone.setNPCCity(true);
 
-        // return height from heightmap engine at zone location
+            if ((ConfigManager.serverType.equals(Enum.ServerType.WORLDSERVER)) && (city.getHash() == null)) {
 
-        worldAltitude = Terrain.getWorldHeight(zone.parent, zone.getLoc());
+                city.setHash();
 
-        // Add zone offset to value
+                if (DataWarehouse.recordExists(Enum.DataRecordType.CITY, city.getObjectUUID()) == false) {
-
+                    CityRecord cityRecord = CityRecord.borrow(city, Enum.RecordEventType.CREATE);
-        worldAltitude += zone.yOffset;
+                    DataWarehouse.pushToWarehouse(cityRecord);
-
+                }
-        return worldAltitude;
+            }
-    }
+        }
-
-    public static boolean isLocUnderwater(Vector3fImmutable currentLoc) {
-
-        float localAltitude = Terrain.getWorldHeight(currentLoc);
-        Zone zone = findSmallestZone(currentLoc);
-
-        return localAltitude < zone.sea_level;
     }
 }

src/engine/jobs/EndFearJob.java

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

src/engine/jobs/FinishSummonsJob.java

@@ -61,6 +61,8 @@ public class FinishSummonsJob extends AbstractScheduleJob {
             return;
         }
 
+        if (this.source.region != null)
+            this.target.setRegion(this.source.region);
         //teleport target to source
         target.teleport(source.getLoc());
     }

src/engine/jobs/UpgradeBuildingJob.java

@@ -1,6 +1,5 @@
 package engine.jobs;
 
-import engine.gameManager.BuildingManager;
 import engine.job.AbstractScheduleJob;
 import engine.objects.Building;
 import org.pmw.tinylog.Logger;
@@ -40,7 +39,7 @@ public class UpgradeBuildingJob extends AbstractScheduleJob {
         // SetCurrentRank also changes the mesh and maxhp
         // accordingly for buildings with blueprints
 
-        BuildingManager.setRank(rankingBuilding, rankingBuilding.getRank() + 1);
+        rankingBuilding.setRank(rankingBuilding.getRank() + 1);
 
         // Reload the object
 

src/engine/math/Bounds.java

@@ -422,7 +422,7 @@ public class Bounds {
             this.origin.set(building.getLoc().x, building.getLoc().z);
 
 
-            // Magicbane uses halfExtents
+            // Magicbane uses half halfExtents
 
             if (meshBounds == null) {
                 halfExtentX = 1;
@@ -438,10 +438,8 @@ public class Bounds {
             // The rotation is reset after the new aabb is calculated.
 
             this.rotation = building.getRot().y;
-
             // Caclculate and set the new half halfExtents for the rotated bounding box
             // and reset the rotation to 0 for this bounds.
-
             this.halfExtents.set(halfExtentX, (halfExtentY));
             this.rotation = 0;
 
@@ -455,6 +453,7 @@ public class Bounds {
         this.halfExtents.set(blueprint.getExtents());
         this.flipExtents = Bounds.calculateFlipExtents(this);
 
+
         this.setRegions(building);
         this.setColliders(building);
 

src/engine/mobileAI/Threads/MobRespawnThread.java

@@ -0,0 +1,66 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.mobileAI.Threads;
+import engine.gameManager.ZoneManager;
+import engine.objects.Mob;
+import engine.objects.Zone;
+import org.pmw.tinylog.Logger;
+
+/**
+ * Thread blocks until MagicBane dispatch messages are
+ * enqueued then processes them in FIFO order. The collection
+ * is thread safe.
+ * <p>
+ * Any large messages not time sensitive such as load object
+ * sent to more than a single individual should be spawned
+ * individually on a DispatchMessageThread.
+ */
+
+public class MobRespawnThread implements Runnable {
+
+
+    public MobRespawnThread() {
+        Logger.info(" MobRespawnThread thread has started!");
+
+    }
+
+    @Override
+    public void run() {
+
+        while (true) {
+
+            try {
+                for (Zone zone : ZoneManager.getAllZones()) {
+
+                    if (zone.respawnQue.isEmpty() == false && zone.lastRespawn + 100 < System.currentTimeMillis()) {
+
+                        Mob respawner = zone.respawnQue.iterator().next();
+
+                        if (respawner == null)
+                            continue;
+
+                        respawner.respawn();
+                        zone.respawnQue.remove(respawner);
+                        zone.lastRespawn = System.currentTimeMillis();
+                    }
+                }
+            } catch (Exception e) {
+                Logger.error(e);
+            }
+
+        }
+    }
+    public static void startRespawnThread() {
+        Thread respawnThread;
+        respawnThread = new Thread(new MobRespawnThread());
+        respawnThread.setName("respawnThread");
+        respawnThread.start();
+    }
+}

src/engine/mobileAI/Threads/Respawner.java

@@ -1,42 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      Magicbane Emulator Project © 2013 - 2022
-//                www.magicbane.com
-
-
-package engine.mobileAI.Threads;
-import engine.objects.Mob;
-import org.pmw.tinylog.Logger;
-
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.DelayQueue;
-
-public enum Respawner implements Runnable {
-    RESPAWNER;
-    public static BlockingQueue<Mob> respawnQueue = new DelayQueue();
-
-    @Override
-    public void run() {
-
-        while (true) {
-
-            try {
-                Mob mobile = respawnQueue.take();
-                mobile.respawn();
-            } catch (InterruptedException e) {
-                Logger.error(e.toString());
-            }
-
-        }
-    }
-
-    public static void start() {
-        Thread respawnThread;
-        respawnThread = new Thread(RESPAWNER);
-        respawnThread.setName("respawnThread");
-        respawnThread.start();
-    }
-}

src/engine/mobileAI/utilities/CombatUtilities.java

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

src/engine/mobileAI/utilities/MovementUtilities.java

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

src/engine/net/DispatchMessage.java

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

src/engine/net/client/ClientMessagePump.java

@@ -643,7 +643,7 @@ public class ClientMessagePump implements NetMsgHandler {
         moveMsg.setStartCoord(sourcePlayer.getLoc());
         moveMsg.setEndCoord(sourcePlayer.getLoc());
         moveMsg.setInBuilding(-1);
-        moveMsg.setInBuildingFloor(-1);
+        moveMsg.setUnknown01(-1);
 
         dispatch = Dispatch.borrow(sourcePlayer, moveMsg);
         DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
@@ -1196,7 +1196,7 @@ public class ClientMessagePump implements NetMsgHandler {
 
 
                 if (npc.getCharItemManager().getInventoryCount() > 150) {
-                    if (npc.getParentZone() != null && npc.getParentZone().playerCityUUID == 0) {
+                    if (npc.getParentZone() != null && npc.getParentZone().getPlayerCityUUID() == 0) {
                         ArrayList<Item> inv = npc.getInventory();
                         for (int i = 0; i < 20; i++) {
                             try {
@@ -1229,7 +1229,7 @@ public class ClientMessagePump implements NetMsgHandler {
                 if (ib == null)
                     return;
 
-                if (npc.getParentZone() != null && npc.getParentZone().playerCityUUID != 0)
+                if (npc.getParentZone() != null && npc.getParentZone().getPlayerCityUUID() != 0)
                     if (!npc.getCharItemManager().hasRoomInventory(ib.getWeight())) {
 
                         ErrorPopupMsg.sendErrorPopup(player, 21);
@@ -1280,7 +1280,7 @@ public class ClientMessagePump implements NetMsgHandler {
 
                 if (building != null && building.getProtectionState().equals(ProtectionState.NPC))
                     building = null;
-                if (npc.getParentZone().playerCityUUID == 0)
+                if (npc.getParentZone().getPlayerCityUUID() == 0)
                     building = null;
 
                 //make sure npc can afford item
@@ -1892,6 +1892,9 @@ public class ClientMessagePump implements NetMsgHandler {
                 case POWER:
                     PowersManager.usePower((PerformActionMsg) msg, origin, false);
                     break;
+                case REQUESTMELEEATTACK:
+                    CombatManager.setAttackTarget((AttackCmdMsg) msg, origin);
+                    break;
                 case READYTOENTER:
                     break;
                 case OPENVAULT:

src/engine/net/client/Protocol.java

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

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

@@ -151,7 +151,7 @@ public class AbandonAssetMsgHandler extends AbstractClientMsgHandler {
         cityZone = ZoneManager.findSmallestZone(targetBuilding.getLoc());
 
         // Can't abandon a tree not within a player city zone
-        if (cityZone.guild_zone == false)
+        if (cityZone.isPlayerCity() == false)
             return;
 
         if (targetBuilding.getCity() == null)

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

@@ -45,7 +45,7 @@ public class AssetSupportMsgHandler extends AbstractClientMsgHandler {
         if (serverZone == null)
             return;
 
-        serverCity = City.GetCityFromCache(serverZone.playerCityUUID);
+        serverCity = City.GetCityFromCache(serverZone.getPlayerCityUUID());
 
         if (serverCity == null)
             return;

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

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

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

@@ -76,7 +76,7 @@ public class ChangeGuildLeaderHandler extends AbstractClientMsgHandler {
         boolean isMale = true;
         boolean updateTarget;
 
-        Enum.GuildCharterType t = Enum.GuildCharterType.getGuildTypeFromInt(sourcePlayer.getGuild().getCharter());
+        Enum.GuildType t = Enum.GuildType.getGuildTypeFromInt(sourcePlayer.getGuild().getCharter());
 
 
         if (!DbManager.GuildQueries.SET_GUILD_LEADER(targetPlayer.getObjectUUID(), glGuild.getObjectUUID())) {

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

@@ -60,7 +60,7 @@ public class ChangeRankHandler extends AbstractClientMsgHandler {
         boolean isMale;
 
         if (msg.getPreviousRank() != msg.getNewRank()) {
-            Enum.GuildCharterType t = Enum.GuildCharterType.getGuildTypeFromInt(sourcePlayer.getGuild().getCharter());
+            Enum.GuildType t = Enum.GuildType.getGuildTypeFromInt(sourcePlayer.getGuild().getCharter());
 
             if (targetPlayer != null) {
                 targetPlayer.setGuildTitle(msg.getNewRank());

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

@@ -65,7 +65,7 @@ public class ChannelMuteMsgHandler extends AbstractClientMsgHandler {
         cityZone = ZoneManager.findSmallestZone(targetBuilding.getLoc());
 
         // Can't abandon a tree not within a player city zone
-        if (cityZone.guild_zone == false)
+        if (cityZone.isPlayerCity() == false)
             return;
 
         if (targetBuilding.getCity().hasBeenTransfered == true) {

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

@@ -69,7 +69,7 @@ public class ClaimGuildTreeMsgHandler extends AbstractClientMsgHandler {
                 playerZone = building.getParentZone();
 
             if (playerZone != null)
-                playerCity = City.getCity(playerZone.playerCityUUID);
+                playerCity = City.getCity(playerZone.getPlayerCityUUID());
 
             // Oops!  *** Refactor: Log error
             switch (msg.getMessageType()) {
@@ -117,7 +117,7 @@ public class ClaimGuildTreeMsgHandler extends AbstractClientMsgHandler {
                     dispatch = Dispatch.borrow(sourcePlayer, gtsm);
                     DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
 
-                    CityZoneMsg czm = new CityZoneMsg(2, playerZone.getLoc().x, playerZone.getLoc().y, playerZone.getLoc().z, playerCity.getCityName(), playerZone, Enum.CityBoundsType.ZONE.halfExtents, Enum.CityBoundsType.ZONE.halfExtents);
+                    CityZoneMsg czm = new CityZoneMsg(2, playerZone.getLoc().x, playerZone.getLoc().y, playerZone.getLoc().z, playerCity.getCityName(), playerZone, Enum.CityBoundsType.ZONE.extents, Enum.CityBoundsType.ZONE.extents);
                     DispatchMessage.dispatchMsgToAll(czm);
 
                     break;

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

@@ -95,7 +95,7 @@ public class DestroyBuildingHandler extends AbstractClientMsgHandler {
                 city.setWarehouseBuildingID(0);
         }
 
-        BuildingManager.setRank(building, -1);
+        building.setRank(-1);
         WorldGrid.RemoveWorldObject(building);
         WorldGrid.removeObject(building);
         building.getParentZone().zoneBuildingSet.remove(building);

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

@@ -12,9 +12,7 @@ package engine.net.client.handlers;
 import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.exception.MsgSendException;
-import engine.gameManager.ConfigManager;
 import engine.gameManager.GroupManager;
-import engine.gameManager.GuildManager;
 import engine.gameManager.SessionManager;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
@@ -23,7 +21,6 @@ import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.group.GroupInviteMsg;
 import engine.net.client.msg.group.GroupUpdateMsg;
 import engine.objects.Group;
-import engine.objects.Guild;
 import engine.objects.PlayerCharacter;
 
 public class GroupInviteHandler extends AbstractClientMsgHandler {
@@ -106,15 +103,7 @@ public class GroupInviteHandler extends AbstractClientMsgHandler {
         if (target.isIgnoringPlayer(source))
             return false;
 
-        if(ConfigManager.MB_RULESET.getValue() == "LORE") {
-            if(source.guild.equals(Guild.getErrantGuild()))
-                return false;
 
-            if (source.guild.getGuildType() != null) {
-                if (source.guild.getGuildType().equals(target.guild.getGuildType()) == false)
-                    return false;
-            }
-        }
         // dont block invites to people already in a group and
         // dont check for pending invites, the client does it
         // Send invite message to target

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

@@ -43,7 +43,7 @@ public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler {
 
         PlayerCharacter player;
         GuildCreationFinalizeMsg msg;
-        Enum.GuildCharterType charterType;
+        Enum.GuildType charterType;
         Guild newGuild;
         Guild playerGuild;
         ItemBase itemBase;
@@ -78,7 +78,7 @@ public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler {
             return true;
         }
 
-        charterType = Enum.GuildCharterType.getGuildTypeFromCharter(itemBase);
+        charterType = Enum.GuildType.getGuildTypeFromCharter(itemBase);
 
         if (charterType == null) {
             ErrorPopupMsg.sendErrorPopup(player, GuildManager.NO_CHARTER_FOUND);

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

@@ -14,7 +14,6 @@ import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
-import engine.gameManager.ConfigManager;
 import engine.gameManager.GuildManager;
 import engine.gameManager.SessionManager;
 import engine.net.Dispatch;
@@ -85,9 +84,9 @@ public class InviteToGuildHandler extends AbstractClientMsgHandler {
             return true;
         }
 
-        Enum.GuildCharterType guildCharterType = Enum.GuildCharterType.values()[sourcePlayer.getGuild().getCharter()];
+        Enum.GuildType guildType = Enum.GuildType.values()[sourcePlayer.getGuild().getCharter()];
 
-        if (guildCharterType == null) {
+        if (guildType == null) {
             ErrorPopupMsg.sendErrorPopup(sourcePlayer, GuildManager.NO_CHARTER_FOUND);
             return true;
         }
@@ -125,12 +124,7 @@ public class InviteToGuildHandler extends AbstractClientMsgHandler {
             ErrorPopupMsg.sendErrorPopup(sourcePlayer, 135);// you do not meet the level required for this SWORN guild
             return true;
         }
-        if(ConfigManager.MB_RULESET.getValue() == "LORE") {
+
-            if (GuildManager.meetsLoreRequirements(sourcePlayer.guild, targetPlayer) == false) {
-                ChatManager.chatGuildError(sourcePlayer,targetPlayer.getFirstName() + " does not meet charter requirements!");
-                return true;
-            }
-        }
         targetPlayer.setLastGuildToInvite(sourcePlayer.getGuild().getObjectUUID());
 
         // setup guild invite message to send to targetPlayer

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

@@ -12,7 +12,9 @@ package engine.net.client.handlers;
 import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.exception.MsgSendException;
-import engine.gameManager.*;
+import engine.gameManager.ChatManager;
+import engine.gameManager.DbManager;
+import engine.gameManager.SessionManager;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
@@ -109,12 +111,7 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
             sendChat(source, "This Guild can't be subbed.");
             return true;
         }
-        if(ConfigManager.MB_RULESET.getValue() == "LORE") {
+
-            if (source.guild.getGuildType().equals(target.guild.getGuildType()) == false){
-                sendChat(source, "You Must Be The Same Charter To Form A Nation.");
-                return true;
-            }
-        }
         //all tests passed, let's send invite.
 
         if (target.getClientConnection() != null) {

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

@@ -11,13 +11,17 @@ package engine.net.client.handlers;
 
 import engine.Enum.GuildHistoryType;
 import engine.exception.MsgSendException;
-import engine.gameManager.*;
+import engine.gameManager.ChatManager;
+import engine.gameManager.SessionManager;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.ClientNetMsg;
 import engine.net.client.msg.guild.LeaveGuildMsg;
-import engine.objects.*;
+import engine.objects.Guild;
+import engine.objects.GuildStatusController;
+import engine.objects.Mine;
+import engine.objects.PlayerCharacter;
 
 public class LeaveGuildHandler extends AbstractClientMsgHandler {
 
@@ -61,10 +65,7 @@ public class LeaveGuildHandler extends AbstractClientMsgHandler {
         ChatManager.chatGuildInfo(oldGuild, playerCharacter.getFirstName() + " has left the guild.");
 
         oldGuild.removePlayer(playerCharacter, GuildHistoryType.LEAVE);
-        if(ConfigManager.MB_RULESET.getValue() == "LORE") {
+
-            if(GroupManager.getGroup(playerCharacter) != null)
-                GroupManager.getGroup(playerCharacter).removeGroupMember(playerCharacter);
-        }
         // Send message back to client
         msg.setMessage("You have left the guild.");
         dispatch = Dispatch.borrow(playerCharacter, msg);

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

@@ -75,12 +75,12 @@ public class ManageCityAssetMsgHandler extends AbstractClientMsgHandler {
 
                 Zone zone = ZoneManager.findSmallestZone(player.getLoc());
 
-                if (!zone.guild_zone) {
+                if (!zone.isPlayerCity()) {
                     ErrorPopupMsg.sendErrorMsg(player, "Unable to find city to command.");
                     return true;
                 }
 
-                City city = City.GetCityFromCache(zone.playerCityUUID);
+                City city = City.GetCityFromCache(zone.getPlayerCityUUID());
 
                 if (city == null) {
                     ErrorPopupMsg.sendErrorMsg(player, "Unable to find city to command.");
@@ -171,7 +171,7 @@ public class ManageCityAssetMsgHandler extends AbstractClientMsgHandler {
                                 if (warehouse == null)
                                     return true;
 
-                                if (Warehouse.isEmpty(warehouse)) {
+                                if (warehouse.isEmpty()) {
                                     ErrorPopupMsg.sendErrorPopup(player, 167); // no more resources.
                                     return true;
                                 }
@@ -254,7 +254,7 @@ public class ManageCityAssetMsgHandler extends AbstractClientMsgHandler {
             if (baneZone == null)
                 return true;
 
-            City banedCity = City.getCity(baneZone.playerCityUUID);
+            City banedCity = City.getCity(baneZone.getPlayerCityUUID());
 
             if (banedCity == null)
                 return true;

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

@@ -437,13 +437,13 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
                 DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
                 break;
             case 17:
-                Warehouse.warehouseWithdraw(msg, player, npc);
+                Warehouse.warehouseWithdraw(msg, player, npc, origin);
                 break;
             case 18:
-                Warehouse.warehouseDeposit(msg, player, npc);
+                Warehouse.warehouseDeposit(msg, player, npc, origin);
                 break;
             case 19:
-                Warehouse.warehouseLock(msg, player, npc);
+                Warehouse.warehouseLock(msg, player, npc, origin);
                 break;
         }
 

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

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

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

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

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

@@ -98,27 +98,27 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
             return false;
         }
 
-        resourceValue = warehouse.resources.get(ItemBase.getItemBase(7));
+        resourceValue = warehouse.getResources().get(Warehouse.goldIB);
 
         if (resourceValue < 5000000)
             hasResources = false;
 
-        resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580000));
+        resourceValue = warehouse.getResources().get(Warehouse.stoneIB);
 
         if (resourceValue < 8000)
             hasResources = false;
 
-        resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580004));
+        resourceValue = warehouse.getResources().get(Warehouse.lumberIB);
 
         if (resourceValue < 8000)
             hasResources = false;
 
-        resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580017));
+        resourceValue = warehouse.getResources().get(Warehouse.galvorIB);
 
         if (resourceValue < 15)
             hasResources = false;
 
-        resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580018));
+        resourceValue = warehouse.getResources().get(Warehouse.wormwoodIB);
 
         if (resourceValue < 15)
             hasResources = false;
@@ -130,51 +130,51 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
 
         // Remove resources from warehouse before claiming realm
 
-        resourceValue = warehouse.resources.get(ItemBase.getItemBase(7));
+        resourceValue = warehouse.getResources().get(Warehouse.goldIB);
 
         if (DbManager.WarehouseQueries.updateGold(warehouse, resourceValue - 5000000) == true) {
-            warehouse.resources.put(ItemBase.getItemBase(7), resourceValue - 5000000);
+            warehouse.getResources().put(Warehouse.goldIB, resourceValue - 5000000);
-            Warehouse.AddTransactionToWarehouse(warehouse, engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.GOLD, 5000000);
+            warehouse.AddTransactionToWarehouse(engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.GOLD, 5000000);
         } else {
             Logger.error("gold update failed for warehouse of UUID:" + warehouse.getObjectUUID());
             return false;
         }
 
-        resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580000));
+        resourceValue = warehouse.getResources().get(Warehouse.stoneIB);
 
         if (DbManager.WarehouseQueries.updateStone(warehouse, resourceValue - 8000) == true) {
-            warehouse.resources.put(ItemBase.getItemBase(1580000), resourceValue - 8000);
+            warehouse.getResources().put(Warehouse.stoneIB, resourceValue - 8000);
-            Warehouse.AddTransactionToWarehouse(warehouse, engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.STONE, 8000);
+            warehouse.AddTransactionToWarehouse(engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.STONE, 8000);
         } else {
             Logger.error("stone update failed for warehouse of UUID:" + warehouse.getObjectUUID());
             return false;
         }
 
-        resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580004));
+        resourceValue = warehouse.getResources().get(Warehouse.lumberIB);
 
         if (DbManager.WarehouseQueries.updateLumber(warehouse, resourceValue - 8000) == true) {
-            warehouse.resources.put(ItemBase.getItemBase(1580004), resourceValue - 8000);
+            warehouse.getResources().put(Warehouse.lumberIB, resourceValue - 8000);
-            Warehouse.AddTransactionToWarehouse(warehouse, engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.LUMBER, 8000);
+            warehouse.AddTransactionToWarehouse(engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.LUMBER, 8000);
         } else {
             Logger.error("lumber update failed for warehouse of UUID:" + warehouse.getObjectUUID());
             return false;
         }
 
-        resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580017));
+        resourceValue = warehouse.getResources().get(Warehouse.galvorIB);
 
         if (DbManager.WarehouseQueries.updateGalvor(warehouse, resourceValue - 15) == true) {
-            warehouse.resources.put(ItemBase.getItemBase(1580017), resourceValue - 15);
+            warehouse.getResources().put(Warehouse.galvorIB, resourceValue - 15);
-            Warehouse.AddTransactionToWarehouse(warehouse, engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.GALVOR, 15);
+            warehouse.AddTransactionToWarehouse(engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.GALVOR, 15);
         } else {
             Logger.error("galvor update failed for warehouse of UUID:" + warehouse.getObjectUUID());
             return false;
         }
 
-        resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580018));
+        resourceValue = warehouse.getResources().get(Warehouse.wormwoodIB);
 
         if (DbManager.WarehouseQueries.updateWormwood(warehouse, resourceValue - 15) == true) {
-            warehouse.resources.put(ItemBase.getItemBase(1580018), resourceValue - 15);
+            warehouse.getResources().put(Warehouse.wormwoodIB, resourceValue - 15);
-            Warehouse.AddTransactionToWarehouse(warehouse, engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.WORMWOOD, 15);
+            warehouse.AddTransactionToWarehouse(engine.Enum.GameObjectType.Building, tol.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.WORMWOOD, 15);
         } else {
             Logger.error("wormwood update failed for warehouse of UUID:" + warehouse.getObjectUUID());
             return false;
@@ -182,7 +182,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
 
         realm.claimRealmForCity(city, charterUUID);
 
-        BuildingManager.setRank(tol, 8);
+        tol.setRank(8);
         WorldGrid.updateObject(tol);
 
         for (Building building : city.getParent().zoneBuildingSet) {
@@ -334,7 +334,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                             Zone zone = ZoneManager.findSmallestZone(player.getLoc());
 
                             if (zone != null) {
-                                if (zone.guild_zone) {
+                                if (zone.isPlayerCity()) {
                                     loc = zone.getLoc();
                                 }
                             }

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

@@ -151,7 +151,7 @@ public class OpenFriendsCondemnListMsgHandler extends AbstractClientMsgHandler {
                 if (removeCondemn == null)
                     return true;
 
-                if (!DbManager.BuildingQueries.REMOVE_FROM_CONDEMNED_LIST(removeCondemn.buildingUUID, removeCondemn.playerUID, removeCondemn.guildUID, removeCondemn.friendType))
+                if (!DbManager.BuildingQueries.REMOVE_FROM_CONDEMNED_LIST(removeCondemn.getParent(), removeCondemn.getPlayerUID(), removeCondemn.getGuildUID(), removeCondemn.getFriendType()))
                     return true;
 
                 sourceBuilding.getCondemned().remove(msg.getRemoveFriendID());
@@ -175,7 +175,7 @@ public class OpenFriendsCondemnListMsgHandler extends AbstractClientMsgHandler {
                     return true;
 
                 condemn.setActive(msg.isReverseKOS());
-                openFriendsCondemnListMsg.setReverseKOS(condemn.active);
+                openFriendsCondemnListMsg.setReverseKOS(condemn.isActive());
                 dispatch = Dispatch.borrow(player, msg);
                 DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
                 break;
@@ -354,7 +354,7 @@ public class OpenFriendsCondemnListMsgHandler extends AbstractClientMsgHandler {
                 if (friend == null)
                     return true;
 
-                if (!DbManager.BuildingQueries.REMOVE_FROM_FRIENDS_LIST(sourceBuilding.getObjectUUID(), friend.playerUID, friend.guildUID, friend.friendType)) {
+                if (!DbManager.BuildingQueries.REMOVE_FROM_FRIENDS_LIST(sourceBuilding.getObjectUUID(), friend.getPlayerUID(), friend.getGuildUID(), friend.getFriendType())) {
                     Logger.debug("Failed to remove Friend: " + msg.getRemoveFriendID() + " from Building With UID " + sourceBuilding.getObjectUUID());
                     return true;
                 }

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

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

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

@@ -2,6 +2,7 @@ package engine.net.client.handlers;
 
 import engine.Enum;
 import engine.Enum.*;
+import engine.InterestManagement.HeightMap;
 import engine.InterestManagement.InterestManager;
 import engine.InterestManagement.RealmMap;
 import engine.InterestManagement.WorldGrid;
@@ -111,7 +112,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         // Cannot place a tree underwater
 
-        if (ZoneManager.isLocUnderwater(placementInfo.getLoc())) {
+        if (HeightMap.isLocUnderwater(placementInfo.getLoc())) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 6, ""); // Cannot place underwater
             return false;
         }
@@ -137,7 +138,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
     private static boolean validateBuildingPlacement(Zone serverZone, PlaceAssetMsg msg, ClientConnection origin, PlayerCharacter player, PlacementInfo placementInfo) {
 
-        if (serverZone.guild_zone == false) {
+        if (serverZone.isPlayerCity() == false) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 52, player.getName());
             return false;
         }
@@ -156,7 +157,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         // Retrieve the building details we're placing
 
-        if (serverZone.isNPCCity == true) {
+        if (serverZone.isNPCCity() == true) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 15, ""); // Cannot place in a peace zone
             return false;
         }
@@ -177,7 +178,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         // Cannot place a building underwater
 
-        if (ZoneManager.isLocUnderwater(placementInfo.getLoc())) {
+        if (HeightMap.isLocUnderwater(placementInfo.getLoc())) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 6, ""); // Cannot place underwater
             return false;
         }
@@ -185,7 +186,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
         // Players cannot place buildings in mob zones.
 
         if ((serverZone.isMacroZone() == true)
-                || (serverZone.parent.isMacroZone() == true)) {
+                || (serverZone.getParent().isMacroZone() == true)) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 57, player.getName()); // No building may be placed within this territory
             return false;
         }
@@ -201,8 +202,8 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         // Cannot place assets on a dead tree
 
-        if ((serverZone.guild_zone)
+        if ((serverZone.isPlayerCity())
-                && (City.getCity(serverZone.playerCityUUID).getTOL().getRank() == -1)) {
+                && (City.getCity(serverZone.getPlayerCityUUID()).getTOL().getRank() == -1)) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 1, "Cannot place asset on dead tree until world heals");
             return false;
         }
@@ -261,14 +262,14 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         // Must be a player city
 
-        if (serverZone.guild_zone == false) {
+        if (serverZone.isPlayerCity() == false) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 41, player.getName()); // Cannot place outside a guild zone
             return false;
         }
 
         //Test zone has a city object
 
-        City city = City.getCity(serverZone.playerCityUUID);
+        City city = City.getCity(serverZone.getPlayerCityUUID());
 
         if (city == null) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 52, ""); //"no city to associate asset with"
@@ -512,7 +513,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
         if (serverZone == null)
             return false;
 
-        cityObject = City.getCity(serverZone.playerCityUUID);
+        cityObject = City.getCity(serverZone.getPlayerCityUUID());
 
         // Early exit if something went horribly wrong
 
@@ -571,7 +572,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         // No valid player city found
 
-        if (serverCity == null || serverCity.getParent().guild_zone == false) {
+        if (serverCity == null || serverCity.getParent().isPlayerCity() == false) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 52, ""); // Cannot place outisde a guild zone
             return false;
         }
@@ -660,7 +661,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
                 if (!building.getBlueprint().isSiegeEquip())
                     continue;
 
-            if (!building.getLoc().isInsideCircle(serverCity.getLoc(), CityBoundsType.ZONE.halfExtents))
+            if (!building.getLoc().isInsideCircle(serverCity.getLoc(), CityBoundsType.ZONE.extents))
                 continue;
 
             if (building.getGuild() == null)
@@ -744,16 +745,15 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
         }
 
         Vector3fImmutable plantLoc = new Vector3fImmutable(treeInfo.getLoc().x,
-                0,
+                HeightMap.getWorldHeight(treeInfo.getLoc()),
                 treeInfo.getLoc().z);
 
         cityObjects = DbManager.CityQueries.CREATE_CITY(playerCharacter.getObjectUUID(), serverZone.getObjectUUID(),
                 serverRealm.getRealmID(),
-                plantLoc.x - serverZone.absX, plantLoc.y,
+                plantLoc.x - serverZone.getAbsX(), plantLoc.y,
-                plantLoc.z - serverZone.absZ, treeInfo.getRot().y, treeInfo.getW(), playerCharacter.getGuild().getName(), LocalDateTime.now());
+                plantLoc.z - serverZone.getAbsZ(), treeInfo.getRot().y, treeInfo.getW(), playerCharacter.getGuild().getName(), LocalDateTime.now());
 
         // Uh oh!
-
         if (cityObjects == null || cityObjects.isEmpty()) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 1, "A Serious error has occurred. Please post details for to ensure transaction integrity");
             return false;
@@ -766,6 +766,8 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
             cityObjectMap.put(gameObject.getObjectType(), gameObject);
 
         treeObject = (Building) cityObjectMap.get(GameObjectType.Building);
+        treeObject.runAfterLoad();
+        ;
         cityObject = (City) cityObjectMap.get(GameObjectType.City);
         zoneObject = (Zone) cityObjectMap.get(GameObjectType.Zone);
 
@@ -778,30 +780,44 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
         playerNation = playerCharacter.getGuild();
         playerNation.setGuildState(GuildState.Sovereign);
 
+        // Link the zone with the city and then add
+        // to the appropriate hash tables and cache
+
+        zoneObject.setPlayerCity(true);
+
+        if (zoneObject.getParent() != null)
+            zoneObject.getParent().addNode(zoneObject); //add as child to parent
+
+        ZoneManager.addZone(zoneObject.getObjectUUID(), zoneObject);
+        ZoneManager.addPlayerCityZone(zoneObject);
+        serverZone.addNode(zoneObject);
+
+        zoneObject.generateWorldAltitude();
+
+        cityObject.setParent(zoneObject);
+        cityObject.setObjectTypeMask(MBServerStatics.MASK_CITY); // *** Refactor : should have it already
+        //Link the tree of life with the new zone
+
+        treeObject.setObjectTypeMask(MBServerStatics.MASK_BUILDING);
+        treeObject.setParentZone(zoneObject);
+        MaintenanceManager.setMaintDateTime(treeObject, LocalDateTime.now().plusDays(7));
+
         // Update guild binds and tags
+        //load the new city on the clients
+
+        CityZoneMsg czm = new CityZoneMsg(1, treeObject.getLoc().x, treeObject.getLoc().y, treeObject.getLoc().z, cityObject.getCityName(), zoneObject, Enum.CityBoundsType.ZONE.extents, Enum.CityBoundsType.ZONE.extents);
+        DispatchMessage.dispatchMsgToAll(czm);
 
         GuildManager.updateAllGuildBinds(playerNation, cityObject);
         GuildManager.updateAllGuildTags(playerNation);
 
-        //load the new city on the clients
-
-        CityZoneMsg czm = new CityZoneMsg(1, treeObject.getLoc().x, treeObject.getLoc().y, treeObject.getLoc().z, cityObject.getCityName(), zoneObject, Enum.CityBoundsType.ZONE.halfExtents, Enum.CityBoundsType.ZONE.halfExtents);
-        DispatchMessage.dispatchMsgToAll(czm);
-
-        // Set maintenance date
-
-        MaintenanceManager.setMaintDateTime(treeObject, LocalDateTime.now().plusDays(7));
-
         // Send all the cities to the clients?
         // *** Refactor : figure out how to send like, one?
 
         City.lastCityUpdate = System.currentTimeMillis();
         treeObject.setLoc(treeObject.getLoc());
-
-        // As this is a new static object set it's dirtyFlag
-        // so players already near it will have the object loaded.
-
         InterestManager.setObjectDirty(treeObject);
+//        WorldGrid.addObject(treeObject, playerCharacter);
 
         serverRealm.addCity(cityObject.getObjectUUID());
         playerNation.setCityUUID(cityObject.getObjectUUID());
@@ -841,7 +857,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
         if (serverZone == null)
             return false;
 
-        cityObject = City.getCity(serverZone.playerCityUUID);
+        cityObject = City.getCity(serverZone.getPlayerCityUUID());
 
         if (cityObject == null)
             return false;
@@ -899,7 +915,6 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         // Early exit if something went horribly wrong
         // with locating the current realm and/or zone
-
         if (serverZone == null)
             return false;
 
@@ -915,7 +930,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         int shrineCount = 0;
 
-        cityObject = City.getCity(serverZone.playerCityUUID);
+        cityObject = City.getCity(serverZone.getPlayerCityUUID());
 
         // Cannot place shrine in abandoned city.  Shrines must be owned
         // by the tol owner not the person placing them.
@@ -962,8 +977,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
         City cityObject;
         PlacementInfo buildingList;
 
-        // Setup working variables
+        // Setup working variables we'll need
-
         buildingList = msg.getFirstPlacementInfo();
 
         serverZone = ZoneManager.findSmallestZone(buildingList.getLoc());
@@ -985,7 +999,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         int barracksCount = 0;
 
-        cityObject = City.getCity(serverZone.playerCityUUID);
+        cityObject = City.getCity(serverZone.getPlayerCityUUID());
 
         // Cannot place barracks in abandoned city.
 
@@ -1045,7 +1059,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
         if (validateCityBuildingPlacement(serverZone, msg, origin, player, msg.getFirstPlacementInfo()) == false)
             return false;
 
-        cityObject = City.getCity(serverZone.playerCityUUID);
+        cityObject = City.getCity(serverZone.getPlayerCityUUID());
 
         // We need to be able to access how much gold a character is carrying
 
@@ -1076,6 +1090,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         placementCost = 0; // reset placement cost for fix bug with wall pieces somethings not taking gold out if forced an error.
 
+
         // Overlap check and wall deed verifications
         for (PlacementInfo wall : walls) {
 
@@ -1094,6 +1109,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
             for (Building building : serverZone.zoneBuildingSet) {
 
+
                 //TODO Clean up collision with placementInfo. don't need to create the same placementinfo bounds for collision checks on each building.
                 if ((building.getBlueprintUUID() != 0) && (Bounds.collide(wall, building) == true)) {
 
@@ -1101,7 +1117,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
                         building.removeFromCache();
                         WorldGrid.RemoveWorldObject(building);
                         WorldGrid.removeObject(building);
-                        building.getParentZone().parent.zoneBuildingSet.remove(building);
+                        building.getParentZone().getParent().zoneBuildingSet.remove(building);
                         if (building.getBlueprint() != null && building.getBlueprint().getBuildingGroup().equals(BuildingGroup.BARRACK)) {
                             building.RemoveFromBarracksList();
                         }
@@ -1113,14 +1129,12 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
                     return false;
                 }
             }
-
             placementCost = PlaceAssetMsg.getWallCost(wall.getBlueprintUUID());
 
             if (!itemMan.modifyInventoryGold(-placementCost)) {
                 ChatManager.chatSystemInfo(player, player.getFirstName() + " can't has free moneys! no for real.. Thor.. seriously... I didnt fix it because you getting laid isnt important enough for me.");
                 return false;
             }
-
             // Attempt to place wall piece
 
             wallPiece = createStructure(player, wall, serverZone);
@@ -1131,12 +1145,14 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
             }
 
             // walls are auto protected
-
             wallPiece.setProtectionState(ProtectionState.PROTECTED);
             PlaceAssetMsg.sendPlaceAssetConfirmWall(origin, serverZone);
 
         }
 
+        // Deduct gold from character's inventory
+
+
         return true;
     }
 
@@ -1156,7 +1172,6 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
         }
 
         // All siege buildings build in 15 minutes
-
         if ((blueprint.getBuildingGroup().equals(BuildingGroup.SIEGETENT))
                 || (blueprint.getBuildingGroup().equals(BuildingGroup.BULWARK)))
             completionDate = DateTime.now().plusMinutes(15);
@@ -1176,7 +1191,6 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
                 completionDate, blueprint.getMeshForRank(0), vendorRotation, buildingRotation);
 
         // Make sure we have a valid mesh
-
         if (newMesh == null) {
             Logger.error("CreateStructure: DB returned null object.");
             return null;
@@ -1213,7 +1227,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
 
         shrineType = Shrine.getShrineTypeByBlueprintUUID(blueprint.getBlueprintUUID());
 
-        city = City.getCity(currentZone.playerCityUUID);
+        city = City.getCity(currentZone.getPlayerCityUUID());
 
         if (city == null)
             return false;
@@ -1278,7 +1292,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
             return false;
         }
 
-        city = City.getCity(currentZone.playerCityUUID);
+        city = City.getCity(currentZone.getPlayerCityUUID());
 
         if (city == null)
             return false;
@@ -1348,16 +1362,15 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
                 newMesh = (Building) ago;
                 newMesh.setObjectTypeMask(MBServerStatics.MASK_BUILDING);
                 MaintenanceManager.setMaintDateTime(newMesh, LocalDateTime.now().plusDays(7));
+                //             WorldGrid.addObject(newMesh, player);
                 newMesh.setLoc(newMesh.getLoc());
                 InterestManager.setObjectDirty(newMesh);
                 newMesh.runAfterLoad();
             } else if (ago.getObjectType() == GameObjectType.Warehouse) {
                 Warehouse warehouse = (Warehouse) ago;
-                City city = City.getCity(currentZone.playerCityUUID);
+                City city = City.getCity(currentZone.getPlayerCityUUID());
-
                 if (city == null)
                     return true;
-
                 city.setWarehouseBuildingID(newMesh.getObjectUUID());
                 Warehouse.warehouseByBuildingUUID.put(newMesh.getObjectUUID(), warehouse);
             }

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

@@ -44,11 +44,11 @@ public class RepairBuildingMsgHandler extends AbstractClientMsgHandler {
 
         serverZone = ZoneManager.findSmallestZone(pc.getLoc());
 
-        if (serverZone.playerCityUUID == 0 && targetBuilding.getBlueprint() != null && targetBuilding.getBlueprint().getBuildingGroup() != BuildingGroup.MINE)
+        if (serverZone.getPlayerCityUUID() == 0 && targetBuilding.getBlueprint() != null && targetBuilding.getBlueprint().getBuildingGroup() != BuildingGroup.MINE)
             return;
 
 
-        City city = City.GetCityFromCache(serverZone.playerCityUUID);
+        City city = City.GetCityFromCache(serverZone.getPlayerCityUUID());
 
         if (city != null) {
             if (city.getBane() != null && city.protectionEnforced == false)

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

@@ -110,6 +110,7 @@ public class RequestEnterWorldHandler extends AbstractClientMsgHandler {
             player.stopMovement(player.getBindLoc());
             player.setSafeMode();
             player.updateLocation();
+            player.setRegion(AbstractWorldObject.GetRegionByWorldObject(player));
         }
 
         player.setTimeStamp("logout", 0);

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

@@ -111,7 +111,7 @@ public class TaxCityMsgHandler extends AbstractClientMsgHandler {
 
         ViewResourcesMessage vrm = new ViewResourcesMessage(player);
         vrm.setGuild(building.getGuild());
-        vrm.setWarehouseBuilding(BuildingManager.getBuildingFromCache(building.getCity().getWarehouse().buildingUID));
+        vrm.setWarehouseBuilding(BuildingManager.getBuildingFromCache(building.getCity().getWarehouse().getBuildingUID()));
         vrm.configure();
         Dispatch dispatch = Dispatch.borrow(player, msg);
         DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);

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

@@ -61,13 +61,13 @@ public class ArcViewAssetTransactionsMsg extends ClientNetMsg {
 
     public void configure() {
 
-        warehouseBuilding = BuildingManager.getBuilding(this.warehouse.buildingUID);
+        warehouseBuilding = BuildingManager.getBuilding(this.warehouse.getBuildingUID());
         transactions = new ArrayList<>(50);
 
-        if (this.warehouse.transactions.size() > 150) {
+        if (this.warehouse.getTransactions().size() > 150) {
-            transactions.addAll(this.warehouse.transactions.subList(this.warehouse.transactions.size() - 150, this.warehouse.transactions.size()));
+            transactions.addAll(this.warehouse.getTransactions().subList(this.warehouse.getTransactions().size() - 150, this.warehouse.getTransactions().size()));
         } else
-            transactions = this.warehouse.transactions;
+            transactions = this.warehouse.getTransactions();
 
     }
 
@@ -78,7 +78,7 @@ public class ArcViewAssetTransactionsMsg extends ClientNetMsg {
     protected void _serialize(ByteBufferWriter writer) throws SerializationException {
 
         writer.putInt(this.transactionID);
-        writer.putInt(this.warehouse.buildingUID);
+        writer.putInt(this.warehouse.getBuildingUID());
         writer.putInt(transactions.size()); //list Size
 
         for (Transaction transaction : transactions) {
@@ -124,7 +124,7 @@ public class ArcViewAssetTransactionsMsg extends ClientNetMsg {
             writer.putInt(transaction.getTargetUUID()); //ID
             writer.putString(name); //Name of depositer/withdrawler or mine name
             writer.putInt(GameObjectType.Building.ordinal()); //Type
-            writer.putInt(warehouse.buildingUID); //ID
+            writer.putInt(warehouse.getBuildingUID()); //ID
             writer.putString(warehouseBuilding.getName()); //warehouse
             writer.putInt(transaction.getTransactionType().getID()); //79,80 withdrew, 81 mine produced, 82 deposit
             writer.putInt(transaction.getAmount()); //amount

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

@@ -92,7 +92,7 @@ public class CityAssetMsg extends ClientNetMsg {
             return;
         }
 
-        city = City.getCity(zone.playerCityUUID);
+        city = City.getCity(zone.getPlayerCityUUID());
 
         if (city == null) {
             Logger.debug("Failed to load city data for Tree of life.");

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

@@ -117,8 +117,8 @@ public class GuildTreeStatusMsg extends ClientNetMsg {
         city = null;
 
         if (cityZone != null)
-            if (cityZone.guild_zone)
+            if (cityZone.isPlayerCity())
-                city = City.GetCityFromCache(cityZone.playerCityUUID);
+                city = City.GetCityFromCache(cityZone.getPlayerCityUUID());
             else if (this.treeOfLife != null && this.treeOfLife.getGuild() != null)
                 city = this.treeOfLife.getGuild().getOwnedCity();