Dev command updated to reflect index slotting.

src/engine/Dungeons/Dungeon.java

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

src/engine/Dungeons/DungeonManager.java

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

src/engine/Enum.java

@@ -9,13 +9,15 @@
 package engine;
 
 import ch.claude_martin.enumbitset.EnumBitSetHelper;
-import engine.gameManager.BuildingManager;
 import engine.gameManager.ConfigManager;
 import engine.gameManager.PowersManager;
 import engine.gameManager.ZoneManager;
 import engine.math.Vector2f;
 import engine.math.Vector3fImmutable;
-import engine.objects.*;
+import engine.objects.AbstractCharacter;
+import engine.objects.ItemBase;
+import engine.objects.Shrine;
+import engine.objects.Zone;
 import engine.powers.EffectsBase;
 import org.pmw.tinylog.Logger;
 
@@ -137,8 +139,8 @@ public class Enum {
         HALFGIANTMALE(2010, MonsterType.HalfGiant, RunSpeed.STANDARD, CharacterSex.MALE, 1.15f),
         HUMANMALE(2011, MonsterType.Human, RunSpeed.STANDARD, CharacterSex.MALE, 1),
         HUMANFEMALE(2012, MonsterType.Human, RunSpeed.STANDARD, CharacterSex.FEMALE, 1),
-        IREKEIMALE(2013, MonsterType.Irekei, RunSpeed.IREKEI, CharacterSex.MALE, 1.1f),
-        IREKEIFEMALE(2014, MonsterType.Irekei, RunSpeed.IREKEI, CharacterSex.FEMALE, 1.1f),
+        IREKEIMALE(2013, MonsterType.Irekei, RunSpeed.STANDARD, CharacterSex.MALE, 1.1f),
+        IREKEIFEMALE(2014, MonsterType.Irekei, RunSpeed.STANDARD, CharacterSex.FEMALE, 1.1f),
         SHADEMALE(2015, MonsterType.Shade, RunSpeed.STANDARD, CharacterSex.MALE, 1),
         SHADEFEMALE(2016, MonsterType.Shade, RunSpeed.STANDARD, CharacterSex.FEMALE, 1),
         MINOMALE(2017, MonsterType.Minotaur, RunSpeed.MINOTAUR, CharacterSex.MALE, 1.3f),
@@ -150,8 +152,7 @@ public class Enum {
         NEPHFEMALE(2026, MonsterType.Nephilim, RunSpeed.STANDARD, CharacterSex.FEMALE, 1.1f),
         HALFGIANTFEMALE(2027, MonsterType.HalfGiant, RunSpeed.STANDARD, CharacterSex.FEMALE, 1.15f),
         VAMPMALE(2028, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.MALE, 1),
-        VAMPFEMALE(2029, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.FEMALE, 1),
-        SAETOR(1999,MonsterType.Minotaur, RunSpeed.MINOTAUR, CharacterSex.MALE,1);
+        VAMPFEMALE(2029, MonsterType.Vampire, RunSpeed.STANDARD, CharacterSex.FEMALE, 1);
 
         @SuppressWarnings("unchecked")
         private static HashMap<Integer, RaceType> _raceTypeByID = new HashMap<>();
@@ -207,8 +208,8 @@ public class Enum {
         SENTINEL(0, 0, 0, 0, 0, 0, 0),
         STANDARD(6.1900001f, 13.97f, 4.2199998f, 13.97f, 6.3299999f, 18.379999f, 6.5f),
         CENTAUR(6.1900001f, 16.940001f, 5.5500002f, 16.940001f, 6.3299999f, 18.379999f, 6.5f),
-        MINOTAUR(6.6300001f, 15.95f, 4.2199998f, 15.95f, 6.3299999f, 18.379999f, 6.5f),
-        IREKEI(6.499500105f, 14.6685f, 4.2199998f, 14.6685f, 6.3299999f, 18.379999f, 6.5f);
+        MINOTAUR(6.6300001f, 15.95f, 4.2199998f, 15.95f, 6.3299999f, 18.379999f, 6.5f);
+
         private float walkStandard;
         private float walkCombat;
         private float runStandard;
@@ -468,14 +469,11 @@ public class Enum {
 
                 // 14001 does not have a banestone to bind at
 
-                if (ruinZone.getLoadNum() == 14001) {
+                if (ruinZone.templateID == 14001)
                     spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc(), 30);
-                }else {
-                    //spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc()
-                    //.add(new Vector3fImmutable(-196.016f, 2.812f, 203.621f)), 30);
-                        spawnLocation = Vector3fImmutable.getRandomPointOnCircle(BuildingManager.getBuilding(27977).loc,30f);
-
-                }
+                else
+                    spawnLocation = Vector3fImmutable.getRandomPointOnCircle(ruinZone.getLoc()
+                            .add(new Vector3fImmutable(-196.016f, 2.812f, 203.621f)), 30);
             }
 
 
@@ -778,7 +776,6 @@ public class Enum {
         Combat,
         Spires,
         Snare,
-        Snared,
         Stun,
         Blind,
         Root,
@@ -881,7 +878,6 @@ public class Enum {
         Siege,
         Slash,
         Snare,
-        Snared,
         Sorcery,
         Spear,
         SpearMastery,
@@ -961,17 +957,6 @@ public class Enum {
         Wizardry;
 
         public static SourceType GetSourceType(String modName) {
-            switch(modName){
-                case "Slashing":
-                    modName = "Slash";
-                    break;
-                case "Crushing":
-                    modName = "Crush";
-                    break;
-                case "Piercing":
-                    modName = "Pierce";
-                    break;
-            }
             SourceType returnMod;
             if (modName.isEmpty())
                 return SourceType.None;
@@ -979,8 +964,8 @@ public class Enum {
             try {
                 returnMod = SourceType.valueOf(modName.replace(",", ""));
             } catch (Exception e) {
-                //Logger.error(modName);
-                //Logger.error(e);
+                Logger.error(modName);
+                Logger.error(e);
                 return SourceType.None;
             }
             return returnMod;
@@ -1031,7 +1016,6 @@ public class Enum {
         Silence,
         Slash,
         Snare,
-        Snared,
         Stance,
         Stun,
         Summon,
@@ -1156,7 +1140,6 @@ public class Enum {
         SkillDebuff,
         SlashResistanceDebuff,
         Snare,
-        Snared,
         StackableAttrCONBuff,
         StackableAttrDEXBuff,
         StackableAttrSTRBuff,
@@ -2323,14 +2306,14 @@ public class Enum {
 
     public enum CityBoundsType {
 
-        GRID(544),
-        ZONE(672),
-        PLACEMENT(673);
+        GRID(640),
+        ZONE(875),
+        PLACEMENT(876);
 
-        public final float extents;
+        public final float halfExtents;
 
-        CityBoundsType(float extents) {
-            this.extents = extents;
+        CityBoundsType(float halfExtents) {
+            this.halfExtents = halfExtents;
         }
     }
 
@@ -2839,7 +2822,6 @@ public class Enum {
 
     public enum MobBehaviourType {
         None(null, false, false, false, false, false),
-        //Power
         Power(null, false, true, true, true, false),
         PowerHelpee(Power, false, true, true, false, true),
         PowerHelpeeWimpy(Power, true, false, true, false, false),
@@ -2864,6 +2846,7 @@ public class Enum {
         //Independent Types
         SimpleStandingGuard(null, false, false, false, false, false),
         Pet1(null, false, false, true, false, false),
+        SiegeEngine(null, false, false, false, false, false),
         Simple(null, false, false, true, false, false),
         Helpee(null, false, true, true, false, true),
         HelpeeWimpy(null, true, false, true, false, false),
@@ -2874,13 +2857,12 @@ public class Enum {
         HamletGuard(null, false, true, false, false, false),
         AggroWanderer(null, false, false, true, false, false);
 
-        private static HashMap<Integer, MobBehaviourType> _behaviourTypes = new HashMap<>();
-        public MobBehaviourType BehaviourHelperType;
-        public boolean isWimpy;
-        public boolean isAgressive;
-        public boolean canRoam;
-        public boolean callsForHelp;
-        public boolean respondsToCallForHelp;
+        public final MobBehaviourType BehaviourHelperType;
+        public final boolean isWimpy;
+        public final boolean isAgressive;
+        public final boolean canRoam;
+        public final boolean callsForHelp;
+        public final boolean respondsToCallForHelp;
 
         MobBehaviourType(MobBehaviourType helpeebehaviourType, boolean wimpy, boolean agressive, boolean canroam, boolean callsforhelp, boolean respondstocallforhelp) {
             this.BehaviourHelperType = helpeebehaviourType;
@@ -2895,8 +2877,11 @@ public class Enum {
 
     public enum AIAgentType {
         MOBILE,
+        GUARDCAPTAIN,
+        GUARDMINION,
+        GUARDWALLARCHER,
         PET,
         CHARMED,
-        GUARD;
+        SIEGEENGINE;
     }
 }

src/engine/InterestManagement/HeightMap.java

@@ -1,706 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      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

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

src/engine/InterestManagement/Terrain.java

@@ -0,0 +1,230 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      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/ZergMehcanics/MineAntiZerg.java

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

src/engine/db/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().getHash();
+        cityRecord.zoneHash = cityRecord.city.getParent().hash;
 
         if (cityRecord.eventType.equals(Enum.RecordEventType.CREATE))
             cityRecord.establishedDatetime = cityRecord.city.established;

src/engine/db/archive/MineRecord.java

@@ -52,7 +52,7 @@ public class MineRecord extends DataRecord {
             mineRecord.eventType = eventType;
         }
 
-        mineRecord.zoneHash = mine.getParentZone().getHash();
+        mineRecord.zoneHash = mine.getParentZone().hash;
 
         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.getName());
+        outStatement.setString(10, zone.zoneName);
         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/dbAccountHandler.java

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

src/engine/db/handlers/dbBaneHandler.java

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

src/engine/db/handlers/dbBuildingHandler.java

@@ -13,6 +13,7 @@ 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.*;
@@ -27,6 +28,7 @@ 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 {
 
@@ -88,14 +90,12 @@ public class dbBuildingHandler extends dbHandlerBase {
         return removeFromBuildings(b);
     }
 
-    public ArrayList<Building> GET_ALL_BUILDINGS_FOR_ZONE(Zone zone) {
+    public ArrayList<Building> GET_ALL_BUILDINGS() {
 
         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` WHERE `object`.`parent` = ?;")) {
-
-            preparedStatement.setLong(1, zone.getObjectUUID());
+             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;")) {
 
             ResultSet rs = preparedStatement.executeQuery();
             buildings = getObjectsFromRs(rs, 1000);
@@ -425,26 +425,28 @@ public class dbBuildingHandler extends dbHandlerBase {
         return false;
     }
 
-    public void LOAD_ALL_FRIENDS_FOR_BUILDING(Building building) {
-
-        if (building == null)
-            return;
+    public void LOAD_BUILDING_FRIENDS() {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_friends` WHERE `buildingUID` = ?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_friends`")) {
 
-            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:
-                        building.getFriends().put(friend.getPlayerUID(), friend);
+                        BuildingManager._buildingFriends.get(friend.buildingUID).put(friend.playerUID, friend);
                         break;
                     case 8:
                     case 9:
-                        building.getFriends().put(friend.getGuildUID(), friend);
+                        BuildingManager._buildingFriends.get(friend.buildingUID).put(friend.guildUID, friend);
                         break;
                 }
             }
@@ -455,26 +457,29 @@ public class dbBuildingHandler extends dbHandlerBase {
 
     }
 
-    public void LOAD_ALL_CONDEMNED_FOR_BUILDING(Building building) {
-
-        if (building == null)
-            return;
+    public void LOAD_BUILDING_CONDEMNED() {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_condemned` WHERE `buildingUID` = ?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_condemned`")) {
 
-            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:
-                        building.getCondemned().put(condemned.getPlayerUID(), condemned);
+                        BuildingManager._buildingCondemned.get(condemned.buildingUUID).put(condemned.playerUID, condemned);
                         break;
                     case 4:
                     case 5:
-                        building.getCondemned().put(condemned.getGuildUID(), condemned);
+                        BuildingManager._buildingCondemned.get(condemned.buildingUUID).put(condemned.guildUID, condemned);
                         break;
                 }
             }
@@ -484,35 +489,27 @@ public class dbBuildingHandler extends dbHandlerBase {
         }
     }
 
-    public ArrayList<Vector3fImmutable> LOAD_PATROL_POINTS(Building building) {
-
-        if (building == null)
-            return null;
-
-        ArrayList<Vector3fImmutable> patrolPoints = new ArrayList<>();
+    public void LOAD_BARRACKS_PATROL_POINTS() {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_patrol_points` WHERE `buildingUID` = ?")) {
-
-            preparedStatement.setInt(1, building.getObjectUUID());
-
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_building_patrol_points`")) {
 
             ResultSet rs = preparedStatement.executeQuery();
 
             while (rs.next()) {
-                float x1 = rs.getFloat("patrolX");
-                float y1 = rs.getFloat("patrolY");
-                float z1 = rs.getFloat("patrolZ");
-                Vector3fImmutable patrolPoint = new Vector3fImmutable(x1, y1, z1);
-                patrolPoints.add(patrolPoint);
+
+                int buildingUUID = rs.getInt("buildingUID");
+
+                if (!BuildingManager._buildingPatrolPoints.containsKey(buildingUUID))
+                    BuildingManager._buildingPatrolPoints.put(buildingUUID, new ArrayList<>());
+
+                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) {
@@ -722,10 +719,10 @@ public class dbBuildingHandler extends dbHandlerBase {
                      + "WHERE`buildingUID` = ? AND `playerUID` = ? AND `guildUID` = ? AND `friendType` = ?")) {
 
             preparedStatement.setBoolean(1, active);
-            preparedStatement.setInt(2, condemn.getParent());
-            preparedStatement.setInt(3, condemn.getPlayerUID());
-            preparedStatement.setInt(4, condemn.getGuildUID());
-            preparedStatement.setInt(5, condemn.getFriendType());
+            preparedStatement.setInt(2, condemn.buildingUUID);
+            preparedStatement.setInt(3, condemn.playerUID);
+            preparedStatement.setInt(4, condemn.guildUID);
+            preparedStatement.setInt(5, condemn.friendType);
 
             return (preparedStatement.executeUpdate() > 0);
 

src/engine/db/handlers/dbCityHandler.java

@@ -11,7 +11,10 @@ package engine.db.handlers;
 
 import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.objects.*;
+import engine.objects.AbstractGameObject;
+import engine.objects.Building;
+import engine.objects.City;
+import engine.objects.Zone;
 import org.pmw.tinylog.Logger;
 
 import java.sql.*;
@@ -31,16 +34,19 @@ 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;
         }
@@ -92,24 +98,13 @@ public class dbCityHandler extends dbHandlerBase {
 
         return objectList;
     }
-    public Integer GET_CAPITAL_CITY_COUNT() {
 
-        int cityCount = 0;
-        for(Realm realm : Realm._realms.values()){
-            if(realm.isRuled())
-                cityCount ++;
-        }
-
-        return cityCount;
-    }
-    public ArrayList<City> GET_CITIES_BY_ZONE(final int objectUUID) {
+    public ArrayList<City> GET_ALL_CITIES() {
 
         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` WHERE `object`.`parent`=?;")) {
-
-            preparedStatement.setLong(1, objectUUID);
+             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;")) {
 
             ResultSet rs = preparedStatement.executeQuery();
             cityList = getObjectsFromRs(rs, 100);

src/engine/db/handlers/dbContractHandler.java

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

src/engine/db/handlers/dbHandlerBase.java

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

src/engine/db/handlers/dbHeightMapHandler.java

@@ -1,43 +0,0 @@
-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

@@ -22,7 +22,6 @@ import java.util.HashMap;
 
 public class dbItemBaseHandler extends dbHandlerBase {
 
-    public static final HashMap<Integer,Float> dexReductions = new HashMap<>();
     public dbItemBaseHandler() {
 
     }
@@ -46,14 +45,6 @@ public class dbItemBaseHandler extends dbHandlerBase {
         }
     }
 
-    public void LOAD_DEX_REDUCTION(ItemBase itemBase) {
-        if(dexReductions.containsKey(itemBase.getUUID())){
-            itemBase.dexReduction = dexReductions.get(itemBase.getUUID());
-        }else{
-            itemBase.dexReduction = 0.0f;
-        }
-    }
-
     public void LOAD_ANIMATIONS(ItemBase itemBase) {
 
         ArrayList<Integer> tempList = new ArrayList<>();
@@ -103,21 +94,6 @@ public class dbItemBaseHandler extends dbHandlerBase {
         }
 
         Logger.info("read: " + recordsRead + " cached: " + ItemBase.getUUIDCache().size());
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_item_dexpenalty`")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-
-            // Check if a result was found
-            if (rs.next()) {
-                int ID = rs.getInt("ID");
-                float factor = rs.getInt("item_bulk_factor");
-                dexReductions.put(ID,factor);
-            }
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
     }
 
     public HashMap<Integer, ArrayList<Integer>> LOAD_RUNES_FOR_NPC_AND_MOBS() {

src/engine/db/handlers/dbItemHandler.java

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

src/engine/db/handlers/dbMobHandler.java

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

src/engine/db/handlers/dbNPCHandler.java

@@ -15,7 +15,6 @@ 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;
 
@@ -94,14 +93,12 @@ public class dbNPCHandler extends dbHandlerBase {
         return row_count;
     }
 
-    public ArrayList<NPC> GET_ALL_NPCS_FOR_ZONE(Zone zone) {
+    public ArrayList<NPC> GET_ALL_NPCS() {
 
         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` WHERE `object`.`parent` = ?;")) {
-
-            preparedStatement.setLong(1, zone.getObjectUUID());
+             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;")) {
 
             ResultSet rs = preparedStatement.executeQuery();
             npcList = getObjectsFromRs(rs, 1000);
@@ -131,32 +128,6 @@ public class dbNPCHandler extends dbHandlerBase {
         return npc;
     }
 
-    public int BANE_COMMANDER_EXISTS(final int objectUUID) {
-
-        int uid = 0;
-
-        String query = "SELECT `UID` FROM `obj_npc` WHERE `npc_buildingID` = ? LIMIT 1;";
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement(query)) {
-
-            preparedStatement.setInt(1, objectUUID);
-
-            try (ResultSet rs = preparedStatement.executeQuery()) {
-                if (rs.next()) {
-                    // Retrieve the UID column value
-                    uid = rs.getInt("UID");
-                }
-            }
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-
-        return uid;
-    }
-
-
     public int MOVE_NPC(long npcID, long parentID, float locX, float locY, float locZ) {
 
         int rowCount;
@@ -202,18 +173,6 @@ public class dbNPCHandler extends dbHandlerBase {
         return result;
     }
 
-    public static void updateSpecialPricing(final NPC npc){
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE obj_npc SET specialPrice=? WHERE UID = ?")) {
-            preparedStatement.setInt(1, npc.getSpecialPrice());
-            preparedStatement.setInt(2, npc.getDBID());
-
-            preparedStatement.executeUpdate();
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-    }
     public void updateDatabase(final NPC npc) {
 
         try (Connection connection = DbManager.getConnection();

src/engine/db/handlers/dbPowerHandler.java

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

src/engine/db/handlers/dbRuneBaseHandler.java

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

src/engine/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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.getUID());
+            preparedStatement.setInt(2, wh.UID);
 
             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.loadAllTransactions(warehouse);
             }
 
         } 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,25 +29,21 @@ public class dbZoneHandler extends dbHandlerBase {
         this.localObjectType = Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
-    public ArrayList<Zone> GET_ALL_NODES(Zone zone) {
-        ArrayList<Zone> wsmList = new ArrayList<>();
-        wsmList.addAll(zone.getNodes());
-        if (zone.absX == 0.0f) {
-            zone.absX = zone.getXCoord();
+    public ArrayList<Zone> GET_ALL_ZONES() {
+
+        ArrayList<Zone> zoneList = new ArrayList<>();
+
+        try (Connection connection = DbManager.getConnection();
+             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) {
-            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;
+
+        return zoneList;
     }
 
     public Zone GET_BY_UID(long ID) {
@@ -72,43 +68,38 @@ public class dbZoneHandler extends dbHandlerBase {
         return zone;
     }
 
-    public ArrayList<Zone> GET_MAP_NODES(final int objectUUID) {
-
-        ArrayList<Zone> zoneList = new ArrayList<>();
+    public void LOAD_ALL_ZONE_TEMPLATES() {
 
         try (Connection connection = DbManager.getConnection();
-             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);
-
-        } 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`;")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_zone_templates")) {
 
             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);
+                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);
         }
+
     }
 
     public boolean DELETE_ZONE(final Zone zone) {

src/engine/devcmd/cmds/AddGoldCmd.java

@@ -14,7 +14,6 @@ import engine.gameManager.ChatManager;
 import engine.objects.AbstractGameObject;
 import engine.objects.Item;
 import engine.objects.PlayerCharacter;
-import engine.server.MBServerStatics;
 
 /**
  * @author Eighty
@@ -47,10 +46,10 @@ public class AddGoldCmd extends AbstractDevCmd {
             throwbackError(pc, "Quantity must be a number, " + words[0] + " is invalid");
             return;
         }
-        if (amt < 1 || amt > MBServerStatics.PLAYER_GOLD_LIMIT) {
-            throwbackError(pc, "Quantity must be between 1 and " + MBServerStatics.PLAYER_GOLD_LIMIT);
+        if (amt < 1 || amt > 10000000) {
+            throwbackError(pc, "Quantity must be between 1 and 10000000 (10 million)");
             return;
-        } else if ((curAmt + amt) > MBServerStatics.PLAYER_GOLD_LIMIT) {
+        } else if ((curAmt + amt) > 10000000) {
             throwbackError(pc, "This would place your inventory over 10,000,000 gold.");
             return;
         }

src/engine/devcmd/cmds/AddMobCmd.java

@@ -10,22 +10,15 @@
 package engine.devcmd.cmds;
 
 import engine.Enum;
-import engine.Enum.GameObjectType;
-import engine.InterestManagement.InterestManager;
-import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.ChatManager;
-import engine.gameManager.DbManager;
-import engine.gameManager.LootManager;
 import engine.gameManager.ZoneManager;
-import engine.math.Vector3fImmutable;
-import engine.mobileAI.utilities.MovementUtilities;
-import engine.objects.*;
+import engine.objects.AbstractGameObject;
+import engine.objects.Mob;
+import engine.objects.PlayerCharacter;
+import engine.objects.Zone;
 import org.pmw.tinylog.Logger;
 
-/**
- * @author Eighty
- */
 public class AddMobCmd extends AbstractDevCmd {
 
     public AddMobCmd() {
@@ -42,27 +35,8 @@ public class AddMobCmd extends AbstractDevCmd {
 
         Zone zone = ZoneManager.findSmallestZone(pc.getLoc());
 
-        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) {
@@ -76,53 +50,24 @@ public class AddMobCmd extends AbstractDevCmd {
             return; // NaN
         }
 
-
         if (zone == null) {
             throwbackError(pc, "Failed to find zone to place mob in.");
             return;
         }
 
-        if (zone.isPlayerCity()) {
+        if (zone.guild_zone) {
             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);
-        //Mob mob = Mob.createStrongholdMob(loadID,pc.loc,Guild.getErrantGuild(),true,zone,null,0,"Whitehorn Militant",75);
         if (mob != null) {
             mob.updateDatabase();
             ChatManager.chatSayInfo(pc,
                     "Mob with ID " + mob.getDBID() + " added");
             this.setResult(String.valueOf(mob.getDBID()));
-
-            mob.parentZone = zone;
-            mob.bindLoc = pc.loc;
-            mob.setLoc(pc.loc);
-            mob.equipmentSetID = 6327;
-            mob.runAfterLoad();
-            mob.setLevel((short)75);
-            mob.setResists(new Resists("Elite"));
-            mob.spawnTime = 10;
-            mob.BehaviourType = Enum.MobBehaviourType.Aggro;
-            zone.zoneMobSet.add(mob);
-            mob.isHellgateMob = true;
-            LootManager.GenerateStrongholdLoot(mob,false,false);
-            mob.healthMax  = mob.mobBase.getHealthMax();
-            mob.setHealth(mob.healthMax);
-            mob.maxDamageHandOne = 1550;
-            mob.minDamageHandOne = 750;
-            mob.atrHandOne = 1800;
-            mob.defenseRating = 2200;
-            mob.setFirstName("Whitehorn Militant");
-            //InterestManager.setObjectDirty(mob);
-            //WorldGrid.addObject(mob,pc.loc.x,pc.loc.z);
-            //WorldGrid.updateObject(mob);
-            //guard.stronghold = mine;
-            mob.mobPowers.clear();
-            mob.mobPowers.put(429399948,20); // find weakness
-
-
         } else {
             throwbackError(pc, "Failed to create mob of type " + loadID);
             Logger.error("Failed to create mob of type "

src/engine/devcmd/cmds/AddNPCCmd.java

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

src/engine/devcmd/cmds/AuditHeightMapCmd.java

@@ -1,70 +0,0 @@
-// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
-// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
-// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
-// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
-// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
-//      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.getName() + " at location  " + zoneMicro.getLoc().toString() + " has " + size + " mobs. ");
-                        System.out.println(zoneMicro.getName() + " at location  " + zoneMicro.getLoc().toString() + " has " + size + " mobs. ");
+                        throwbackInfo(pcSender, zoneMicro.zoneName + " at location  " + zoneMicro.getLoc().toString() + " has " + size + " mobs. ");
+                        System.out.println(zoneMicro.zoneName + " 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.getName() + ", numMobs: " + zone.zoneMobSet.size());
+        throwbackInfo(pcSender, zone.zoneName + ", numMobs: " + zone.zoneMobSet.size());
         throwbackInfo(pcSender, "UUID, dbID, inRespawnMap, isAlive, activeAI, Loc");
 
 

src/engine/devcmd/cmds/DungenonCmd.java

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

src/engine/devcmd/cmds/GetHeightCmd.java

@@ -9,11 +9,10 @@
 
 package engine.devcmd.cmds;
 
-import engine.InterestManagement.HeightMap;
+import engine.InterestManagement.Terrain;
 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;
@@ -22,205 +21,79 @@ public class GetHeightCmd extends AbstractDevCmd {
 
     public GetHeightCmd() {
         super("getHeight");
-        this.addCmdString("height");
     }
 
     @Override
-    protected void _doCmd(PlayerCharacter pc, String[] words,
+    protected void _doCmd(PlayerCharacter playerCharacter, String[] words,
                           AbstractGameObject target) {
 
-        boolean end = true;
+        Zone currentZone;
+        Zone parentZone;
+        Zone heightmapZone;
 
-        float height = HeightMap.getWorldHeight(pc);
+        currentZone = ZoneManager.findSmallestZone(playerCharacter.getLoc());
+        heightmapZone = Terrain.getNextZoneWithTerrain(currentZone);
+        parentZone = Terrain.getNextZoneWithTerrain(currentZone.parent);
 
-        this.throwbackInfo(pc, "Altitude : " + height);
+        Vector2f childZoneLoc = ZoneManager.worldToTerrainSpace(playerCharacter.getLoc(), heightmapZone);
+        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);
 
-        this.throwbackInfo(pc, "Character Height: " + pc.getCharacterHeight());
-        this.throwbackInfo(pc, "Character Height to start swimming: " + pc.centerHeight);
+        float childHeight = heightmapZone.terrain.getInterpolatedTerrainHeight(childZoneLoc);
+        childHeight = childHeight + heightmapZone.global_height;
 
-        Zone zone = ZoneManager.findSmallestZone(pc.getLoc());
-        this.throwbackInfo(pc, "Water Level : " + zone.getSeaLevel());
-        this.throwbackInfo(pc, "Character Water Level Above : " + (pc.getCharacterHeight() + height - zone.getSeaLevel()));
+        float parentHeight = parentZone.terrain.getInterpolatedTerrainHeight(parentZoneLoc);
+        parentHeight += parentZone.global_height;
 
-        if (end)
-            return;
+        float blendedHeight = Terrain.getWorldHeight(currentZone, playerCharacter.getLoc());
 
-        Vector2f gridSquare;
-        Vector2f gridOffset;
-        Vector2f parentGrid;
-        Vector2f parentLoc = new Vector2f(-1, -1);
+        Vector2f terrainCell = heightmapZone.terrain.getTerrainCell(childZoneLoc);
+        Vector2f cell_offset = new Vector2f(terrainCell.x % 1, terrainCell.y % 1);
 
-        Zone currentZone = ZoneManager.findSmallestZone(pc.getLoc());
-
-        if (currentZone == null)
-            return;
-
-        Zone parentZone = currentZone.getParent();
-
-        HeightMap heightMap = currentZone.getHeightMap();
+        terrainCell.x = (float) Math.floor(terrainCell.x);
+        terrainCell.y = (float) Math.floor(terrainCell.y);
 
 
-        //find the next parents heightmap if the currentzone heightmap is null.
-        while (heightMap == null) {
+        short top_left_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x][(int) terrainCell.y];
+        short top_right_pixel = heightmapZone.terrain.terrain_pixel_data[(int) terrainCell.x + 1][(int) terrainCell.y];
+        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];
 
-            if (currentZone == ZoneManager.getSeaFloor()) {
-                this.throwbackInfo(pc, "Could not find a heightmap to get height.");
-                break;
-            }
+        this.throwbackInfo(playerCharacter, "Current Zone : " + currentZone.zoneName);
+        this.throwbackInfo(playerCharacter, "Heightmap Zone : " + heightmapZone.zoneName);
+        this.throwbackInfo(playerCharacter, "Parent Zone: " + parentZone.zoneName);
 
-            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, "Player loc: " + "[" + playerCharacter.loc.x + "]" + "[" + playerCharacter.loc.y + "]" + "[" + playerCharacter.loc.z + "]");
 
+        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 + "]");
 
-        if ((heightMap == null) || (currentZone == ZoneManager.getSeaFloor())) {
-            this.throwbackInfo(pc, currentZone.getName() + " has no heightmap ");
-            this.throwbackInfo(pc, "Current altitude: " + currentZone.absY);
-            return;
-        }
+        this.throwbackInfo(playerCharacter, "Child Zone Offset: " + "[" + childZoneOffset.x + "]" + "[" + childZoneOffset.y + "]");
+        this.throwbackInfo(playerCharacter, "Normalized offset: " + "[" + normalizedOffset.x + "]" + "[" + normalizedOffset.y + "]");
+        this.throwbackInfo(playerCharacter, "template blend Values: (max/min): " + heightmapZone.template.max_blend + " /" + heightmapZone.template.min_blend);
+        this.throwbackInfo(playerCharacter, "terrain values (max/min): " + heightmapZone.terrain.blend_values.x + " /" + heightmapZone.terrain.blend_values.y);
+        this.throwbackInfo(playerCharacter, "Blend coefficient: " + heightmapZone.terrain.getTerrainBlendCoefficient(childZoneOffset));
 
-        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, "------------");
 
+        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 "Temporarily Changes SubRace";
+        return "Queries heightmap engine";
     }
 
     @Override
     protected String _getUsageString() {
-        return "' /subrace mobBaseID";
+        return "' /getheight";
     }
 
 }

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.getName() + ": (x: " + difX + ", y: " + difY + ", z: " + difZ + ')');
+        throwbackInfo(pcSender, zone.zoneName + ": (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.getName() + "; UUID: " + zone.getObjectUUID() + ", loadNum: " + zone.getLoadNum());
+            throwbackInfo(pcSender, zone.zoneName + "; UUID: " + zone.getObjectUUID() + ", loadNum: " + zone.templateID);
     }
 
     @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.isPlayerCity())
+                if (zone.isNPCCity || zone.guild_zone)
                     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.getName().equalsIgnoreCase(cityName))
+                if (!zone.zoneName.equalsIgnoreCase(cityName))
                     continue;
                 if (zone != null) {
-                    if (zone.isNPCCity() || zone.isPlayerCity())
+                    if (zone.isNPCCity || zone.guild_zone)
                         loc = Vector3fImmutable.getRandomPointOnCircle(zone.getLoc(), MBServerStatics.TREE_TELEPORT_RADIUS);
                     else
                         loc = zone.getLoc();

src/engine/devcmd/cmds/HotzoneCmd.java

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

src/engine/devcmd/cmds/InfoCmd.java

@@ -15,13 +15,9 @@ import engine.Enum.GameObjectType;
 import engine.Enum.TargetColor;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.BuildingManager;
-import engine.gameManager.PowersManager;
 import engine.gameManager.SessionManager;
 import engine.math.Vector3fImmutable;
 import engine.objects.*;
-import engine.powers.EffectsBase;
-import engine.powers.PowersBase;
-import engine.server.MBServerStatics;
 import engine.util.StringUtils;
 
 import java.text.DecimalFormat;
@@ -224,16 +220,16 @@ public class InfoCmd extends AbstractDevCmd {
 
                 // List hirelings
 
-                if (targetBuilding.getHirelings().isEmpty() == false) {
+                if (targetBuilding.hirelings.isEmpty() == false) {
 
                     output += newline;
                     output += "Hirelings List: name / slot / floor";
 
-                    for (AbstractCharacter npc : targetBuilding.getHirelings().keySet()) {
+                    for (AbstractCharacter npc : targetBuilding.hirelings) {
 
                         if (npc.getObjectType() != GameObjectType.NPC)
                             continue;
-                        output += newline + npc.getName() + " slot " + targetBuilding.getHirelings().get(npc);
+                        output += newline + npc.getName() + " slot " + targetBuilding.hirelings.indexOf(npc);
                         output += newline + "location " + npc.getLoc();
                     }
                 }
@@ -335,19 +331,13 @@ public class InfoCmd extends AbstractDevCmd {
                 output += "Movement State: " + targetPC.getMovementState().name();
                 output += newline;
                 output += "Movement Speed: " + targetPC.getSpeed();
-                output += newline;
+
                 output += "Altitude : " + targetPC.getLoc().y;
-                output += newline;
+
                 output += "Swimming : " + targetPC.isSwimming();
                 output += newline;
                 output += "isMoving : " + targetPC.isMoving();
-                output += newline;
-                output += "Zerg Multiplier : " + targetPC.ZergMultiplier + newline;
-                output += "Hidden : " + targetPC.getHidden() + newline;
-                output += "Target Loc: " + targetPC.loc + newline;
-                output += "Player Loc: " + pc.loc + newline;
-                output += "Distance Squared: " + pc.loc.distanceSquared(targetPC.loc) + newline;
-                output += "IsBoxed: " + targetPC.isBoxed;
+
                 break;
 
             case NPC:
@@ -397,7 +387,7 @@ public class InfoCmd extends AbstractDevCmd {
                     output += newline;
                     output += "EquipSet: " + targetNPC.getEquipmentSetID();
                     output += newline;
-                    output += "Parent Zone LoadNum : " + targetNPC.getParentZone().getLoadNum();
+                    output += "Parent Zone LoadNum : " + targetNPC.getParentZone().templateID;
 
                 }
 
@@ -450,7 +440,9 @@ public class InfoCmd extends AbstractDevCmd {
                         output += "isSummonedPet: true";
                     else
                         output += "isSummonedPet: false";
-                    PlayerCharacter owner = targetMob.getOwner();
+
+
+                    PlayerCharacter owner = (PlayerCharacter) targetMob.guardCaptain;
                     if (owner != null)
                         output += "     owner: " + owner.getObjectUUID();
                     output += newline;
@@ -481,7 +473,7 @@ public class InfoCmd extends AbstractDevCmd {
                 output += "EquipSet: " + targetMob.equipmentSetID;
                 output += newline;
                 try {
-                    output += "Parent Zone LoadNum : " + targetMob.getParentZone().getLoadNum();
+                    output += "Parent Zone LoadNum : " + targetMob.getParentZone().templateID;
                 } catch (Exception ex) {
                     //who cares
                 }
@@ -502,16 +494,13 @@ public class InfoCmd extends AbstractDevCmd {
                     output += newline;
                     output += "No building found." + newline;
                 }
-
-                output += "Damage: " + targetMob.mobBase.getDamageMin() + " - " + targetMob.mobBase.getDamageMax() + newline;
-                output += "ATR: " + targetMob.mobBase.getAttackRating() + newline;
-                output += "DEF: " + targetMob.defenseRating + newline;
-                output += "RANGE: " + targetMob.getRange() + newline;
-                output += "Effects:" + newline;
-                for(MobBaseEffects mbe : targetMob.mobBase.mobbaseEffects){
-                    EffectsBase eb = PowersManager.getEffectByToken(mbe.getToken());
-                    output += eb.getName() + newline;
+                int max = (int)(4.882 * targetMob.level + 121.0);
+                if(max > 321){
+                    max = 321;
                 }
+                int min = (int)(4.469 * targetMob.level - 3.469);
+                output += "Min Loot Roll = " + min;
+                output += "Max Loot Roll = " + max;
                 break;
             case Item:  //intentional passthrough
             case MobLoot:
@@ -542,13 +531,6 @@ public class InfoCmd extends AbstractDevCmd {
                 }
 
                 break;
-
-            case Corpse:
-                Corpse corpse = (Corpse)target;
-                Long timeLeft = MBServerStatics.CORPSE_CLEANUP_TIMER_MS - (System.currentTimeMillis() - corpse.spawnedTime);
-                output += "Despawn in: " + timeLeft;
-                output += newline;
-                break;
         }
 
         throwbackInfo(pc, output);

src/engine/devcmd/cmds/MakeBaneCmd.java

@@ -111,12 +111,12 @@ public class MakeBaneCmd extends AbstractDevCmd {
             return;
         }
 
-        if (!zone.isPlayerCity()) {
+        if (!zone.guild_zone) {
             throwbackError(pc, "This is not a player city.");
             return;
         }
 
-        City city = City.getCity(zone.getPlayerCityUUID());
+        City city = City.getCity(zone.playerCityUUID);
         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));
-        stone.setRank((byte) rank);
+        BuildingManager.setRank(stone, (byte) rank);
         stone.setMaxHitPoints(blueprint.getMaxHealth(stone.getRank()));
         stone.setCurrentHitPoints(stone.getMaxHitPoints());
         BuildingManager.setUpgradeDateTime(stone, null, 0);

src/engine/devcmd/cmds/MineActiveCmd.java

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

src/engine/devcmd/cmds/PrintEffectsCmd.java

@@ -9,67 +9,59 @@
 
 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.PowersManager;
-import engine.gameManager.SessionManager;
-import engine.math.Vector3fImmutable;
 import engine.objects.*;
-import engine.powers.EffectsBase;
-import engine.server.MBServerStatics;
-import engine.util.StringUtils;
-
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.concurrent.ConcurrentHashMap;
 
+import java.util.HashMap;
 
 /**
- * @author
+ *
  */
+
 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) {
 
-        if(!target.getObjectType().equals(GameObjectType.PlayerCharacter)) {
-            throwbackInfo(pc, "Target Must PlayerCharacter");
-            return;
-        }
-        String newline = "\r\n ";
-        String output = "Effects for Player:" + newline;
+        AbstractCharacter tar;
 
-        AbstractCharacter absTar = (AbstractCharacter) target;
+        if (target != null && target instanceof AbstractCharacter) {
+            tar = (AbstractCharacter) target;
 
-        for(String key : absTar.effects.keySet()){
-            Effect eff = absTar.effects.get(key);
-            if(eff.getJobContainer() != null) {
-                output += "[" + key + "] " + eff.getName() + " (" + eff.getTrains() + ") " + eff.getJobContainer().timeToExecutionLeft() * 0.001f + newline;
-            }else{
-                output += eff.getName() + " (" + eff.getTrains() + ") " + "PERMANENT" + newline;
+            String newline = "\r\n ";
+            String output = "Effects For Character: " + tar.getName() + newline;
+
+            for(String effect : tar.effects.keySet()){
+                output += effect + newline;
             }
+            throwbackInfo(pc, output);
         }
-
-        throwbackInfo(pc, output);
     }
 
     @Override
     protected String _getHelpString() {
-        return "Gets information on an Object.";
+        return "Returns the player's current stats";
     }
 
     @Override
     protected String _getUsageString() {
-        return "' /info targetID'";
+        return "' /printstats'";
     }
 
 }

src/engine/devcmd/cmds/PrintRunesCmd.java

@@ -9,56 +9,59 @@
 
 package engine.devcmd.cmds;
 
-import engine.Enum.ItemContainerType;
-import engine.Enum.ItemType;
-import engine.Enum.OwnerType;
 import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.ChatManager;
-import engine.gameManager.DbManager;
 import engine.objects.*;
-import engine.powers.EffectsBase;
-import engine.server.MBServerStatics;
 
-import java.util.ArrayList;
+import java.util.HashMap;
 
 /**
- * @author Eighty
+ *
  */
-public class GimmeCmd extends AbstractDevCmd {
 
-    public GimmeCmd() {
-        super("gimme");
+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) {
-        int amt = 0;
-        int currentGold = pc.getCharItemManager().getGoldInventory().getNumOfItems();
-        amt = MBServerStatics.PLAYER_GOLD_LIMIT - currentGold;
-        if (!pc.getCharItemManager().addGoldToInventory(amt, true)) {
-            throwbackError(pc, "Failed to add gold to inventory");
-            return;
+
+        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);
         }
-
-        ChatManager.chatSayInfo(pc, amt + " gold added to inventory");
-
-        if(pc.level < 75) {
-            pc.setLevel((short) 75);
-            ChatManager.chatSayInfo(pc, "Level set to 75");
-        }
-        pc.getCharItemManager().updateInventory();
-
     }
 
     @Override
     protected String _getHelpString() {
-        return "Round up current gold in inventory to 10,000,000";
+        return "Returns the player's current stats";
     }
 
     @Override
     protected String _getUsageString() {
-        return "'./gimme";
+        return "' /printstats'";
     }
 
 }

src/engine/devcmd/cmds/PrintSkillsCmd.java

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

src/engine/devcmd/cmds/PrintStatsCmd.java

@@ -9,9 +9,7 @@
 
 package engine.devcmd.cmds;
 
-import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.PowersManager;
 import engine.objects.*;
 
 import java.util.HashMap;
@@ -58,43 +56,23 @@ public class PrintStatsCmd extends AbstractDevCmd {
 
     public void printStatsPlayer(PlayerCharacter pc, PlayerCharacter tar) {
         String newline = "\r\n ";
-
-        String newOut = "Server stats for Player " + tar.getFirstName() + newline;
-        newOut += "HEALTH: " + tar.getHealth() + " / " + tar.getHealthMax() + newline;
-        newOut += "MANA: " + tar.getMana() + " / " + tar.getManaMax() + newline;
-        newOut += "STAMINA: " + tar.getStamina() + " / " + tar.getStaminaMax() + newline;
-        newOut += "Unused Stats: " + tar.getUnusedStatPoints() + newline;
-        newOut += "Stats Base (Modified)" + newline;
-        newOut += "  Str: " + (int) tar.statStrBase + " (" + tar.getStatStrCurrent() + ')' + ", maxStr: " + tar.getStrMax() + newline;
-        newOut += "  Dex: " + (int) tar.statDexBase + " (" + tar.getStatDexCurrent() + ')' + ", maxDex: " + tar.getDexMax() + newline;
-        newOut += "  Con: " + (int) tar.statConBase + " (" + tar.getStatConCurrent() + ')' + ", maxCon: " + tar.getConMax() + newline;
-        newOut += "  Int: " + (int) tar.statIntBase + " (" + tar.getStatIntCurrent() + ')' + ", maxInt: " + tar.getIntMax() + newline;
-        newOut += "  Spi: " + (int) tar.statSpiBase + " (" + tar.getStatSpiCurrent() + ')' + ", maxSpi: " + tar.getSpiMax() + newline;
-        newOut += "Move Speed: " + tar.getSpeed() + newline;
-        newOut += "Health Regen: " + tar.combatStats.healthRegen + newline;
-        newOut += "Mana Regen: " + tar.combatStats.manaRegen + newline;
-        newOut += "Stamina Regen: " + tar.combatStats.staminaRegen + newline;
-        newOut += "DEFENSE: " + tar.combatStats.defense + newline;
-        newOut += "HAND ONE" + newline;
-        newOut += "ATR: " +  tar.combatStats.atrHandOne + newline;
-        newOut += "MIN: " + tar.combatStats.minDamageHandOne + newline;
-        newOut += "MAX: " + tar.combatStats.maxDamageHandOne + newline;
-        newOut += "RANGE: " + tar.combatStats.rangeHandOne + newline;
-        newOut += "ATTACK SPEED: " + tar.combatStats.attackSpeedHandOne + newline;
-        newOut += "HAND TWO" + newline;
-        newOut += "ATR: " + tar.combatStats.atrHandTwo + newline;
-        newOut += "MIN: " + tar.combatStats.minDamageHandTwo + newline;
-        newOut += "MAX: " + tar.combatStats.maxDamageHandTwo + newline;
-        newOut += "RANGE: " + tar.combatStats.rangeHandTwo + newline;
-        newOut += "ATTACK SPEED: " + tar.combatStats.attackSpeedHandTwo + newline;
-        newOut += "IS BOXED: " + tar.isBoxed + newline;
-        newOut += "=== POWERS ===" + newline;
-        for(CharacterPower power : pc.getPowers().values()){
-            if(power.getPower().requiresHitRoll) {
-                newOut += power.getPower().name + " ATR: " + Math.round(PlayerCombatStats.getSpellAtr(pc,power.getPower())) + newline;
-            }
-        }
-        throwbackInfo(pc, newOut);
+        String out = "Server stats for Player " + tar.getFirstName() + newline;
+        out += "Unused Stats: " + tar.getUnusedStatPoints() + newline;
+        out += "Stats Base (Modified)" + newline;
+        out += "  Str: " + (int) tar.statStrBase + " (" + tar.getStatStrCurrent() + ')' + ", maxStr: " + tar.getStrMax() + newline;
+        out += "  Dex: " + (int) tar.statDexBase + " (" + tar.getStatDexCurrent() + ')' + ", maxDex: " + tar.getDexMax() + newline;
+        out += "  Con: " + (int) tar.statConBase + " (" + tar.getStatConCurrent() + ')' + ", maxCon: " + tar.getConMax() + newline;
+        out += "  Int: " + (int) tar.statIntBase + " (" + tar.getStatIntCurrent() + ')' + ", maxInt: " + tar.getIntMax() + newline;
+        out += "  Spi: " + (int) tar.statSpiBase + " (" + tar.getStatSpiCurrent() + ')' + ", maxSpi: " + tar.getSpiMax() + newline;
+        throwbackInfo(pc, out);
+        out = "Health: " + tar.getHealth() + ", maxHealth: " + tar.getHealthMax() + newline;
+        out += "Mana: " + tar.getMana() + ", maxMana: " + tar.getManaMax() + newline;
+        out += "Stamina: " + tar.getStamina() + ", maxStamina: " + tar.getStaminaMax() + newline;
+        out += "Defense: " + tar.getDefenseRating() + newline;
+        out += "Main Hand: atr: " + tar.getAtrHandOne() + ", damage: " + tar.getMinDamageHandOne() + " to " + tar.getMaxDamageHandOne() + ", speed: " + tar.getSpeedHandOne() + newline;
+        out += "Off Hand:  atr: " + tar.getAtrHandTwo() + ", damage: " + tar.getMinDamageHandTwo() + " to " + tar.getMaxDamageHandTwo() + ", speed: " + tar.getSpeedHandTwo() + newline;
+        out += "isAlive: " + tar.isAlive() + ", Combat: " + tar.isCombat() + newline;
+        throwbackInfo(pc, out);
     }
 
     public void printStatsMob(PlayerCharacter pc, Mob tar) {
@@ -125,15 +103,19 @@ public class PrintStatsCmd extends AbstractDevCmd {
             main = getWeaponBase(1, equip);
         ItemBase off = null;
 
-        if (equip != null)
-            getWeaponBase(2, equip);
-        if (main == null && off == null) {
-            out += "Main Hand: atr: " + tar.getAtrHandOne() + ", damage: " + tar.getMinDamageHandOne() + " to " + tar.getMaxDamageHandOne() + ", speed: " + tar.getSpeedHandOne() + ", range: 6" + newline;
-        } else {
-            if (main != null)
-                out += "Main Hand: atr: " + tar.getAtrHandOne() + ", damage: " + tar.getMinDamageHandOne() + " to " + tar.getMaxDamageHandOne() + ", speed: " + tar.getSpeedHandOne() + ", range: " + main.getRange() + newline;
-            if (off != null)
-                out += "Main Hand: atr: " + tar.getAtrHandTwo() + ", damage: " + tar.getMinDamageHandTwo() + " to " + tar.getMaxDamageHandTwo() + ", speed: " + tar.getSpeedHandTwo() + ", range: " + off.getRange() + newline;
+        if(equip != null){
+           if(equip.get(2) != null && !equip.get(2).getItemBase().isShield()){
+                //off hand weapon
+                out += "Attack Rating: " + tar.atrHandTwo + newline;
+                out += "Damage: " + tar.minDamageHandTwo + " - " + tar.maxDamageHandTwo + newline;
+                out += "Range: " + tar.rangeHandTwo + newline;
+               out += "Attack Speed: " + tar.speedHandTwo + newline;
+            } else{
+               out += "Attack Rating: " + tar.atrHandOne + newline;
+               out += "Damage: " + tar.minDamageHandOne + " - " + tar.maxDamageHandOne + newline;
+               out += "Range: " + tar.rangeHandOne + newline;
+               out += "Attack Speed: " + tar.speedHandOne + newline;
+            }
         }
         out += "isAlive: " + tar.isAlive() + ", Combat: " + tar.isCombat() + newline;
 

src/engine/devcmd/cmds/PurgeObjectsCmd.java

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

src/engine/devcmd/cmds/RealmInfoCmd.java

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

src/engine/devcmd/cmds/RegionCmd.java

@@ -9,9 +9,10 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
-import engine.objects.AbstractGameObject;
-import engine.objects.PlayerCharacter;
+import engine.gameManager.BuildingManager;
+import engine.objects.*;
 
 import java.lang.reflect.Field;
 
@@ -25,42 +26,28 @@ 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;
 
-        if (pc.region == null) {
+        Building building = BuildingManager.getBuildingAtLocation(((AbstractCharacter) target).loc);
+        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;
         }
 
-
-        String newLine = System.getProperty("line.separator");
-        String result = "";
-        result += (pc.region.getClass().getSimpleName());
-        result += (" {");
-        result += (newLine);
-        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);
+        if(region != null) {
+            output += "Player Info: " + ((AbstractCharacter) target).getName() + newline;
+            output +=  "Region Building: " + building.getName() + newline;
+            output +=  "Region Height: " + region.lerpY((AbstractCharacter)target) + newline;
+            output +=  "is Stairs: " + region.isStairs() + newline;
+            output += "is Outside: " + region.isOutside();
+            this.throwbackInfo(pc, output);
         }
-        result += ("}");
-
-        this.throwbackInfo(pc, result.toString());
-
 
     }
 

src/engine/devcmd/cmds/RemoveBaneCmd.java

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

src/engine/devcmd/cmds/RemoveObjectCmd.java

@@ -11,7 +11,6 @@ package engine.devcmd.cmds;
 
 import engine.Enum.BuildingGroup;
 import engine.Enum.DbObjectType;
-import engine.Enum.GameObjectType;
 import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.BuildingManager;
@@ -131,56 +130,23 @@ public class RemoveObjectCmd extends AbstractDevCmd {
             building.disableSpire(false);
 
         if ((building.getBlueprint() != null) && (building.getBlueprint().getBuildingGroup() == BuildingGroup.WAREHOUSE)) {
-            City city = City.getCity(building.getParentZone().getPlayerCityUUID());
+            City city = City.getCity(building.getParentZone().playerCityUUID);
             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);
 
-        for (AbstractCharacter ac : building.getHirelings().keySet()) {
-            NPC npc = null;
-            Mob mobA = null;
+        // Remove hirelings for this building
 
-            if (ac.getObjectType() == GameObjectType.NPC)
-                npc = (NPC) ac;
-            else if (ac.getObjectType() == GameObjectType.Mob)
-                mobA = (Mob) ac;
+        for (AbstractCharacter abstractCharacter : building.hirelings)
+            BuildingManager.removeHireling(building, abstractCharacter);
 
-            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);
@@ -207,13 +173,15 @@ public class RemoveObjectCmd extends AbstractDevCmd {
         // Remove npc from hirelings list.
 
         if (npc.building != null)
-            npc.building.getHirelings().remove(npc);
+            npc.building.hirelings.remove(npc);
 
-        for (Mob mob : npc.getSiegeMinionMap().keySet()) {
-            WorldGrid.RemoveWorldObject(mob);
-            WorldGrid.removeObject(mob, pc);
-            if (mob.getParentZone() != null)
-                mob.getParentZone().zoneMobSet.remove(mob);
+        for (Integer minionUUID : npc.minions) {
+            Mob minionMob = Mob.getMob(minionUUID);
+            WorldGrid.RemoveWorldObject(minionMob);
+            WorldGrid.removeObject(minionMob, pc);
+
+            if (minionMob.getParentZone() != null)
+                minionMob.getParentZone().zoneMobSet.remove(minionMob);
         }
 
         DbManager.NPCQueries.DELETE_NPC(npc);
@@ -242,7 +210,7 @@ public class RemoveObjectCmd extends AbstractDevCmd {
         // Remove npc from hirelings list.
 
         if (mob.building != null)
-            mob.building.getHirelings().remove(mob);
+            mob.building.hirelings.remove(mob);
 
         mob.setLoc(Vector3fImmutable.ZERO);    //Move it off the plane..
         mob.setBindLoc(Vector3fImmutable.ZERO);    //Reset the bind loc..

src/engine/devcmd/cmds/SetBaneActiveCmd.java

@@ -41,12 +41,12 @@ public class SetBaneActiveCmd extends AbstractDevCmd {
             return;
         }
 
-        if (!zone.isPlayerCity()) {
+        if (!zone.guild_zone) {
             throwbackError(pc, "This is not a player city.");
             return;
         }
 
-        City city = City.getCity(zone.getPlayerCityUUID());
+        City city = City.getCity(zone.playerCityUUID);
         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.getPlayerCityUUID() == 0)
+        if (zone.playerCityUUID == 0)
             return;
-        City city = City.getCity(zone.getPlayerCityUUID());
+        City city = City.getCity(zone.playerCityUUID);
         if (city == null)
             return;
         city.setForceRename(rename);

src/engine/devcmd/cmds/SetLevelCmd.java

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

src/engine/devcmd/cmds/SetRankCmd.java

@@ -57,7 +57,7 @@ public class SetRankCmd extends AbstractDevCmd {
                     Blueprint blueprint = targetBuilding.getBlueprint();
 
                     if (blueprint == null) {
-                        targetBuilding.setRank(targetRank);
+                        BuildingManager.setRank(targetBuilding, targetRank);
                         ChatManager.chatSayInfo(player, "Building ranked without blueprint" + targetBuilding.getObjectUUID());
                         return;
                     }
@@ -68,9 +68,8 @@ 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:
@@ -114,7 +113,7 @@ public class SetRankCmd extends AbstractDevCmd {
 
             // Set the current targetRank
             int lastMeshID = targetBuilding.getMeshUUID();
-            targetBuilding.setRank(targetRank);
+            BuildingManager.setRank(targetBuilding, 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.setTargetType(pc.getObjectType().ordinal());
+        //			pum.setStartLocType(pc.getObjectType().ordinal());
         //			pum.setTargetID(pc.getObjectUUID());
         //			pum.setNumTrains(40);
         //			pum.setDuration(-1);

src/engine/devcmd/cmds/SimulateBootyCmd.java

@@ -1,6 +1,5 @@
 package engine.devcmd.cmds;
 
-import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.LootManager;
 import engine.gameManager.ZoneManager;
@@ -11,8 +10,6 @@ import java.util.ArrayList;
 import java.util.concurrent.ThreadLocalRandom;
 
 public class SimulateBootyCmd extends AbstractDevCmd {
-
-    public int simCount = 250;
     public SimulateBootyCmd() {
         super("bootysim");
     }
@@ -27,61 +24,8 @@ public class SimulateBootyCmd extends AbstractDevCmd {
         String newline = "\r\n ";
 
         String output;
-        if(target.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)){
-            int ATR = Integer.parseInt(words[0]);
-            int DEF = Integer.parseInt(words[1]);
-            int attacks = Integer.parseInt(words[2]);
 
-            int hits = 0;
-            int misses = 0;
-            int defaultHits = 0;
-            int defualtMisses = 0;
-
-            float chance = (ATR-((ATR+DEF) * 0.315f)) / ((DEF-((ATR+DEF) * 0.315f)) + (ATR-((ATR+DEF) * 0.315f)));
-            float convertedChance = chance * 100;
-            output = "" + newline;
-            output += "DEF VS ATR SIMULATION: " + attacks + " ATTACKS SIMULATED" + newline;
-            output += "DEF = " + DEF + newline;
-            output += "ATR = " + ATR + newline;
-            output += "CHANCE TO LAND HIT: " + convertedChance + "%" + newline;
-            if(convertedChance < 5){
-                output += "CHANCE ADJUSTED TO 5.0%" + newline;
-                convertedChance = 5.0f;
-            }
-            if(convertedChance > 95){
-                output += "CHANCE ADJUSTED TO 95.0%" + newline;
-                convertedChance = 95.0f;
-            }
-            for(int i = 0; i < attacks; i++){
-                int roll = ThreadLocalRandom.current().nextInt(101);
-
-                if(roll <= convertedChance){
-                    hits += 1;
-                }else{
-                    misses += 1;
-                }
-            }
-
-            float totalHits = defaultHits + hits;
-            float totalMisses = defualtMisses + misses;
-            float hitPercent = Math.round(totalHits / attacks * 100);
-            float missPercent = Math.round(totalMisses / attacks * 100);
-
-            output += "HITS LANDED: " + (defaultHits + hits) + "(" + Math.round(hitPercent) + "%)" + newline;
-            output += "HITS MISSED: " + (defualtMisses + misses) + "(" + Math.round(missPercent) + "%)";
-
-            throwbackInfo(playerCharacter,output);
-            return;
-        }
-        try
-        {
-            simCount = Integer.parseInt(words[0]);
-        }catch(Exception e)
-        {
-
-        }
-
-        output = "Booty Simulation: Rolls:" + simCount + newline;
+        output = "Booty Simulation:" + newline;
 
         Mob mob = (Mob) target;
         output += "Name: " + mob.getName() + newline;
@@ -100,7 +44,6 @@ public class SimulateBootyCmd extends AbstractDevCmd {
         ArrayList<Item> Resources = new ArrayList<Item>();
         ArrayList<Item> Runes = new ArrayList<Item>();
         ArrayList<Item> Contracts = new ArrayList<Item>();
-        ArrayList<Item> GuardContracts = new ArrayList<Item>();
         ArrayList<Item> Offerings = new ArrayList<Item>();
         ArrayList<Item> OtherDrops = new ArrayList<Item>();
         ArrayList<Item> EquipmentDrops = new ArrayList<Item>();
@@ -108,17 +51,14 @@ public class SimulateBootyCmd extends AbstractDevCmd {
         int failures = 0;
         int goldAmount = 0;
 
-        for (int i = 0; i < simCount; ++i) {
+        for (int i = 0; i < 100; ++i) {
 
             try {
                 mob.loadInventory();
                 for (Item lootItem : mob.getCharItemManager().getInventory()) {
                     switch (lootItem.getItemBase().getType()) {
                         case CONTRACT: //CONTRACT
-                            if(lootItem.getName().contains("Captain"))
-                                GuardContracts.add(lootItem);
-                            else
-                                Contracts.add(lootItem);
+                            Contracts.add(lootItem);
                             break;
                         case OFFERING: //OFFERING
                             Offerings.add(lootItem);
@@ -190,17 +130,9 @@ public class SimulateBootyCmd extends AbstractDevCmd {
             }
         }
 
-        int baseBound = 100000;
-        int levelPenalty = (int) (Math.max(0, Math.abs(50 - mob.level)) * 0.01 * 100000);
-        int totalRange = baseBound + levelPenalty;
-        if(mob.level >= 50){
-            totalRange = baseBound;
-        }
-        output += "TOTAL ROLL POTENTIAL: " + totalRange + newline;
         output += "GLASS DROPS: " + GlassItems.size() + newline;
         output += "RUNE DROPS: " + Runes.size() + newline;
         output += "CONTRACTS DROPS: " + Contracts.size() + newline;
-        output += "GUARD CONTRACTS DROPS: " + GuardContracts.size() + newline;
         output += "RESOURCE DROPS: " + Resources.size() + newline;
         output += "OFFERINGS DROPPED: " + Offerings.size() + newline;
         output += "ENCHANTED ITEMS DROPPED: " + OtherDrops.size() + newline;

src/engine/devcmd/cmds/SlotTestCmd.java

@@ -53,7 +53,7 @@ public class SlotTestCmd extends AbstractDevCmd {
 
             int slot = Integer.parseInt(args[0]);
             Vector3fImmutable slotLocation;
-            BuildingLocation buildingLocation = BuildingManager._slotLocations.get(building.meshUUID).get(slot - 1);
+            BuildingLocation buildingLocation = BuildingManager._slotLocations.get(building.meshUUID).get(slot);
             slotLocation = building.getLoc().add(buildingLocation.getLocation());
             slotLocation = Vector3fImmutable.rotateAroundPoint(building.getLoc(), slotLocation, building.getBounds().getQuaternion().angleY);
             playerCharacter.teleport(slotLocation);
@@ -61,17 +61,17 @@ public class SlotTestCmd extends AbstractDevCmd {
         }
 
         for (BuildingLocation buildingLocation : BuildingManager._slotLocations.get(building.meshUUID))
-            outString += buildingLocation.getSlot() + buildingLocation.getLocation().toString() + "\r\n";
+            outString += buildingLocation.getSlot() - 1 + buildingLocation.getLocation().toString() + "\r\n";
 
         outString += "\r\nNext Available Slot: " + BuildingManager.getAvailableSlot(building);
 
-        if (building.getHirelings().isEmpty() == false) {
+        if (building.hirelings.isEmpty() == false) {
 
             outString += "\r\n\r\n";
             outString += "Hirelings List:";
 
-            for (AbstractCharacter hireling : building.getHirelings().keySet())
-                outString += "\r\n" + hireling.getName() + " slot : " + building.getHirelings().get(hireling);
+            for (AbstractCharacter hireling : building.hirelings)
+                outString += "\r\n" + hireling.getName() + " slot : " + building.hirelings.indexOf(hireling);
 
         }
 

src/engine/devcmd/cmds/SplatMobCmd.java

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

src/engine/devcmd/cmds/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.getName();
+                    location = zone.zoneName;
                 RecvSummonsRequestMsg rsrm = new RecvSummonsRequestMsg(pc.getObjectType().ordinal(), pc.getObjectUUID(), pc.getFirstName(),
                         location, false);
                 toSummon.getClientConnection().sendMsg(rsrm);

src/engine/devcmd/cmds/ZoneInfoCmd.java

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

src/engine/devcmd/cmds/aiInfoCmd.java

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

src/engine/gameManager/ArenaManager.java

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

src/engine/gameManager/BuildingManager.java

@@ -19,10 +19,7 @@ import engine.job.JobScheduler;
 import engine.jobs.UpgradeBuildingJob;
 import engine.math.Bounds;
 import engine.math.Vector3fImmutable;
-import engine.net.client.ClientConnection;
 import engine.net.client.msg.ErrorPopupMsg;
-import engine.net.client.msg.ManageCityAssetsMsg;
-import engine.net.client.msg.PlaceAssetMsg;
 import engine.objects.*;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
@@ -31,6 +28,7 @@ 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 {
@@ -40,6 +38,9 @@ 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);
@@ -52,12 +53,14 @@ public enum BuildingManager {
 
         int numOfSlots = _slotLocations.get(building.meshUUID).size();
 
-        for (int i = 1; i <= numOfSlots; i++) {
+        if (building.hirelings.isEmpty())
+            return 0;
+
+        if (building.hirelings.size() == numOfSlots)
+            return -1;
+
+        return building.hirelings.size();
 
-            if (!building.getHirelings().containsValue(i))
-                return i;
-        }
-        return -1;
     }
 
     public static int getLastAvailableSlot(Building building) {
@@ -72,12 +75,13 @@ public enum BuildingManager {
 
         int numOfSlots = _slotLocations.get(building.meshUUID).size();
 
-        for (int i = numOfSlots; i > 0; i--) {
+        if (building.hirelings.isEmpty())
+            return numOfSlots - 1;
 
-            if (!building.getHirelings().containsValue(i))
-                return i;
-        }
-        return -1;
+        if (building.hirelings.size() == numOfSlots)
+            return -1;
+
+        return numOfSlots - 1;
     }
 
     public static BuildingLocation getSlotLocation(Building building, int slot) {
@@ -87,7 +91,7 @@ public enum BuildingManager {
         if (slot == -1)
             return buildingLocation;
 
-        buildingLocation = _slotLocations.get(building.meshUUID).get(slot - 1); // array index
+        buildingLocation = _slotLocations.get(building.meshUUID).get(slot); // array index
 
         if (buildingLocation == null) {
             Logger.error("Invalid slot for building: " + building.getObjectUUID());
@@ -96,6 +100,20 @@ public enum BuildingManager {
         return buildingLocation;
     }
 
+    public static void updateHirelingSlots(Building building) {
+
+        // Method updates all hirelings with the slot locations
+        // for the current mesh.  The position and region can change
+        // such as when upgrading a TOL to R8.
+
+        for (AbstractCharacter hireling : building.hirelings) {
+
+            hireling.setLoc(getSlotLocation(building, building.hirelings.indexOf(hireling)).getLocation());
+            InterestManager.setObjectDirty(hireling);
+        }
+
+    }
+
     public static boolean playerCanManage(PlayerCharacter player, Building building) {
 
         if (player == null)
@@ -104,7 +122,6 @@ public enum BuildingManager {
         if (building == null)
             return false;
 
-
         if (building.getRank() == -1)
             return false;
 
@@ -112,26 +129,25 @@ public enum BuildingManager {
             return true;
 
         //individual friend.
-        if (building.getFriends().get(player.getObjectUUID()) != null)
+        if (building.getFriends() != null && building.getFriends().get(player.getObjectUUID()) != null)
             return true;
 
-        //Admin's can access stuff
+        //Admins can access stuff
 
         if (player.isCSR())
             return true;
 
         //Guild stuff
 
-
-        if (building.getGuild() != null && building.getGuild().isGuildLeader(player.getObjectUUID()))
+        if (building.getGuild().isGuildLeader(player.getObjectUUID()))
             return true;
 
         if (building.getFriends().get(player.getGuild().getObjectUUID()) != null
-                && building.getFriends().get(player.getGuild().getObjectUUID()).getFriendType() == 8)
+                && building.getFriends().get(player.getGuild().getObjectUUID()).friendType == 8)
             return true;
 
         if (building.getFriends().get(player.getGuild().getObjectUUID()) != null
-                && building.getFriends().get(player.getGuild().getObjectUUID()).getFriendType() == 9
+                && building.getFriends().get(player.getGuild().getObjectUUID()).friendType == 9
                 && GuildStatusController.isInnerCouncil(player.getGuildStatus()))
             return true;
 
@@ -232,15 +248,15 @@ public enum BuildingManager {
                         ChatManager.chatSystemInfo(player, "You can not carry any more of that item.");
                         return false;
                     }
-                    if (warehouse.getResources().get(resourceBase) == null)
+                    if (warehouse.resources.get(resourceBase) == null)
                         continue;
 
-                    int resourceAmount = warehouse.getResources().get(resourceBase);
+                    int resourceAmount = warehouse.resources.get(resourceBase);
 
                     if (resourceAmount <= 0)
                         continue;
 
-                    if (warehouse.loot(player, resourceBase, resourceAmount, true))
+                    if (Warehouse.loot(warehouse, player, resourceBase, resourceAmount, true))
                         ChatManager.chatInfoInfo(player, "You have looted " + resourceAmount + ' ' + resourceBase.getName());
                 }
                 break;
@@ -289,7 +305,7 @@ public enum BuildingManager {
 
     // Method transfers ownership of all hirelings in a building
 
-    public static void refreshHirelings(Building building) {
+    public static void updateHirelingGuilds(Building building) {
 
         if (building == null)
             return;
@@ -301,13 +317,79 @@ public enum BuildingManager {
         else
             newGuild = building.getOwner().getGuild();
 
-        for (AbstractCharacter hireling : building.getHirelings().keySet()) {
+        for (AbstractCharacter hireling : building.hirelings) {
             hireling.setGuild(newGuild);
             WorldGrid.updateObject(hireling);
         }
 
     }
 
+    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.hirelings.remove(hireling);
+
+        // Remove from zone mob set
+
+        if (hireling.getObjectType().equals(GameObjectType.Mob)) {
+
+            Mob hirelingMob = (Mob) hireling;
+
+            if (hirelingMob.getParentZone() != null)
+                if (hirelingMob.getParentZone().zoneMobSet.contains(hirelingMob))
+                    hirelingMob.getParentZone().zoneMobSet.remove(hireling);
+
+        }
+
+        if (hireling.getObjectType().equals(GameObjectType.NPC)) {
+
+            NPC hirelingNPC = (NPC) hireling;
+
+            if (hirelingNPC.getParentZone() != null)
+                if (hirelingNPC.getParentZone().zoneNPCSet.contains(hirelingNPC))
+                    hirelingNPC.getParentZone().zoneNPCSet.remove(hireling);
+
+        }
+
+        // Unload hireling from world
+
+        DbManager.removeFromCache(hireling);
+        WorldGrid.RemoveWorldObject(hireling);
+        WorldGrid.removeObject(hireling);
+
+        // Delete hireling from database
+
+        if (hireling.getObjectType().equals(GameObjectType.Mob))
+            DbManager.MobQueries.DELETE_MOB((Mob) hireling);
+        else
+            DbManager.NPCQueries.DELETE_NPC((NPC) hireling);
+
+    }
+
+
     public static void cleanupHirelings(Building building) {
 
         // Early exit:  Cannot have hirelings in a building
@@ -320,46 +402,25 @@ public enum BuildingManager {
 
         if (building.getRank() < 1) {
 
-            for (AbstractCharacter slottedNPC : building.getHirelings().keySet()) {
+            for (AbstractCharacter slottedNPC : building.hirelings)
+                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;
+        for (AbstractCharacter hireling : building.hirelings) {
 
-            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()))
-
-                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);
-                }
+            if (building.hirelings.indexOf(hireling) + 1 > building.getBlueprint().getSlotsForRank(building.getRank()))
+                BuildingManager.removeHireling(building, hireling);
 
         }
 
-        refreshHirelings(building);
+        // Update hireling guilds and locations
+
+        updateHirelingGuilds(building);
+        updateHirelingSlots(building);
     }
 
     public static Building getBuilding(int id) {
@@ -438,18 +499,6 @@ public enum BuildingManager {
 
     public static boolean IsPlayerHostile(Building building, PlayerCharacter player) {
 
-        if(building.getBlueprint() != null && building.getBlueprint().getBuildingGroup() != null && building.getBlueprint().getBuildingGroup().equals(BuildingGroup.BANESTONE))
-        {
-            Guild playerNation = player.guild.getNation();
-            City banedCity = ZoneManager.getCityAtLocation(building.loc);
-            if(banedCity != null){
-                if(banedCity.getGuild().getNation().equals(playerNation)){
-                    return false;
-                }else{
-                    return true;
-                }
-            }
-        }
         //Nation Members and Guild members are not hostile.
         //		if (building.getGuild() != null){
         //			if (pc.getGuild() != null)
@@ -464,18 +513,18 @@ public enum BuildingManager {
 
             Condemned condemn = building.getCondemned().get(player.getObjectUUID());
 
-            if (condemn != null && condemn.isActive())
+            if (condemn != null && condemn.active)
                 return true;
 
             if (player.getGuild() != null) {
 
                 Condemned guildCondemn = building.getCondemned().get(player.getGuild().getObjectUUID());
 
-                if (guildCondemn != null && guildCondemn.isActive())
+                if (guildCondemn != null && guildCondemn.active)
                     return true;
 
                 Condemned nationCondemn = building.getCondemned().get(player.getGuild().getNation().getObjectUUID());
-                return nationCondemn != null && nationCondemn.isActive() && nationCondemn.getFriendType() == Condemned.NATION;
+                return nationCondemn != null && nationCondemn.active && nationCondemn.friendType == Condemned.NATION;
             } else {
                 //TODO ADD ERRANT KOS CHECK
             }
@@ -483,18 +532,18 @@ public enum BuildingManager {
 
             Condemned condemn = building.getCondemned().get(player.getObjectUUID());
 
-            if (condemn != null && condemn.isActive())
+            if (condemn != null && condemn.active)
                 return false;
 
             if (player.getGuild() != null) {
 
                 Condemned guildCondemn = building.getCondemned().get(player.getGuild().getObjectUUID());
 
-                if (guildCondemn != null && guildCondemn.isActive())
+                if (guildCondemn != null && guildCondemn.active)
                     return false;
 
                 Condemned nationCondemn = building.getCondemned().get(player.getGuild().getNation().getObjectUUID());
-                return nationCondemn == null || !nationCondemn.isActive() || nationCondemn.getFriendType() != Condemned.NATION;
+                return nationCondemn == null || !nationCondemn.active || nationCondemn.friendType != Condemned.NATION;
             } else {
                 //TODO ADD ERRANT KOS CHECK
             }
@@ -513,7 +562,7 @@ public enum BuildingManager {
 
         NPC npc = null;
 
-        npc = NPC.createNPC(pirateName, NpcID.getObjectUUID(), NpcLoc, null, zone, (short) rank, building);
+        npc = NPC.createNPC(pirateName, NpcID.getObjectUUID(), NpcLoc, building.getGuild(), zone, (short) rank, building);
 
         if (npc == null)
             return false;
@@ -532,30 +581,7 @@ public enum BuildingManager {
         if (building.getBlueprintUUID() == 0)
             return false;
 
-        if(building.getBlueprint().getBuildingGroup().equals(BuildingGroup.TOL)){
-            if(contract.getContractID() == 850) {
-                boolean hasRunemaster = false;
-                for (AbstractCharacter npc : building.getHirelings().keySet()) {
-
-                    if (npc.getObjectType() != GameObjectType.NPC)
-                        continue;
-
-                    if(npc.contractUUID == 850)
-                        hasRunemaster = true;
-                }
-
-                if(hasRunemaster)
-                    return false;
-            }
-        }
-
-
-        int maxSlots = building.getBlueprint().getMaxSlots();
-        if(building.getBlueprint().getBuildingGroup() != null) {
-            maxSlots = building.getBlueprint().getSlotsForRank(building.getRank());
-        }
-
-        if (maxSlots == building.getHirelings().size())
+        if (building.getBlueprint().getMaxSlots() == building.hirelings.size())
             return false;
 
         String pirateName = NPCManager.getPirateName(contract.getMobbaseID());
@@ -565,41 +591,63 @@ public enum BuildingManager {
         else
             rank = 10;
 
-        Mob mob;
+        Mob mobile;
         NPC npc;
 
         if (NPC.ISWallArcher(contract)) {
 
-            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), true, zone, building, contract.getContractID(), pirateName, rank);
+            mobile = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, building, contract, pirateName, rank, Enum.AIAgentType.GUARDWALLARCHER);
 
-            if (mob == null)
+            if (mobile == null)
                 return false;
 
-            mob.setLoc(mob.getLoc());
+            // Configure AI and write new mobile to disk
+
+            mobile.behaviourType = Enum.MobBehaviourType.GuardWallArcher;
+            mobile = DbManager.MobQueries.PERSIST(mobile);
+
+            // Spawn new mobile
+
+            mobile.setLoc(mobile.getLoc());
 
             return true;
         }
 
         if (NPC.ISGuardCaptain(contract.getContractID())) {
 
-            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), true, zone, building, contract.getContractID(), pirateName, rank);
+            mobile = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, building, contract, pirateName, rank, Enum.AIAgentType.GUARDCAPTAIN);
 
-            if (mob == null)
+            if (mobile == null)
                 return false;
 
-            mob.setLoc(mob.getLoc());
+            // Configure AI and write new mobile to disk
+
+            mobile.behaviourType = Enum.MobBehaviourType.GuardCaptain;
+            mobile = DbManager.MobQueries.PERSIST(mobile);
+
+            // Spawn new mobile
+
+            mobile.setLoc(mobile.getLoc());
 
             return true;
         }
+
         if (contract.getContractID() == 910) {
 
             //guard dog
-            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), true, zone, building, contract.getContractID(), pirateName, rank);
+            mobile = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, building, contract, pirateName, rank, Enum.AIAgentType.GUARDCAPTAIN);
 
-            if (mob == null)
+            if (mobile == null)
                 return false;
 
-            mob.setLoc(mob.getLoc());
+            // Configure AI and write new mobile to disk
+
+            mobile.behaviourType = Enum.MobBehaviourType.GuardCaptain;
+            mobile = DbManager.MobQueries.PERSIST(mobile);
+
+            // Spawn new mobile
+
+            mobile.setLoc(mobile.getLoc());
 
             return true;
         }
@@ -746,80 +794,110 @@ public enum BuildingManager {
 
     }
 
-    public static void processRedeedNPC(NPC npc, Building building, ClientConnection origin) {
+    public static void rebuildMine(Building mineBuilding) {
+        setRank(mineBuilding, 1);
+        mineBuilding.meshUUID = mineBuilding.getBlueprint().getMeshForRank(mineBuilding.rank);
 
-        // Member variable declaration
-        PlayerCharacter player;
-        Contract contract;
-        CharacterItemManager itemMan;
-        ItemBase itemBase;
-        Item item;
+        // New rank mean new max hit points.
 
-        npc.lock.writeLock().lock();
+        mineBuilding.healthMax = mineBuilding.getBlueprint().getMaxHealth(mineBuilding.rank);
+        mineBuilding.setCurrentHitPoints(mineBuilding.healthMax);
+        mineBuilding.getBounds().setBounds(mineBuilding);
+    }
 
-        try {
+    public static void setRank(Building building, int rank) {
+
+        int newMeshUUID;
+        boolean success;
 
 
-            if (building == null)
-                return;
-            player = SessionManager.getPlayerCharacter(origin);
-            itemMan = player.getCharItemManager();
+        // If this building has no blueprint then set rank and exit immediately.
 
-            contract = npc.getContract();
-
-            if (!player.getCharItemManager().hasRoomInventory((short) 1)) {
-                ErrorPopupMsg.sendErrorPopup(player, 21);
-                return;
-            }
-
-
-            if (!building.getHirelings().containsKey(npc))
-                return;
-
-            if (!npc.remove()) {
-                PlaceAssetMsg.sendPlaceAssetError(player.getClientConnection(), 1, "A Serious error has occurred. Please post details for to ensure transaction integrity");
-                return;
-            }
-
-            building.getHirelings().remove(npc);
-
-            itemBase = ItemBase.getItemBase(contract.getContractID());
-
-            if (itemBase == null) {
-                Logger.error("Could not find Contract for npc: " + npc.getObjectUUID());
-                return;
-            }
-
-            boolean itemWorked = false;
-
-            item = new Item(itemBase, player.getObjectUUID(), Enum.OwnerType.PlayerCharacter, (byte) ((byte) npc.getRank() - 1), (byte) ((byte) npc.getRank() - 1),
-                    (short) 1, (short) 1, true, false, Enum.ItemContainerType.INVENTORY, (byte) 0,
-                    new ArrayList<>(), "");
-            item.setNumOfItems(1);
-            item.containerType = Enum.ItemContainerType.INVENTORY;
-
-            try {
-                item = DbManager.ItemQueries.ADD_ITEM(item);
-                itemWorked = true;
-            } catch (Exception e) {
-                Logger.error(e);
-            }
-            if (itemWorked) {
-                itemMan.addItemToInventory(item);
-                itemMan.updateInventory();
-            }
-
-            ManageCityAssetsMsg mca = new ManageCityAssetsMsg();
-            mca.actionType = NPC.SVR_CLOSE_WINDOW;
-            mca.setTargetType(building.getObjectType().ordinal());
-            mca.setTargetID(building.getObjectUUID());
-            origin.sendMsg(mca);
-
-        } catch (Exception e) {
-            Logger.error(e);
-        } finally {
-            npc.lock.writeLock().unlock();
+        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 to 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);
+        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;
+
+        if ((building.getBlueprint().getBuildingGroup() == BuildingGroup.TOL)
+                && (building.rank == 8))
+            building.meshUUID = Realm.getRealmMesh(building.getCity());
+
+        // 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

@@ -27,7 +27,6 @@ import engine.objects.*;
 import engine.server.MBServerStatics;
 import engine.server.world.WorldServer;
 import engine.session.Session;
-import engine.util.KeyCloneAudit;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
@@ -85,15 +84,6 @@ public enum ChatManager {
         if ((checkTime > 0L) && (curMsgTime - checkTime < FLOOD_TIME_THRESHOLD))
             isFlood = true;
 
-        if(KeyCloneAudit.auditChatMsg(pc,msg.getMessage())){
-            return;
-        }
-
-        if(msg.getMessage().equalsIgnoreCase("./zerg")){
-            ZergManager.PrintDetailsToClient(pc);
-            return;
-        }
-
         switch (protocolMsg) {
             case CHATSAY:
                 ChatManager.chatSay(pc, msg.getMessage(), isFlood);
@@ -798,7 +788,7 @@ public enum ChatManager {
                         it.remove();
                     else {
                         PlayerCharacter pcc = (PlayerCharacter) awo;
-                        if (pcc.getSeeInvis() < pc.getHidden())
+                        if (pcc.getSeeInvis() < pc.hidden)
                             it.remove();
                     }
                 }

src/engine/gameManager/ConfigManager.java

@@ -65,7 +65,6 @@ public enum ConfigManager {
     MB_WORLD_MAINTENANCE,
     MB_WORLD_GREETING,
     MB_WORLD_KEYCLONE_MAX,
-    MB_WORLD_TESTMODE,
     MB_USE_RUINS,
 
     // Mobile AI modifiers
@@ -98,8 +97,7 @@ public enum ConfigManager {
     MB_MAGICBOT_FORTOFIX,
     MB_MAGICBOT_RECRUIT,
     MB_MAGICBOT_MAGICBOX,
-    MB_MAGICBOT_ADMINLOG,
-    MB_WORLD_BOXLIMIT;
+    MB_MAGICBOT_ADMINLOG;
 
     // Map to hold our config pulled in from the environment
     // We also use the config to point to the current message pump

src/engine/gameManager/DbManager.java

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

src/engine/gameManager/DevCmdManager.java

@@ -46,9 +46,11 @@ 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());
@@ -56,7 +58,6 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new PrintResistsCmd());
         DevCmdManager.registerDevCmd(new PrintLocationCmd());
         DevCmdManager.registerDevCmd(new InfoCmd());
-        DevCmdManager.registerDevCmd(new PrintEffectsCmd());
         DevCmdManager.registerDevCmd(new aiInfoCmd());
         DevCmdManager.registerDevCmd(new SimulateBootyCmd());
         DevCmdManager.registerDevCmd(new GetHeightCmd());
@@ -80,13 +81,13 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new AddGoldCmd());
         DevCmdManager.registerDevCmd(new ZoneInfoCmd());
         DevCmdManager.registerDevCmd(new DebugMeleeSyncCmd());
+        DevCmdManager.registerDevCmd(new HotzoneCmd());
         DevCmdManager.registerDevCmd(new MineActiveCmd());
         // Dev
         DevCmdManager.registerDevCmd(new ApplyStatModCmd());
         DevCmdManager.registerDevCmd(new AddBuildingCmd());
         DevCmdManager.registerDevCmd(new AddNPCCmd());
         DevCmdManager.registerDevCmd(new AddMobCmd());
-        DevCmdManager.registerDevCmd(new DungenonCmd());
         DevCmdManager.registerDevCmd(new RemoveObjectCmd());
         DevCmdManager.registerDevCmd(new RotateCmd());
         DevCmdManager.registerDevCmd(new FlashMsgCmd());
@@ -104,7 +105,6 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new SetAdminRuneCmd());
         DevCmdManager.registerDevCmd(new SetInvulCmd());
         DevCmdManager.registerDevCmd(new MakeItemCmd());
-        DevCmdManager.registerDevCmd(new GimmeCmd());
         DevCmdManager.registerDevCmd(new EnchantCmd());
         DevCmdManager.registerDevCmd(new SetSubRaceCmd());
         // Admin
@@ -130,7 +130,6 @@ 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,7 +144,6 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new ApplyBonusCmd());
         DevCmdManager.registerDevCmd(new AuditFailedItemsCmd());
         DevCmdManager.registerDevCmd(new SlotTestCmd());
-
     }
 
     private static void registerDevCmd(AbstractDevCmd cmd) {
@@ -179,44 +177,10 @@ public enum DevCmdManager {
             return false;
         }
 
-        if(!pcSender.getTimestamps().containsKey("DEVCOMMAND"))
-            pcSender.getTimestamps().put("DEVCOMMAND",System.currentTimeMillis() - 1500L);
-        else if(System.currentTimeMillis() - pcSender.getTimestamps().get("DEVCOMMAND") < 1000L)
-            return false;
-
         //kill any commands not available to everyone on production server
         //only admin level can run dev commands on production
-        boolean playerAllowed = false;
-        if(ConfigManager.MB_WORLD_TESTMODE.getValue().equals("true")) {
-            switch (adc.getMainCmdString()) {
-                case "printresists":
-                case "printstats":
-                case "printskills":
-                case "printpowers":
-                case "gimme":
-                case "goto":
-                case "teleportmode":
-                case "printbonuses":
-                    playerAllowed = true;
-                    if (!a.status.equals(Enum.AccountStatus.ADMIN))
-                        target = pcSender;
-                    break;
-            }
-        }else{
-            switch (adc.getMainCmdString()) {
-                case "printresists":
-                case "printstats":
-                case "printskills":
-                case "printpowers":
-                case "printbonuses":
-                //case "gimme":
-                    playerAllowed = true;
-                    if (!a.status.equals(Enum.AccountStatus.ADMIN))
-                        target = pcSender;
-                    break;
-            }
-        }
-        if (!playerAllowed && !a.status.equals(Enum.AccountStatus.ADMIN)) {
+
+        if (a.status.equals(Enum.AccountStatus.ADMIN) == false) {
             Logger.info("Account " + a.getUname() + "attempted to use dev command " + cmd);
             return false;
         }

src/engine/gameManager/HellgateManager.java

@@ -1,289 +0,0 @@
-package engine.gameManager;
-
-import engine.mobileAI.MobAI;
-import engine.mobileAI.utilities.CombatUtilities;
-import engine.mobileAI.utilities.MovementUtilities;
-import engine.objects.*;
-import engine.server.MBServerStatics;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.concurrent.ThreadLocalRandom;
-
-public class HellgateManager {
-    public static ArrayList<Mob> hellgate_mobs;
-    public static ArrayList<Mob> hellgate_mini_bosses;
-    public static Mob hellgate_boss;
-
-    public static Long hellgate_time_completed = 0L;
-    public static final int citadel_ruins_zone_id = 993;
-    public static final int hell_portal_1_zone_id = 994;
-    public static final int hell_portal_2_zone_id = 996;
-    public static final int hell_portal_3_zone_id = 997;
-    public static final int hell_portal_4_zone_id = 998;
-
-    public static boolean initialized = false;
-
-    public static final ArrayList<Integer> static_rune_ids_low = new ArrayList<>(Arrays.asList(
-            250001, 250002, 250003, 250004, 250005, 250006, 250010, 250011,
-            250012, 250013, 250014, 250015, 250019, 250020, 250021, 250022,
-            250023, 250024, 250028, 250029, 250030, 250031, 250032, 250033,
-            250037, 250038, 250039, 250040, 250041, 250042
-    ));
-
-    public static final ArrayList<Integer> static_rune_ids_mid = new ArrayList<>(Arrays.asList(
-            250006, 250007, 250008,
-            250015, 250016, 250017,
-            250024, 250025, 250026,
-            250033, 250034, 250035,
-            250042, 250043, 250044
-    ));
-
-    public static final ArrayList<Integer> static_rune_ids_high = new ArrayList<>(Arrays.asList(
-            250007, 250008,
-            250016, 250017,
-            250025, 250026,
-            250034, 250035,
-            250043, 250044
-    ));
-    public static void confiureHellgate(){
-        compile_mob_list();
-    }
-    public static void pulseHellgates(){
-        if(!initialized){
-            confiureHellgate();
-            if(hellgate_boss != null)
-                initialized = true;
-            return;
-        }
-
-        if(hellgate_mobs == null) {
-            return;
-        }
-        if(hellgate_mini_bosses == null) {
-            return;
-        }
-        if(hellgate_boss == null){
-            return;
-        }
-
-        if(!hellgate_boss.isAlive() && hellgate_time_completed == 0L)
-            hellgate_time_completed = System.currentTimeMillis();
-
-        if(hellgate_time_completed != 0L && System.currentTimeMillis() > hellgate_time_completed + MBServerStatics.THIRTY_MINUTES){
-            ResetHellgate();
-        }
-    }
-
-    public static void compile_mob_list(){
-        if(hellgate_mobs == null) {
-            hellgate_mobs =new ArrayList<>();
-        }
-        if(hellgate_mini_bosses == null) {
-            hellgate_mini_bosses =new ArrayList<>();
-        }
-        Zone hellgate_zone = ZoneManager.getZoneByUUID(citadel_ruins_zone_id);
-        if(hellgate_zone == null)
-            return;
-
-        for(Mob mob : hellgate_zone.zoneMobSet){
-            switch(mob.getMobBaseID()){
-                case 14163: // basic saetor warrior
-                    mob.getCharItemManager().clearInventory();
-                    SpecialLootHandler(mob,false,false);
-                    mob.setResists(new Resists("Elite"));
-                    mob.healthMax = 8500;
-                    mob.setHealth(mob.healthMax);
-                    hellgate_mobs.add(mob);
-                    break;
-                case 12770: // minotaur mini boss
-                    mob.getCharItemManager().clearInventory();
-                    SpecialLootHandler(mob,true,false);
-                    mob.setResists(new Resists("Elite"));
-                    mob.healthMax = 12500;
-                    mob.setHealth(mob.healthMax);
-                    hellgate_mini_bosses.add(mob);
-                    break;
-                case 14180: // mordoth, son of morlock
-                    mob.getCharItemManager().clearInventory();
-                    SpecialLootHandler(mob,false,true);
-                    mob.setResists(new Resists("Elite"));
-                    mob.healthMax = mob.mobBase.getHealthMax();
-                    mob.setHealth(mob.healthMax);
-                    hellgate_boss = mob;
-                    break;
-            }
-        }
-    }
-
-    public static void ResetHellgate(){
-        hellgate_time_completed = 0L;
-        for(Mob mob : hellgate_mobs){
-            if(!mob.isAlive()){
-                if(!mob.despawned){
-                    mob.despawn();
-                }
-                mob.respawn();
-            }
-            mob.setHealth(mob.healthMax);
-            SpecialLootHandler(mob,false,false);
-        }
-        for(Mob mob : hellgate_mini_bosses){
-            if(!mob.isAlive()){
-                if(!mob.despawned){
-                    mob.despawn();
-                }
-                mob.respawn();
-            }
-            mob.setHealth(mob.healthMax);
-            SpecialLootHandler(mob,true,false);
-        }
-        if(!hellgate_boss.isAlive()){
-            if(!hellgate_boss.despawned){
-                hellgate_boss.despawn();
-            }
-            hellgate_boss.respawn();
-        }
-        hellgate_boss.setHealth(hellgate_boss.healthMax);
-        SpecialLootHandler(hellgate_boss,false,true);
-    }
-
-    public static void SpecialMobAIHandler(Mob mob){
-
-        if(mob.playerAgroMap.isEmpty())
-            return;
-
-        if(!mob.isAlive())
-            return;
-
-        if(mob.combatTarget == null)
-            MobAI.NewAggroMechanic(mob);
-
-        if(MovementUtilities.canMove(mob) &&  mob.combatTarget != null && !CombatUtilities.inRangeToAttack(mob,mob.combatTarget))
-            MobAI.chaseTarget(mob);
-
-        if(mob.combatTarget != null)
-            MobAI.CheckForAttack(mob);
-
-        if(mob.combatTarget == null && mob.loc.distanceSquared(mob.bindLoc) > 1024) {//32 units
-            mob.teleport(mob.bindLoc);
-            mob.setCombatTarget(null);
-            MovementUtilities.aiMove(mob,mob.bindLoc,true);
-        }
-    }
-
-    public static void SpecialLootHandler(Mob mob, Boolean commander, Boolean epic){
-        mob.getCharItemManager().clearInventory();
-        int contractRoll = ThreadLocalRandom.current().nextInt(1,101);
-        if(contractRoll <= 25){
-            //generate random contract
-
-        }
-
-        int runeRoll = ThreadLocalRandom.current().nextInt(1,101);
-        ItemBase runeBase = null;
-        int roll;
-        int itemId;
-        if(runeRoll <= 60 && !commander && !epic) {
-            //generate random rune (standard 5-30)
-            roll = ThreadLocalRandom.current().nextInt(static_rune_ids_low.size() + 1);
-            itemId = static_rune_ids_low.get(0);
-            try {
-                itemId = static_rune_ids_low.get(roll);
-            } catch (Exception e) {
-
-            }
-            runeBase = ItemBase.getItemBase(itemId);
-            if (runeBase != null) {
-                MobLoot rune = new MobLoot(mob, runeBase, true);
-
-                if (rune != null)
-                    mob.getCharItemManager().addItemToInventory(rune);
-            }
-        }
-        if(runeRoll <= 50 && commander) {
-            //generate random rune (30-40)
-            roll = ThreadLocalRandom.current().nextInt(static_rune_ids_mid.size() + 1);
-            itemId = static_rune_ids_mid.get(0);
-            try {
-                itemId = static_rune_ids_mid.get(roll);
-            } catch (Exception e) {
-
-            }
-            runeBase = ItemBase.getItemBase(itemId);
-            if (runeBase != null) {
-                MobLoot rune = new MobLoot(mob, runeBase, true);
-
-                if (rune != null)
-                    mob.getCharItemManager().addItemToInventory(rune);
-            }
-        }
-
-        if(runeRoll <= 80 && epic) {
-            //generate random rune (35-40)
-            roll = ThreadLocalRandom.current().nextInt(static_rune_ids_high.size() + 1);
-            itemId = static_rune_ids_high.get(0);
-            try {
-                itemId = static_rune_ids_high.get(roll);
-            } catch (Exception e) {
-
-            }
-            runeBase = ItemBase.getItemBase(itemId);
-            if (runeBase != null) {
-                MobLoot rune = new MobLoot(mob, runeBase, true);
-
-                if (rune != null)
-                    mob.getCharItemManager().addItemToInventory(rune);
-            }
-        }
-
-        if(commander || epic) {
-            //handle special case for racial guards
-
-            roll = ThreadLocalRandom.current().nextInt(LootManager.racial_guard_uuids.size() + 1);
-            itemId = LootManager.racial_guard_uuids.get(0);
-            try {
-                itemId = LootManager.racial_guard_uuids.get(roll);
-            } catch (Exception e) {
-
-            }
-            runeBase = ItemBase.getItemBase(itemId);
-            if (runeBase != null) {
-                MobLoot rune = new MobLoot(mob, runeBase, true);
-
-                if (rune != null)
-                    mob.getCharItemManager().addItemToInventory(rune);
-            }
-        }
-
-        if(epic){
-            //handle glass chance for epic
-            int glassRoll = ThreadLocalRandom.current().nextInt(1,101);
-            if(glassRoll < 5){
-                int glassID = LootManager.rollRandomItem(126);
-                ItemBase glassItem = ItemBase.getItemBase(glassID);
-                if (glassItem != null) {
-                    MobLoot glass = new MobLoot(mob, glassItem, true);
-
-                    if (glass != null)
-                        mob.getCharItemManager().addItemToInventory(glass);
-                }
-            }
-        }
-
-        //handle gold drops
-        int goldDrop;
-        if(!commander && !epic){
-            goldDrop = ThreadLocalRandom.current().nextInt(25000);
-            mob.getCharItemManager().addGoldToInventory(goldDrop,false);
-        }
-        if(commander){
-            goldDrop = ThreadLocalRandom.current().nextInt(100000,250000);
-            mob.getCharItemManager().addGoldToInventory(goldDrop,false);
-        }
-        if(epic){
-            goldDrop = ThreadLocalRandom.current().nextInt(2500000,5000000);
-            mob.getCharItemManager().addGoldToInventory(goldDrop,false);
-        }
-    }
-}

src/engine/gameManager/HotzoneManager.java

@@ -1,238 +0,0 @@
-package engine.gameManager;
-
-import engine.Enum;
-import engine.InterestManagement.WorldGrid;
-import engine.math.Vector3fImmutable;
-import engine.net.Dispatch;
-import engine.net.DispatchMessage;
-import engine.net.client.msg.HotzoneChangeMsg;
-import engine.net.client.msg.chat.ChatSystemMsg;
-import engine.objects.*;
-import engine.server.MBServerStatics;
-import org.pmw.tinylog.Logger;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Random;
-import java.util.concurrent.ThreadLocalRandom;
-
-public class HotzoneManager {
-    public static Long lastPulseTime = 0L;
-    public static HashMap<Guild, ArrayList<PlayerCharacter>> playersPresent;
-    public static Mob hotzoneMob = null;
-    public static boolean three_quarter_health = false;
-    public static boolean half_health = false;
-    public static boolean quarter_health = false;
-    public static void SelectRandomHotzone(){
-        if(hotzoneMob != null){
-            hotzoneMob.killCharacter("Hotzone Over");
-            hotzoneMob.despawn();
-            hotzoneMob.spawnTime = 1000000000;
-            DbManager.MobQueries.DELETE_MOB( hotzoneMob);
-        }
-        Random random = new Random();
-        Zone newHotzone = null;
-        while (newHotzone == null || newHotzone.getObjectUUID() == 931 || newHotzone.getObjectUUID() == 913)
-            newHotzone = (Zone) ZoneManager.macroZones.toArray()[random.nextInt(ZoneManager.macroZones.size())];
-        ZoneManager.setHotZone(newHotzone);
-        ZoneManager.hotZone = newHotzone;
-        int R8UUId = 0;
-        switch(random.nextInt(5)) {
-            case 1:
-                R8UUId = 14152;
-                break;
-            case 2:
-                R8UUId = 14179;
-                break;
-            case 3:
-                R8UUId = 14180;
-                break;
-            case 4:
-                R8UUId = 14220;
-                break;
-            default:
-                R8UUId = 14319;
-                break;
-        }
-        Mob created = Mob.createMob(R8UUId,newHotzone.getLoc(), Guild.getErrantGuild(),true,newHotzone,null,0,"",85);
-        if(created == null){
-            Logger.error("Failed To Generate Hotzone R8 Mob");
-            return;
-        }
-        ChatSystemMsg chatMsg = new ChatSystemMsg(null, created.getFirstName() + " has spawned in " + newHotzone.getName() + ". Glory and riches await adventurers who dare defeat it!");
-        chatMsg.setMessageType(10);
-        chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
-        DispatchMessage.dispatchMsgToAll(chatMsg);
-
-        created.bindLoc = newHotzone.getLoc();
-        created.runAfterLoad();
-        WorldGrid.addObject(created,created.bindLoc.x,created.bindLoc.z);
-        created.teleport(created.bindLoc);
-        created.BehaviourType = Enum.MobBehaviourType.Aggro;
-        hotzoneMob = created;
-        created.setHealth(100000);
-        created.setResists(new Resists("Dropper"));
-        GenerateHotzoneEpicLoot(created);
-        ZoneManager.hotZone = newHotzone;
-
-        for(PlayerCharacter player : SessionManager.getAllActivePlayerCharacters()) {
-            HotzoneChangeMsg hcm = new HotzoneChangeMsg(Enum.GameObjectType.Zone.ordinal(), ZoneManager.hotZone.getObjectUUID());
-            Dispatch dispatch = Dispatch.borrow(player, hcm);
-            DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
-        }
-        three_quarter_health = false;
-        half_health = false;
-        quarter_health = false;
-    }
-
-    public static void GenerateHotzoneEpicLoot(Mob mob) {
-        mob.getCharItemManager().clearInventory();
-        Random random = new Random();
-        int roll;
-        int itemId;
-        //wrapped rune:
-        ItemBase runeBase = ItemBase.getItemBase(971070);
-        if (runeBase != null) {
-            MobLoot rune = new MobLoot(mob, runeBase, true);
-
-            if (rune != null)
-                mob.getCharItemManager().addItemToInventory(rune);
-        }
-
-        roll = ThreadLocalRandom.current().nextInt(1, 101);
-        if (roll >= 95) {
-            //glass
-            int glassID = LootManager.rollRandomItem(126);
-            ItemBase glassItem = ItemBase.getItemBase(glassID);
-            if (glassItem != null) {
-                MobLoot glass = new MobLoot(mob, glassItem, true);
-
-                if (glass != null)
-                    mob.getCharItemManager().addItemToInventory(glass);
-            }
-        }
-
-        roll = ThreadLocalRandom.current().nextInt(1, 101);
-        if (roll >= 95) {
-            //r8 banescroll
-            int baneID = 910018;
-            ItemBase baneItem = ItemBase.getItemBase(baneID);
-            if (baneItem != null) {
-                MobLoot bane = new MobLoot(mob, baneItem, true);
-
-                if (bane != null)
-                    mob.getCharItemManager().addItemToInventory(bane);
-            }
-        }
-
-        roll = ThreadLocalRandom.current().nextInt(1, 101);
-        if (roll >= 95) {
-            //guard captain
-            roll = ThreadLocalRandom.current().nextInt(LootManager.racial_guard_uuids.size() + 1);
-            itemId = LootManager.racial_guard_uuids.get(0);
-            try {
-                itemId = LootManager.racial_guard_uuids.get(roll);
-            } catch (Exception e) {
-
-            }
-            runeBase = ItemBase.getItemBase(itemId);
-            if (runeBase != null) {
-                MobLoot rune = new MobLoot(mob, runeBase, true);
-
-                if (rune != null)
-                    mob.getCharItemManager().addItemToInventory(rune);
-            }
-        }
-    }
-
-    public static void ClearHotzone(){
-        ZoneManager.hotZone = null;
-        for(PlayerCharacter player : SessionManager.getAllActivePlayerCharacters()) {
-            HotzoneChangeMsg hcm = new HotzoneChangeMsg(Enum.GameObjectType.Zone.ordinal(), 0);
-            Dispatch dispatch = Dispatch.borrow(player, hcm);
-            DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
-        }
-    }
-
-    public static void pulse(){
-        if(HotzoneManager.playersPresent == null)
-            HotzoneManager.playersPresent = new HashMap<>();
-
-        if(ZoneManager.hotZone == null)
-            return;
-
-        if(lastPulseTime + 5000L > System.currentTimeMillis())
-            return;
-
-        lastPulseTime = System.currentTimeMillis();
-
-        //handle world announcements for HZ boss
-        if(hotzoneMob != null){
-            float health = hotzoneMob.getHealth();
-            if(health < 75000 && health > 50000 && !three_quarter_health){
-                //mob at 50%-75% health
-                three_quarter_health = true;
-                String name = hotzoneMob.getName();
-                ChatSystemMsg chatMsg = new ChatSystemMsg(null, name + " In The Hotzone Is At 75% Health");
-                chatMsg.setMessageType(10);
-                chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
-                DispatchMessage.dispatchMsgToAll(chatMsg);
-            }else if(health < 50000 && health > 25000 && !half_health){
-                //mob ta 25%-50% health
-                half_health = true;
-                String name = hotzoneMob.getName();
-                ChatSystemMsg chatMsg = new ChatSystemMsg(null, name + " In The Hotzone Is At 50% Health");
-                chatMsg.setMessageType(10);
-                chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
-                DispatchMessage.dispatchMsgToAll(chatMsg);
-            }else if(health < 25000 && !quarter_health){
-                //mob under 25% health
-                quarter_health = true;
-                String name = hotzoneMob.getName();
-                ChatSystemMsg chatMsg = new ChatSystemMsg(null, name + " In The Hotzone Is At 25% Health");
-                chatMsg.setMessageType(10);
-                chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
-                DispatchMessage.dispatchMsgToAll(chatMsg);
-            }else if (health > 75000){
-                //mob at 75% - 100% health
-
-            }
-        }
-
-        HashSet<AbstractWorldObject> inRange = WorldGrid.getObjectsInRangePartial(ZoneManager.hotZone.getLoc(),ZoneManager.hotZone.getBounds().getHalfExtents().x * 2, MBServerStatics.MASK_PLAYER);
-
-        //clear out old players who aren't here anymore
-        for(Guild nation : HotzoneManager.playersPresent.keySet()){
-            for(PlayerCharacter pc : HotzoneManager.playersPresent.get(nation)){
-                if (!inRange.contains(pc)) {
-                    HotzoneManager.playersPresent.get(nation).remove(pc);
-                    if(HotzoneManager.playersPresent.get(nation).size() < 1){
-                        HotzoneManager.playersPresent.remove(nation);
-                    }
-                }
-            }
-        }
-
-        //check status of current players/nation in vicinity
-        for(AbstractWorldObject awo : inRange){
-            PlayerCharacter pc = (PlayerCharacter)awo;
-            Guild nation = pc.guild.getNation();
-            if(HotzoneManager.playersPresent.containsKey(nation)){
-                //nation already here, add to list
-                if(HotzoneManager.playersPresent.get(nation).size() >= 5 && !HotzoneManager.playersPresent.get(nation).contains(pc)){
-                    //more than 5, boot player out
-                    MovementManager.translocate(pc, Vector3fImmutable.getRandomPointOnCircle(ZoneManager.getZoneByUUID(656).getLoc(),30f),Regions.GetRegionForTeleport(ZoneManager.getZoneByUUID(656).getLoc()));
-                }
-                if(!HotzoneManager.playersPresent.get(nation).contains(pc)){
-                    //less than 5, allow player in
-                    HotzoneManager.playersPresent.get(nation).add(pc);
-                }
-            }else{
-                ArrayList<PlayerCharacter> newList = new ArrayList<>();
-                newList.add(pc);
-                HotzoneManager.playersPresent.put(nation,newList);
-            }
-        }
-    }
-}

src/engine/gameManager/LootManager.java

@@ -14,10 +14,10 @@ import engine.net.DispatchMessage;
 import engine.net.client.msg.ErrorPopupMsg;
 import engine.net.client.msg.chat.ChatSystemMsg;
 import engine.objects.*;
-import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.concurrent.ThreadLocalRandom;
 
 /**
@@ -34,21 +34,6 @@ public enum LootManager {
     public static HashMap<Integer, ArrayList<ModTableEntry>> _modTables = new HashMap<>();
     public static HashMap<Integer, ArrayList<ModTypeTableEntry>> _modTypeTables = new HashMap<>();
 
-    public static final ArrayList<Integer> vorg_ha_uuids = new ArrayList<>(Arrays.asList(27580, 27590, 188500, 188510, 188520, 188530, 188540, 188550, 189510));
-    public static final ArrayList<Integer> vorg_ma_uuids = new ArrayList<>(Arrays.asList(27570,188900,188910,188920,188930,188940,188950,189500));
-    public static final ArrayList<Integer> vorg_la_uuids = new ArrayList<>(Arrays.asList(27550,27560,189100,189110,189120,189130,189140,189150));
-    public static final ArrayList<Integer> vorg_cloth_uuids = new ArrayList<>(Arrays.asList(27600,188700,188720,189550,189560));
-    public static final ArrayList<Integer> racial_guard_uuids = new ArrayList<>(Arrays.asList(841,951,952,1050,1052,1180,1182,1250,1252,1350,1352,1450,1452,1500,1502,1525,1527,1550,1552,1575,1577,1600,1602,1650,1652,1700,980100,980102));
-
-    public static final ArrayList<Integer> static_rune_ids = new ArrayList<>(Arrays.asList(
-            250001, 250002, 250003, 250004, 250005, 250006, 250007, 250008, 250010, 250011,
-            250012, 250013, 250014, 250015, 250016, 250017, 250019, 250020, 250021, 250022,
-            250023, 250024, 250025, 250026, 250028, 250029, 250030, 250031, 250032, 250033,
-            250034, 250035, 250037, 250038, 250039, 250040, 250041, 250042, 250043, 250044,
-            250115, 250118, 250119, 250120, 250121, 250122, 252123, 252124, 252125, 252126,
-            252127
-    ));
-
     // Drop Rates
 
     public static float NORMAL_DROP_RATE;
@@ -83,85 +68,49 @@ public enum LootManager {
 
     public static void GenerateMobLoot(Mob mob) {
 
-        if(mob == null){
-            return;
-        }
-
-        if(!mob.getSafeZone()) {
-            SpecialLootHandler.RollContract(mob);
-            SpecialLootHandler.RollGlass(mob);
-            SpecialLootHandler.RollRune(mob);
-            SpecialLootHandler.RollRacialGuard(mob);
-        }
-
         //determine if mob is in hotzone
-        boolean inHotzone = false;
+        boolean inHotzone = ZoneManager.inHotZone(mob.getLoc());
 
         //iterate the booty sets
 
-        if(mob.mobBase == null || mob.getMobBaseID() == 253003){
-            int i = 0;
-        }
-
-        if (mob.getMobBase().bootySet != 0 && _bootySetMap.containsKey(mob.getMobBase().bootySet))
+        if (mob.getMobBase().bootySet != 0 && _bootySetMap.containsKey(mob.getMobBase().bootySet) == true)
             RunBootySet(_bootySetMap.get(mob.getMobBase().bootySet), mob, inHotzone);
 
-        if (mob.bootySet != 0 && _bootySetMap.containsKey(mob.bootySet)) {
+        if (mob.bootySet != 0 && _bootySetMap.containsKey(mob.bootySet) == true)
             RunBootySet(_bootySetMap.get(mob.bootySet), mob, inHotzone);
-        }else if(mob.bootySet != 0 && ItemBase.getItemBase(mob.bootySet) != null){
-            MobLoot specialDrop = null;
-            specialDrop = new MobLoot(mob,ItemBase.getItemBase(mob.bootySet),true);
-            if(specialDrop != null) {
-                ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + mob.getParentZone().getName() + " has found the " + specialDrop.getName() + ". Are you tough enough to take it?");
-                chatMsg.setMessageType(10);
-                chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
-                DispatchMessage.dispatchMsgToAll(chatMsg);
-                mob.getCharItemManager().addItemToInventory(specialDrop);
-                mob.setResists(new Resists("Dropper"));
-                if(!Mob.discDroppers.contains(mob))
-                    Mob.AddDiscDropper(mob);
-            }
-
-        }
 
         //lastly, check mobs inventory for godly or disc runes to send a server announcement
-        for (Item it : mob.getInventory()) {
+            for (Item it : mob.getInventory()) {
 
-            ItemBase ib = it.getItemBase();
-            if (ib == null)
-                break;
-            if (ib.isDiscRune() || ib.getName().toLowerCase().contains("of the gods")) {
-                Zone camp = mob.getParentZone();
-                Zone macro = camp.getParent();
-                String name = camp.getName() + "(" + macro.getName() + ")";
-                ChatSystemMsg chatMsg = new ChatSystemMsg(null, mob.getName() + " in " + name + " has found the " + ib.getName() + ". Are you tough enough to take it?");
-                chatMsg.setMessageType(10);
-                chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
-                DispatchMessage.dispatchMsgToAll(chatMsg);
+                ItemBase ib = it.getItemBase();
+                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?");
+                    chatMsg.setMessageType(10);
+                    chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
+                    DispatchMessage.dispatchMsgToAll(chatMsg);
+                }
             }
-        }
 
     }
 
     private static void RunBootySet(ArrayList<BootySetEntry> entries, Mob mob, boolean inHotzone) {
 
         boolean hotzoneWasRan = false;
-        float dropRate;
+        float dropRate = 1.0f;
 
         // Iterate all entries in this bootySet and process accordingly
-        Zone zone = ZoneManager.findSmallestZone(mob.loc);
+
         for (BootySetEntry bse : entries) {
             switch (bse.bootyType) {
                 case "GOLD":
-                    if (zone != null && zone.getSafeZone() == (byte)1)
-                        return; // no loot to drop in safezones
                     GenerateGoldDrop(mob, bse, inHotzone);
                     break;
                 case "LOOT":
-                    if (zone != null && zone.getSafeZone() == (byte)1)
-                        return; // no loot to drop in safezones
 
-                    dropRate = LootManager.NORMAL_DROP_RATE;
+                    if (mob.getSafeZone() == false)
+                        dropRate = LootManager.NORMAL_DROP_RATE;
 
                     if (inHotzone == true)
                         dropRate = LootManager.HOTZONE_DROP_RATE;
@@ -186,90 +135,6 @@ public enum LootManager {
         }
     }
 
-    public static void SpecialCaseContractDrop(Mob mob,ArrayList<BootySetEntry> entries){
-
-        int lootTableID = 0;
-        for(BootySetEntry entry : entries){
-            if(entry.bootyType.equals("LOOT")){
-                lootTableID = entry.genTable;
-                break;
-            }
-        }
-
-        if(lootTableID == 0)
-            return;
-
-        int ContractTableID = 0;
-        for(GenTableEntry entry : _genTables.get(lootTableID)){
-            try {
-                if (ItemBase.getItemBase(_itemTables.get(entry.itemTableID).get(0).cacheID).getType().equals(Enum.ItemType.CONTRACT)) {
-                    ContractTableID = entry.itemTableID;
-                    break;
-                }
-            }catch(Exception e){
-
-            }
-        }
-
-        if(ContractTableID == 0)
-            return;
-
-        ItemBase ib = ItemBase.getItemBase(rollRandomItem(ContractTableID));
-        if(ib != null){
-            MobLoot toAdd = new MobLoot(mob,ib,false);
-            mob.getCharItemManager().addItemToInventory(toAdd);
-        }
-    }
-
-    public static void SpecialCaseRuneDrop(Mob mob,ArrayList<BootySetEntry> entries){
-        int roll = ThreadLocalRandom.current().nextInt(static_rune_ids.size() + 1);
-        int itemId = static_rune_ids.get(0);
-        try {
-            itemId = static_rune_ids.get(roll);
-        }catch(Exception e){
-
-        }
-        ItemBase ib = ItemBase.getItemBase(itemId);
-        if(ib != null){
-            MobLoot toAdd = new MobLoot(mob,ib,false);
-            mob.getCharItemManager().addItemToInventory(toAdd);
-        }
-    }
-
-    public static void SpecialCaseResourceDrop(Mob mob,ArrayList<BootySetEntry> entries){
-        int lootTableID = 0;
-        for(BootySetEntry entry : entries){
-            if(entry.bootyType.equals("LOOT")){
-                lootTableID = entry.genTable;
-                break;
-            }
-        }
-
-        if(lootTableID == 0)
-            return;
-
-        int ResourceTableID = 0;
-        for(GenTableEntry entry : _genTables.get(lootTableID)){
-            try {
-                if (ItemBase.getItemBase(_itemTables.get(entry.itemTableID).get(0).cacheID).getType().equals(Enum.ItemType.RESOURCE)) {
-                    ResourceTableID = entry.itemTableID;
-                    break;
-                }
-            }catch(Exception e){
-
-            }
-        }
-
-        if(ResourceTableID == 0)
-            return;
-
-        ItemBase ib = ItemBase.getItemBase(rollRandomItem(ResourceTableID));
-        if(ib != null){
-            MobLoot toAdd = new MobLoot(mob,ib,false);
-            mob.getCharItemManager().addItemToInventory(toAdd);
-        }
-    }
-
     public static MobLoot getGenTableItem(int genTableID, AbstractCharacter mob, Boolean inHotzone) {
 
         if (mob == null || _genTables.containsKey(genTableID) == false)
@@ -291,10 +156,11 @@ public enum LootManager {
 
         //gets the 1-320 roll for this mob
         int itemTableRoll = 0;
+        int objectType = mob.getObjectType().ordinal();
         if(mob.getObjectType().ordinal() == 52) { //52 = player character
             itemTableRoll = ThreadLocalRandom.current().nextInt(1,320 + 1);
         } else{
-            itemTableRoll = TableRoll(mob.level);
+            itemTableRoll = TableRoll(mob.level, inHotzone);
         }
         ItemTableEntry tableRow = ItemTableEntry.rollTable(itemTableId, itemTableRoll);
         if (tableRow == null)
@@ -305,24 +171,14 @@ public enum LootManager {
         if (itemUUID == 0)
             return null;
 
-        if (ItemBase.getItemBase(itemUUID).getType().equals(Enum.ItemType.RESOURCE) || ItemBase.getItemBase(itemUUID).getName().equals("Mithril")) {
-            if(ThreadLocalRandom.current().nextInt(1,101) < 91)
-                return null; // cut down world drops rates of resources by 90%
+        if (ItemBase.getItemBase(itemUUID).getType().ordinal() == Enum.ItemType.RESOURCE.ordinal()) {
             int amount = ThreadLocalRandom.current().nextInt(tableRow.minSpawn, tableRow.maxSpawn + 1);
             return new MobLoot(mob, ItemBase.getItemBase(itemUUID), amount, false);
         }
-        if(ItemBase.getItemBase(itemUUID).getType().equals(Enum.ItemType.RUNE)){
-            int randomRune = rollRandomItem(itemTableId);
-            if(randomRune != 0) {
-                itemUUID = randomRune;
-            }
-        } else if(ItemBase.getItemBase(itemUUID).getType().equals(Enum.ItemType.CONTRACT)){
-            int randomContract = rollRandomItem(itemTableId);
-            if(randomContract != 0) {
-                itemUUID = randomContract;
-            }
-        }
+
         outItem = new MobLoot(mob, ItemBase.getItemBase(itemUUID), false);
+        Enum.ItemType outType = outItem.getItemBase().getType();
+
 
         if(selectedRow.pModTable != 0){
             try {
@@ -340,12 +196,6 @@ public enum LootManager {
                 Logger.error("Failed to GenerateSuffix for item: " + outItem.getName());
             }
         }
-
-        if(outItem.getItemBase().getType().equals(Enum.ItemType.CONTRACT) || outItem.getItemBase().getType().equals(Enum.ItemType.RUNE)){
-            if(ThreadLocalRandom.current().nextInt(1,101) < 66)
-                return null; // cut down world drops rates of resources by 65%
-        }
-
         return outItem;
     }
 
@@ -366,7 +216,7 @@ public enum LootManager {
         if(mob.getObjectType().ordinal() == 52) {
             prefixTableRoll = ThreadLocalRandom.current().nextInt(1,320 + 1);
         } else{
-            prefixTableRoll = TableRoll(mob.level);
+            prefixTableRoll = TableRoll(mob.level, inHotzone);
         }
         ModTableEntry prefixMod = ModTableEntry.rollTable(prefixTable.modTableID, prefixTableRoll);
 
@@ -374,23 +224,8 @@ public enum LootManager {
             return inItem;
 
         if (prefixMod.action.length() > 0) {
-            String action = prefixMod.action;
-            if(action.equals("PRE-108") || action.equals("PRE-058") || action.equals("PRE-031")){//massive, barons and avatars to be replaced by leg or warlords
-                int roll = ThreadLocalRandom.current().nextInt(1,100);
-                if(inItem.getItemBase().getRange() > 15){
-                    action = "PRE-040";
-                }else {
-                    if (roll > 50) {
-                        //set warlords
-                        action = "PRE-021";
-                    } else {
-                        //set legendary
-                        action = "PRE-040";
-                    }
-                }
-            }
-            inItem.setPrefix(action);
-            inItem.addPermanentEnchantment(action, 0, prefixMod.level, true);
+            inItem.setPrefix(prefixMod.action);
+            inItem.addPermanentEnchantment(prefixMod.action, 0, prefixMod.level, true);
         }
 
         return inItem;
@@ -413,34 +248,14 @@ public enum LootManager {
         if(mob.getObjectType().ordinal() == 52) {
             suffixTableRoll = ThreadLocalRandom.current().nextInt(1,320 + 1);
         } else{
-            suffixTableRoll = TableRoll(mob.level);
+            suffixTableRoll = TableRoll(mob.level, inHotzone);
         }
         ModTableEntry suffixMod = ModTableEntry.rollTable(suffixTable.modTableID, suffixTableRoll);
 
         if (suffixMod == null)
             return inItem;
 
-        int moveSpeedRoll = ThreadLocalRandom.current().nextInt(100);
-        if(inItem.getItemBase().getValidSlot() == MBServerStatics.SLOT_FEET && moveSpeedRoll < 10){
-            int rankRoll = ThreadLocalRandom.current().nextInt(10);
-            String suffixSpeed = "SUF-148";
-            switch(rankRoll) {
-                case 1:
-                case 2:
-                case 3:
-                    suffixSpeed = "SUF-149";
-                    break;
-                case 4:
-                case 5:
-                case 6:
-                case 7:
-                    suffixSpeed = "SUF-150";
-                    break;
-
-            }
-            inItem.setSuffix(suffixSpeed);
-            inItem.addPermanentEnchantment(suffixSpeed, 0, suffixMod.level, false);
-        }else if (suffixMod.action.length() > 0) {
+        if (suffixMod.action.length() > 0) {
             inItem.setSuffix(suffixMod.action);
             inItem.addPermanentEnchantment(suffixMod.action, 0, suffixMod.level, false);
         }
@@ -448,36 +263,23 @@ public enum LootManager {
         return inItem;
     }
 
-    public static int TableRoll(int mobLevel) {
+    public static int TableRoll(int mobLevel, Boolean inHotzone) {
 
-        int rank = (int)(mobLevel * 0.1f);
-        int min = 50;
-        int max = 100;
-        switch(rank){
-            case 1:
-                min = 200;
-                max = 250;
-                break;
-            case 2:
-                min = 210;
-                max = 275;
-                break;
-            case 3:
-                min = 220;
-                max = 300;
-                break;
-            case 4:
-                min = 230;
-                max = 320;
-                break;
-            case 5:
-            case 6:
-            case 7:
-            case 8:
-                min = 240;
-                max = 320;
-                break;
-        }
+        if (mobLevel > 65)
+            mobLevel = 65;
+
+        int max = (int) (4.882 * mobLevel + 127.0);
+
+        if (max > 319)
+            max = 319;
+
+        int min = (int) (4.469 * mobLevel - 3.469);
+
+        if (min < 70)
+            min = 70;
+
+        if (inHotzone)
+            min += mobLevel;
 
         int roll = ThreadLocalRandom.current().nextInt(min, max + 1);
 
@@ -497,7 +299,12 @@ public enum LootManager {
 
         int high = bse.highGold;
         int low = bse.lowGold;
-        int gold = (int) (ThreadLocalRandom.current().nextInt(low, high + 1) * NORMAL_GOLD_RATE);
+        int gold = ThreadLocalRandom.current().nextInt(low, high + 1);
+
+        if (inHotzone == true)
+            gold = (int) (gold * HOTZONE_GOLD_RATE);
+        else
+            gold = (int) (gold * NORMAL_GOLD_RATE);
 
         if (gold > 0) {
             MobLoot goldAmount = new MobLoot(mob, gold);
@@ -508,67 +315,47 @@ public enum LootManager {
 
     public static void GenerateLootDrop(Mob mob, int tableID, Boolean inHotzone) {
 
-        MobLoot toAdd = getGenTableItem(tableID, mob, inHotzone);
-        if(toAdd != null){
-            ItemBase ib = toAdd.getItemBase();
-            switch(ib.getType()){
-                case CONTRACT:
-                case RUNE:
-                case RESOURCE:
-                    return;
-            }
+        try {
 
-            if (ib.getUUID() == 1580021)//mithril
-                return;
+            MobLoot toAdd = getGenTableItem(tableID, mob, inHotzone);
 
-            toAdd.setIsID(true);
-            mob.getCharItemManager().addItemToInventory(toAdd);
+            if (toAdd != null)
+                mob.getCharItemManager().addItemToInventory(toAdd);
+
+        } catch (Exception e) {
+            //TODO chase down loot generation error, affects roughly 2% of drops
+            int i = 0;
         }
     }
 
-
     public static void GenerateEquipmentDrop(Mob mob) {
 
-        if (mob == null || mob.getSafeZone())
-            return; // no equipment to drop in safezones
-
-        if(mob.StrongholdGuardian || mob.StrongholdCommander || mob.StrongholdEpic)
-            return; // stronghold mobs don't drop equipment
-
+        if(mob.behaviourType.equals(Enum.MobBehaviourType.HamletGuard))
+            return; // safehold guards don't drop their equipment
         //do equipment here
-        if (mob.getEquip() != null) {
-            boolean isVorg = false;
+        int dropCount = 0;
+        if (mob.getEquip() != null)
             for (MobEquipment me : mob.getEquip().values()) {
 
                 if (me.getDropChance() == 0)
                     continue;
 
-                String name = me.getItemBase().getName().toLowerCase();
-                if (name.contains("vorgrim legionnaire's") || name.contains("vorgrim auxiliary's") ||name.contains("bellugh nuathal") || name.contains("crimson circle"))
-                    isVorg = true;
-
-                if(isVorg && !mob.isDropper){
-                    continue;
-                }
-
                 float equipmentRoll = ThreadLocalRandom.current().nextInt(1, 100 + 1);
                 float dropChance = me.getDropChance() * 100;
-                ItemBase itemBase = me.getItemBase();
-                if(isVorg) {
-                    mob.spawnTime = ThreadLocalRandom.current().nextInt(300, 2700);
-                    dropChance = 7.5f;
-                    itemBase = getRandomVorg(itemBase);
-                }
+
                 if (equipmentRoll > dropChance)
                     continue;
 
-                MobLoot ml = new MobLoot(mob, itemBase, false);
+                MobLoot ml = new MobLoot(mob, me.getItemBase(), false);
 
-                ml.setIsID(true);
-                ml.setDurabilityCurrent((short) (ml.getDurabilityCurrent() - ThreadLocalRandom.current().nextInt(5) + 1));
-                mob.getCharItemManager().addItemToInventory(ml);
+                if (ml != null && dropCount < 1) {
+                    ml.setIsID(true);
+                    ml.setDurabilityCurrent((short) (ml.getDurabilityCurrent() - ThreadLocalRandom.current().nextInt(5) + 1));
+                    mob.getCharItemManager().addItemToInventory(ml);
+                    dropCount = 1;
+                    //break; // Exit on first successful roll.
+                }
             }
-        }
     }
 
     public static void GenerateInventoryDrop(Mob mob, BootySetEntry bse) {
@@ -580,134 +367,12 @@ public enum LootManager {
         if (chanceRoll > bse.dropChance)
             return;
 
-        if(bse.itemBase == 1580021)//mithril
-            return;
         MobLoot lootItem = new MobLoot(mob, ItemBase.getItemBase(bse.itemBase), true);
 
-        if (lootItem != null) {
+        if (lootItem != null)
             mob.getCharItemManager().addItemToInventory(lootItem);
-            if(lootItem.getItemBase().isDiscRune() && !Mob.discDroppers.contains(mob))
-                Mob.AddDiscDropper(mob);
-        }
     }
 
-    public static void newFatePeddler(PlayerCharacter playerCharacter, Item gift) {
-
-        CharacterItemManager itemMan = playerCharacter.getCharItemManager();
-
-        if (itemMan == null)
-            return;
-
-        //check if player owns the gift he is trying to open
-
-        if (!itemMan.doesCharOwnThisItem(gift.getObjectUUID()))
-            return;
-
-        ItemBase ib = gift.getItemBase();
-
-        MobLoot winnings = null;
-
-        if (ib == null)
-            return;
-        switch (ib.getUUID()) {
-            case 971070: //wrapped rune
-                Random random = new Random();
-                int roll = random.nextInt(100);
-                int itemId;
-                ItemBase runeBase;
-                 if (roll >= 90) {
-                //35 or 40
-                     roll = ThreadLocalRandom.current().nextInt(HellgateManager.static_rune_ids_high.size() + 1);
-                     itemId = HellgateManager.static_rune_ids_high.get(0);
-                    try {
-                        itemId = HellgateManager.static_rune_ids_high.get(roll);
-                   } catch (Exception e) {
-
-                    }
-                  runeBase = ItemBase.getItemBase(itemId);
-                   if (runeBase != null) {
-                       MobLoot rune = new MobLoot(playerCharacter, runeBase, true);
-
-                       if (rune != null)
-                           playerCharacter.getCharItemManager().addItemToInventory(rune);
-                   }
-                } else if (roll >= 65 && roll <= 89) {
-                //30,35 or 40
-                    roll = ThreadLocalRandom.current().nextInt(HellgateManager.static_rune_ids_mid.size() + 1);
-                    itemId = HellgateManager.static_rune_ids_mid.get(0);
-                    try {
-                        itemId = HellgateManager.static_rune_ids_mid.get(roll);
-                   } catch (Exception e) {
-
-                    }
-                    runeBase = ItemBase.getItemBase(itemId);
-                    if (runeBase != null) {
-                        MobLoot rune = new MobLoot(playerCharacter, runeBase, true);
-
-                        if (rune != null)
-                            playerCharacter.getCharItemManager().addItemToInventory(rune);
-                    }
-                 } else {
-                //5-30
-                     roll = ThreadLocalRandom.current().nextInt(HellgateManager.static_rune_ids_low.size() + 1);
-                     itemId = HellgateManager.static_rune_ids_low.get(0);
-                    try {
-                        itemId = HellgateManager.static_rune_ids_low.get(roll);
-                    } catch (Exception ignored) {
-
-                   }
-                   runeBase = ItemBase.getItemBase(itemId);
-                   if (runeBase != null) {
-                       MobLoot rune = new MobLoot(playerCharacter, runeBase, true);
-
-                        if (rune != null)
-                            playerCharacter.getCharItemManager().addItemToInventory(rune);
-                    }
-                }
-                break;
-            case 971012: //wrapped glass
-                int chance = ThreadLocalRandom.current().nextInt(100);
-                if(chance == 50){
-                    int ID = 7000000;
-                    int additional = ThreadLocalRandom.current().nextInt(0,28);
-                    ID += (additional * 10);
-                    ItemBase glassBase = ItemBase.getItemBase(ID);
-                    if(glassBase != null) {
-                        winnings = new MobLoot(playerCharacter, glassBase, 1, false);
-                        ChatManager.chatSystemInfo(playerCharacter, "You've Won A " + glassBase.getName());
-                    }
-                }else{
-                    ChatManager.chatSystemInfo(playerCharacter, "Please Try Again!");
-                }
-                break;
-        }
-
-        if (winnings == null) {
-            itemMan.consume(gift);
-            itemMan.updateInventory();
-            return;
-        }
-
-        //early exit if the inventory of the player will not hold the item
-
-        if (!itemMan.hasRoomInventory(winnings.getItemBase().getWeight())) {
-            ErrorPopupMsg.sendErrorPopup(playerCharacter, 21);
-            return;
-        }
-
-        winnings.setIsID(true);
-
-        //remove gift from inventory
-
-        itemMan.consume(gift);
-
-        //add winnings to player inventory
-
-        Item playerWinnings = winnings.promoteToItem(playerCharacter);
-        itemMan.addItemToInventory(playerWinnings);
-        itemMan.updateInventory();
-
-    }
     public static void peddleFate(PlayerCharacter playerCharacter, Item gift) {
 
         //get table ID for the itembase ID
@@ -729,12 +394,12 @@ public enum LootManager {
 
         //check if player owns the gift he is trying to open
 
-        if (!itemMan.doesCharOwnThisItem(gift.getObjectUUID()))
+        if (itemMan.doesCharOwnThisItem(gift.getObjectUUID()) == false)
             return;
 
         //roll 1-100 for the gen table selection
 
-        int genRoll = ThreadLocalRandom.current().nextInt(94, 100) + 1;
+        int genRoll = ThreadLocalRandom.current().nextInt(1, 100 + 1);
         GenTableEntry selectedRow = GenTableEntry.rollTable(tableID, genRoll, LootManager.NORMAL_DROP_RATE);
 
         if(selectedRow == null)
@@ -750,276 +415,45 @@ public enum LootManager {
 
         //create the item from the table, quantity is always 1
 
-        ItemBase ib = ItemBase.getItemBase(selectedItem.cacheID);
-        if(ib.getUUID() == Warehouse.coalIB.getUUID()){
-            //no more coal, give gold instead
-            if (itemMan.getGoldInventory().getNumOfItems() + 250000 > MBServerStatics.PLAYER_GOLD_LIMIT) {
-                ErrorPopupMsg.sendErrorPopup(playerCharacter, 21);
-                return;
-            }
-            itemMan.addGoldToInventory(250000,false);
-            itemMan.updateInventory();
-        }else {
-            MobLoot winnings = new MobLoot(playerCharacter, ib, 1, false);
+        MobLoot winnings = new MobLoot(playerCharacter, ItemBase.getItemBase(selectedItem.cacheID), 1, false);
 
-            if (winnings == null)
-                return;
+        if (winnings == null)
+            return;
 
-            //early exit if the inventory of the player will not hold the item
+        //early exit if the inventory of the player will not old the item
 
-            if (itemMan.hasRoomInventory(winnings.getItemBase().getWeight()) == false) {
-                ErrorPopupMsg.sendErrorPopup(playerCharacter, 21);
-                return;
-            }
-
-            //determine if the winning item needs a prefix
-
-            if (selectedRow.pModTable != 0) {
-                int prefixRoll = ThreadLocalRandom.current().nextInt(220, 320 + 1);
-                ModTableEntry prefix = ModTableEntry.rollTable(selectedRow.pModTable, prefixRoll);
-                if (prefix != null)
-                    winnings.addPermanentEnchantment(prefix.action, 0, prefix.level, true);
-            }
-
-            //determine if the winning item needs a suffix
-
-            if (selectedRow.sModTable != 0) {
-                int suffixRoll = ThreadLocalRandom.current().nextInt(220, 320 + 1);
-                ModTableEntry suffix = ModTableEntry.rollTable(selectedRow.sModTable, suffixRoll);
-                if (suffix != null)
-                    winnings.addPermanentEnchantment(suffix.action, 0, suffix.level, true);
-            }
-            winnings.setIsID(true);
-
-            //remove gift from inventory
-
-            itemMan.consume(gift);
-
-            //add winnings to player inventory
-
-            Item playerWinnings = winnings.promoteToItem(playerCharacter);
-            itemMan.addItemToInventory(playerWinnings);
-            itemMan.updateInventory();
-        }
-    }
-
-    public static int rollRandomItem(int itemTable){
-        int returnedID = ItemTableEntry.getRandomItem(itemTable);
-        return returnedID;
-    }
-
-    public static ItemBase getRandomVorg(ItemBase itemBase){
-        int roll = 0;
-        if(vorg_ha_uuids.contains(itemBase.getUUID())) {
-            roll = ThreadLocalRandom.current().nextInt(0, 9);
-            switch (roll) {
-                case 1:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(0));
-                case 2:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(1));
-                case 3:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(2));
-                case 4:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(3));
-                case 5:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(4));
-                case 6:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(5));
-                case 7:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(6));
-                case 8:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(7));
-                default:
-                    return ItemBase.getItemBase(vorg_ha_uuids.get(8));
-            }
+        if (itemMan.hasRoomInventory(winnings.getItemBase().getWeight()) == false) {
+            ErrorPopupMsg.sendErrorPopup(playerCharacter, 21);
+            return;
         }
 
-        if(vorg_ma_uuids.contains(itemBase.getUUID())) {
-            roll = ThreadLocalRandom.current().nextInt(0, 8);
-            switch (roll) {
-                case 1:
-                    return ItemBase.getItemBase(vorg_ma_uuids.get(0));
-                case 2:
-                    return ItemBase.getItemBase(vorg_ma_uuids.get(1));
-                case 3:
-                    return ItemBase.getItemBase(vorg_ma_uuids.get(2));
-                case 4:
-                    return ItemBase.getItemBase(vorg_ma_uuids.get(3));
-                case 5:
-                    return ItemBase.getItemBase(vorg_ma_uuids.get(4));
-                case 6:
-                    return ItemBase.getItemBase(vorg_ma_uuids.get(5));
-                case 7:
-                    return ItemBase.getItemBase(vorg_ma_uuids.get(6));
-                default:
-                    return ItemBase.getItemBase(vorg_ma_uuids.get(7));
-            }
+        //determine if the winning item needs a prefix
+
+        if(selectedRow.pModTable != 0){
+            int prefixRoll = ThreadLocalRandom.current().nextInt(220,320 + 1);
+            ModTableEntry prefix = ModTableEntry.rollTable(selectedRow.pModTable, prefixRoll);
+            if(prefix != null)
+                winnings.addPermanentEnchantment(prefix.action, 0, prefix.level, true);
         }
 
-        if(vorg_la_uuids.contains(itemBase.getUUID())) {
-            roll = ThreadLocalRandom.current().nextInt(0, 8);
-            switch (roll) {
-                case 1:
-                    return ItemBase.getItemBase(vorg_la_uuids.get(0));
-                case 2:
-                    return ItemBase.getItemBase(vorg_la_uuids.get(1));
-                case 3:
-                    return ItemBase.getItemBase(vorg_la_uuids.get(2));
-                case 4:
-                    return ItemBase.getItemBase(vorg_la_uuids.get(3));
-                case 5:
-                    return ItemBase.getItemBase(vorg_la_uuids.get(4));
-                case 6:
-                    return ItemBase.getItemBase(vorg_la_uuids.get(5));
-                case 7:
-                    return ItemBase.getItemBase(vorg_la_uuids.get(6));
-                default:
-                    return ItemBase.getItemBase(vorg_la_uuids.get(7));
-            }
+        //determine if the winning item needs a suffix
+
+        if(selectedRow.sModTable != 0){
+            int suffixRoll = ThreadLocalRandom.current().nextInt(220,320 + 1);
+            ModTableEntry suffix = ModTableEntry.rollTable(selectedRow.sModTable, suffixRoll);
+            if (suffix != null)
+                winnings.addPermanentEnchantment(suffix.action, 0, suffix.level, true);
         }
+        winnings.setIsID(true);
 
-        if(vorg_cloth_uuids.contains(itemBase.getUUID())) {
-            roll = ThreadLocalRandom.current().nextInt(0, 5);
-            switch (roll) {
-                case 1:
-                    return ItemBase.getItemBase(vorg_cloth_uuids.get(0));
-                case 2:
-                    return ItemBase.getItemBase(vorg_cloth_uuids.get(1));
-                case 3:
-                    return ItemBase.getItemBase(vorg_cloth_uuids.get(2));
-                case 4:
-                    return ItemBase.getItemBase(vorg_cloth_uuids.get(3));
-                default:
-                    return ItemBase.getItemBase(vorg_cloth_uuids.get(4));
-            }
-        }
+        //remove gift from inventory
 
-        return null;
-    }
+        itemMan.consume(gift);
 
-    public static void DropPresent(Mob mob){
-        int random = 971049 + ThreadLocalRandom.current().nextInt(24);
-        if (random > 971071)
-            random = 971071;
+        //add winnings to player inventory
 
-        ItemBase present = ItemBase.getItemBase(random);
-        if (present != null) {
-            MobLoot toAdd = new MobLoot(mob, present, true);
-
-            if (toAdd != null)
-                mob.getCharItemManager().addItemToInventory(toAdd);
-        }
-    }
-
-    public static void GenerateStrongholdLoot(Mob mob, boolean commander, boolean epic) {
-
-        mob.getCharItemManager().clearInventory();
-
-        int multiplier = 1;
-        if (commander)
-            multiplier = 2;
-        if(epic)
-            multiplier = 10;
-
-        int high = 125000;
-        int low = 50000;
-        int gold = ThreadLocalRandom.current().nextInt(low, high + 1) * multiplier;
-
-        if (gold > 0) {
-            MobLoot goldAmount = new MobLoot(mob, gold);
-            mob.getCharItemManager().addItemToInventory(goldAmount);
-        }
-
-        //present drop chance for all
-        //if (ThreadLocalRandom.current().nextInt(100) < 35)
-        //    DropPresent(mob);
-
-        //random contract drop chance for all
-        if (ThreadLocalRandom.current().nextInt(100) < 40) {
-            int contractTableID = 250;
-            contractTableID += ThreadLocalRandom.current().nextInt(0, 11);
-            if (contractTableID > 259)
-                contractTableID = 659;
-
-                int id = rollRandomItem(contractTableID);
-                ItemBase ib = ItemBase.getItemBase(id);
-                if (ib != null) {
-                    MobLoot contract = new MobLoot(mob, ib, true);
-
-                    if (contract != null)
-                        mob.getCharItemManager().addItemToInventory(contract);
-                }
-        }
-
-        //special commander drop chances
-        if (commander)
-            GenerateCommanderLoot(mob,false);
-
-        //special epic drop chances
-        if (epic) {
-            GenerateCommanderLoot(mob, true);
-            GenerateCommanderLoot(mob,false);
-        }
-    }
-
-    public static void GenerateCommanderLoot(Mob mob, boolean epic){
-        //present chance
-        if (ThreadLocalRandom.current().nextInt(100) < 25)
-            DropPresent(mob);
-
-        //present chance
-        if (ThreadLocalRandom.current().nextInt(100) < 25)
-            DropPresent(mob);
-
-        //chance for glass
-        if (ThreadLocalRandom.current().nextInt(100) < 75) {
-            int glassID = rollRandomItem(126);
-            ItemBase glassItem = ItemBase.getItemBase(glassID);
-            if (glassItem != null) {
-                MobLoot toAdd2 = new MobLoot(mob, glassItem, true);
-
-                if (toAdd2 != null)
-                    mob.getCharItemManager().addItemToInventory(toAdd2);
-            }
-        }
-
-        //chance for disc
-        if (ThreadLocalRandom.current().nextInt(100) < 75) {
-            int discID = rollRandomItem(3202);
-            ItemBase discItem = ItemBase.getItemBase(discID);
-            if (discItem != null) {
-                MobLoot toAdd3 = new MobLoot(mob, discItem, true);
-
-                if (toAdd3 != null)
-                    mob.getCharItemManager().addItemToInventory(toAdd3);
-            }
-        }
-
-        //chance for stat rune
-        if (ThreadLocalRandom.current().nextInt(100) < 75) {
-            int runeID = rollRandomItem(3201);
-            ItemBase runeItem = ItemBase.getItemBase(runeID);
-            if (runeItem != null) {
-                MobLoot toAdd4 = new MobLoot(mob, runeItem, true);
-
-                if (toAdd4 != null)
-                    mob.getCharItemManager().addItemToInventory(toAdd4);
-            }
-        }
-        if(epic){
-            int contractTableID = 250;
-            contractTableID += ThreadLocalRandom.current().nextInt(0, 11);
-            if (contractTableID > 259)
-                contractTableID = 659;
-
-            int id = rollRandomItem(contractTableID);
-            ItemBase ib = ItemBase.getItemBase(id);
-            if (ib != null) {
-                MobLoot contract = new MobLoot(mob, ib, true);
-
-                if (contract != null)
-                    mob.getCharItemManager().addItemToInventory(contract);
-            }
-        }
+        Item playerWinnings = winnings.promoteToItem(playerCharacter);
+        itemMan.addItemToInventory(playerWinnings);
+        itemMan.updateInventory();
     }
 }

src/engine/gameManager/LoreMineManager.java

@@ -1,130 +0,0 @@
-package engine.gameManager;
-
-import engine.Enum;
-import engine.math.Vector3fImmutable;
-import engine.objects.Guild;
-import engine.objects.Mine;
-import engine.objects.PlayerCharacter;
-import engine.objects.Regions;
-
-import java.util.*;
-
-public class LoreMineManager {
-
-    //Saetor Allowed Charters:
-    //BARBARIAN
-    //MILITARY
-    //RANGER
-    //AMAZON
-    //WIZARD
-    //MERCENARY
-    //THIEVES
-    //SCOURGE
-    //UNHOLY
-    public static final Map<Enum.GuildType, List<String>> GUILD_RACES = new HashMap<>();
-    public static final Map<Enum.GuildType, List<String>> GUILD_CLASSES = new HashMap<>();
-    public static final Map<Enum.GuildType, Boolean> GUILD_GENDER_RESTRICTION = new HashMap<>();
-
-    static {
-        GUILD_RACES.put(Enum.GuildType.CATHEDRAL, Arrays.asList("Aelfborn", "Centaur", "Elf", "Half Giant", "Human"));
-        GUILD_CLASSES.put(Enum.GuildType.CATHEDRAL, Arrays.asList("Bard", "Channeler", "Crusader", "Nightstalker", "Prelate", "Priest", "Scout", "Sentinel"));
-
-        GUILD_RACES.put(Enum.GuildType.MILITARY, Arrays.asList("Centaur", "Half Giant", "Human", "Saetor"));
-        GUILD_CLASSES.put(Enum.GuildType.MILITARY, Arrays.asList("Bard", "Priest", "Scout", "Warlock", "Warrior", "Wizard"));
-
-        GUILD_RACES.put(Enum.GuildType.TEMPLE, Arrays.asList("Half Giant", "Human"));
-        GUILD_CLASSES.put(Enum.GuildType.TEMPLE, Arrays.asList("Assassin", "Bard", "Channeler", "Confessor", "Nightstalker", "Priest", "Scout", "Templar"));
-
-        GUILD_RACES.put(Enum.GuildType.BARBARIAN, Arrays.asList("Aelfborn", "Half Giant", "Human", "Minotaur", "Saetor"));
-        GUILD_CLASSES.put(Enum.GuildType.BARBARIAN, Arrays.asList("Barbarian", "Bard", "Doomsayer", "Fury", "Priest", "Scout", "Thief", "Warrior"));
-
-        GUILD_RACES.put(Enum.GuildType.RANGER, Arrays.asList("Aelfborn", "Elf", "Half Giant", "Human", "Shade", "Saetor"));
-        GUILD_CLASSES.put(Enum.GuildType.RANGER, Arrays.asList("Bard", "Channeler", "Druid", "Priest", "Ranger", "Scout", "Warrior"));
-
-        GUILD_RACES.put(Enum.GuildType.AMAZON, Arrays.asList("Aelfborn", "Elf", "Half Giant", "Human", "Saetor"));
-        GUILD_CLASSES.put(Enum.GuildType.AMAZON, Arrays.asList("Bard", "Druid", "Fury", "Huntress", "Priest", "Scout", "Warrior", "Wizard"));
-        GUILD_GENDER_RESTRICTION.put(Enum.GuildType.AMAZON, true); // Female only
-
-        GUILD_RACES.put(Enum.GuildType.NOBLE, Arrays.asList("Aelfborn", "Half Giant", "Human"));
-        GUILD_CLASSES.put(Enum.GuildType.NOBLE, Arrays.asList("Assassin", "Bard", "Channeler", "Priest", "Scout", "Thief", "Warlock", "Warrior", "Wizard"));
-
-        GUILD_RACES.put(Enum.GuildType.WIZARD, Arrays.asList("Aelfborn", "Elf", "Human", "Nephilim", "Shade", "Saetor"));
-        GUILD_CLASSES.put(Enum.GuildType.WIZARD, Arrays.asList("Assassin", "Bard", "Channeler", "Doomsayer", "Fury", "Necromancer", "Priest", "Warlock", "Wizard"));
-
-        GUILD_RACES.put(Enum.GuildType.MERCENARY, Arrays.asList("Aelfborn", "Aracoix", "Half Giant", "Human", "Shade", "Saetor"));
-        GUILD_CLASSES.put(Enum.GuildType.MERCENARY, Arrays.asList("Assassin", "Bard", "Priest", "Scout", "Thief", "Warlock", "Warrior"));
-
-        GUILD_RACES.put(Enum.GuildType.THIEVES, Arrays.asList("Aelfborn", "Aracoix", "Elf", "Human", "Irekei", "Nephilim", "Shade", "Vampire", "Saetor"));
-        GUILD_CLASSES.put(Enum.GuildType.THIEVES, Arrays.asList("Assassin", "Barbarian", "Bard", "Priest", "Scout", "Thief", "Wizard"));
-
-        GUILD_RACES.put(Enum.GuildType.DWARF, Arrays.asList("Dwarf"));
-        GUILD_CLASSES.put(Enum.GuildType.DWARF, Arrays.asList("Crusader", "Prelate", "Priest", "Sentinel", "Warrior"));
-
-        GUILD_RACES.put(Enum.GuildType.HIGHCOURT, Arrays.asList("Elf", "Minotaur"));
-        GUILD_CLASSES.put(Enum.GuildType.HIGHCOURT, Arrays.asList("Assassin", "Bard", "Channeler", "Druid", "Necromancer", "Priest", "Ranger", "Scout", "Thief", "Warrior", "Wizard"));
-
-        GUILD_RACES.put(Enum.GuildType.VIRAKT, Arrays.asList("Irekei"));
-        GUILD_CLASSES.put(Enum.GuildType.VIRAKT, Arrays.asList("Assassin", "Bard", "Channeler", "Fury", "Huntress", "Nightstalker", "Priest", "Ranger", "Scout", "Thief", "Warrior", "Wizard"));
-
-        GUILD_RACES.put(Enum.GuildType.SCOURGE, Arrays.asList("Aelfborn", "Human", "Minotaur", "Nephilim", "Saetor"));
-        GUILD_CLASSES.put(Enum.GuildType.SCOURGE, Arrays.asList("Bard", "Channeler", "Doomsayer", "Priest", "Scout", "Warrior", "Wizard"));
-
-        GUILD_RACES.put(Enum.GuildType.KHREE, Arrays.asList("Aracoix"));
-        GUILD_CLASSES.put(Enum.GuildType.KHREE, Arrays.asList("Assassin", "Barbarian", "Bard", "Huntress", "Priest", "Ranger", "Scout", "Thief", "Warlock", "Warrior"));
-
-        GUILD_RACES.put(Enum.GuildType.CENTAUR, Arrays.asList("Centaur"));
-        GUILD_CLASSES.put(Enum.GuildType.CENTAUR, Arrays.asList("Barbarian", "Crusader", "Druid", "Huntress", "Prelate", "Priest", "Ranger", "Sentinel", "Warrior"));
-
-        GUILD_RACES.put(Enum.GuildType.UNHOLY, Arrays.asList("Human", "Shade", "Vampire", "Saetor"));
-        GUILD_CLASSES.put(Enum.GuildType.UNHOLY, Arrays.asList("Assassin", "Channeler", "Necromancer", "Priest", "Scout", "Thief", "Warlock", "Warrior", "Wizard"));
-    }
-
-    public static void AuditPlayer(PlayerCharacter pc, Mine mine){
-        Guild nation = pc.guild.getNation();
-
-        if(mine.chosen_charters == null){
-            mine.chosen_charters = new HashMap<>();
-        }
-
-        Enum.GuildType guildType;
-        if (mine.chosen_charters.containsKey(nation)) {
-            guildType = mine.chosen_charters.get(nation);
-        }else{
-            guildType = Enum.GuildType.getGuildTypeFromInt(pc.guild.getCharter());
-            mine.chosen_charters.put(nation,guildType);
-        }
-
-        if(!validForCharter(pc,guildType)){
-            //bounce out to SDR
-            Vector3fImmutable bounceLoc = Vector3fImmutable.getRandomPointOnCircle(ZoneManager.getZoneByUUID(656).getLoc(),30f);
-            pc.setLoc(bounceLoc);
-            MovementManager.translocate(pc, bounceLoc, Regions.GetRegionForTeleport(ZoneManager.getZoneByUUID(656).getLoc()));
-            ChatManager.chatSystemInfo(pc, "You Failed To Meet Lore Requirements");
-        }
-    }
-
-    public static boolean validForCharter(PlayerCharacter pc, Enum.GuildType guildType) {
-        if(pc.getPromotionClass() == null)
-            return false;
-
-        // Define the races and classes for each GuildType
-
-
-        // Get the allowed races and classes for this guildType
-        List<String> allowedRaces = GUILD_RACES.getOrDefault(guildType, Collections.emptyList());
-        List<String> allowedClasses = GUILD_CLASSES.getOrDefault(guildType, Collections.emptyList());
-
-        // Validate player's race and class
-        if (!allowedRaces.contains(pc.getRace().getName()) || !allowedClasses.contains(pc.getPromotionClass().getName())) {
-            return false;
-        }
-
-        // Gender restriction check for AMAZON
-        if (guildType.equals(Enum.GuildType.AMAZON) && pc.isMale() && pc.getRaceID() != 1999) {
-            return false;
-        }
-
-        return true;
-    }
-
-}

src/engine/gameManager/MaintenanceManager.java

@@ -24,7 +24,7 @@ public enum MaintenanceManager {
 
     public static void setMaintDateTime(Building building, LocalDateTime maintDate) {
 
-        building.maintDateTime = maintDate.withHour(1).withMinute(0).withSecond(0);
+        building.maintDateTime = maintDate;
         DbManager.BuildingQueries.updateMaintDate(building);
 
     }
@@ -45,19 +45,28 @@ public enum MaintenanceManager {
         // Deduct upkeep and build list of buildings
         // which did not have funds available
 
-        for (Building building : maintList) {
+        try {
+            for (Building building : maintList)
+                if (chargeUpkeep(building) == false)
+                    derankList.add(building);
+        } catch (Exception e) {
+            Logger.error(e);
+        }
+        // Reset maintenance dates for these buildings
 
-            if (chargeUpkeep(building) == false)
-                derankList.add(building);
-            else
-                setMaintDateTime(building, LocalDateTime.now().plusDays(7));
+        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)
+                building.destroyOrDerank(null);
+        } catch (Exception e) {
+            Logger.error(e);
         }
 
-        for (Building building : derankList) {
-            building.destroyOrDerank(null);
-            if(building.getRank() > 0)
-                setMaintDateTime(building, LocalDateTime.now().plusDays(1));
-        }
         Logger.info("Structures: " + buildingList.size() + " Maint: " + maintList.size() + " Derank: " + derankList.size());
     }
 
@@ -94,10 +103,6 @@ public enum MaintenanceManager {
                 continue;
             }
 
-            //only ToL pays maintenance
-            if(building.getBlueprint().getBuildingGroup() != null && !building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.TOL))
-                continue;
-
             // No maintenance on banestones omfg
 
             if (building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.BANESTONE))
@@ -122,9 +127,9 @@ public enum MaintenanceManager {
 
 
             //no maintenance if day of week doesnt match
-            //if (LocalDateTime.now().getDayOfWeek().ordinal() != building.maintDateTime.getDayOfWeek().ordinal()) {
-            //    continue;
-            //}
+            if (LocalDateTime.now().getDayOfWeek().ordinal() != building.maintDateTime.getDayOfWeek().ordinal()) {
+                continue;
+            }
             //  Add building to maintenance queue
 
             maintList.add(building);
@@ -179,15 +184,56 @@ public enum MaintenanceManager {
         if ((overDraft > 0))
             if ((building.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.SHRINE) == false) &&
                     (warehouse != null) && building.assetIsProtected() == true &&
-                    (warehouse.getResources().get(ItemBase.GOLD_ITEM_BASE)) >= overDraft) {
+                    (warehouse.resources.get(ItemBase.GOLD_ITEM_BASE)) >= overDraft) {
                 hasFunds = true;
             }
 
         // If this is an R8 tree, validate that we can
         // cover the resources required
 
+        if (building.getRank() == 8) {
+
+            hasResources = true;
+
+            if (warehouse == null)
+                hasResources = false;
+            else {
+
+                resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580000));
+
+                if (resourceValue < 1500)
+                    hasResources = false;
+
+                resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580004));
+
+                if (resourceValue < 1500)
+                    hasResources = false;
+
+                resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580017));
+
+                if (resourceValue < 5)
+                    hasResources = false;
+
+                resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580018));
+
+                if (resourceValue < 5)
+                    hasResources = false;
+
+            }
+        }
+        // Validation completed but has failed.  We can derank
+        // the target building and early exit
+
+        if ((hasFunds == false) ||
+                ((building.getRank() == 8) && !hasResources)) {
+
+            // Add cash back to strongbox for lost rank if the building isn't being destroyed
+            // and it's not an R8 deranking
+
+            if ((building.getRank() > 1) && (building.getRank() < 8)) {
+                building.setStrongboxValue(building.getStrongboxValue() + building.getBlueprint().getRankCost(Math.min(building.getRank(), 7)));
+            }
 
-        if (hasFunds == false) {
             return false; // Early exit for having failed to meet maintenance
         }
 
@@ -201,17 +247,69 @@ public enum MaintenanceManager {
 
         if (overDraft > 0) {
 
-            resourceValue = warehouse.getResources().get(Warehouse.goldIB);
+            resourceValue = warehouse.resources.get(ItemBase.getItemBase(7));
 
             if (DbManager.WarehouseQueries.updateGold(warehouse, resourceValue - overDraft) == true) {
-                warehouse.getResources().put(Warehouse.goldIB, resourceValue - overDraft);
-                warehouse.AddTransactionToWarehouse(Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.GOLD, overDraft);
+                warehouse.resources.put(ItemBase.getItemBase(7), resourceValue - overDraft);
+                Warehouse.AddTransactionToWarehouse(warehouse, 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;
             }
         }
 
+        // Early exit as we're done if we're not an R8 tree
+
+        if (building.getRank() < 8)
+            return true;
+
+        // Now for the resources if it's an R8 tree
+
+        // Withdraw Stone
+
+        resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580000));
+
+        if (DbManager.WarehouseQueries.updateStone(warehouse, resourceValue - 1500) == true) {
+            warehouse.resources.put(ItemBase.getItemBase(1580000), resourceValue - 1500);
+            Warehouse.AddTransactionToWarehouse(warehouse, Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.STONE, 1500);
+        } else {
+            Logger.error("stone update failed for warehouse of UUID:" + warehouse.getObjectUUID());
+            return true;
+        }
+
+        // Withdraw Lumber
+
+        resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580004));
+
+        if (DbManager.WarehouseQueries.updateLumber(warehouse, resourceValue - 1500) == true) {
+            warehouse.resources.put(ItemBase.getItemBase(1580004), resourceValue - 1500);
+            Warehouse.AddTransactionToWarehouse(warehouse, Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.LUMBER, 1500);
+        } else {
+            Logger.error("lumber update failed for warehouse of UUID:" + warehouse.getObjectUUID());
+            return true;
+        }
+
+        // Withdraw Galvor
+
+        resourceValue = warehouse.resources.get(ItemBase.getItemBase(1580017));
+
+        if (DbManager.WarehouseQueries.updateGalvor(warehouse, resourceValue - 5) == true) {
+            warehouse.resources.put(ItemBase.getItemBase(1580017), resourceValue - 5);
+            Warehouse.AddTransactionToWarehouse(warehouse, 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));
+
+        if (DbManager.WarehouseQueries.updateWormwood(warehouse, resourceValue - 5) == true) {
+            warehouse.resources.put(ItemBase.getItemBase(1580018), resourceValue - 5);
+            Warehouse.AddTransactionToWarehouse(warehouse, Enum.GameObjectType.Building, building.getObjectUUID(), Enum.TransactionType.WITHDRAWL, Resource.WORMWOOD, 5);
+        } else {
+            Logger.error("wyrmwood update failed for warehouse of UUID:" + warehouse.getObjectUUID());
+        }
+
         return true;
     }
 

src/engine/gameManager/MovementManager.java

@@ -66,6 +66,12 @@ public enum MovementManager {
         if (!toMove.isAlive())
             return;
 
+        if (toMove.getObjectType().equals(GameObjectType.PlayerCharacter)) {
+            if (((PlayerCharacter) toMove).isCasting())
+                ((PlayerCharacter) toMove).update();
+        }
+
+
         toMove.setIsCasting(false);
         toMove.setItemCasting(false);
 
@@ -90,7 +96,7 @@ public enum MovementManager {
         if (!toMove.isMoving())
             toMove.resetLastSetLocUpdate();
         else
-            toMove.update(false);
+            toMove.update();
 
         // Update movement for the player
 
@@ -99,9 +105,6 @@ public enum MovementManager {
         //    		((Mob)toMove).updateLocation();
         // get start and end locations for the move
         Vector3fImmutable startLocation = new Vector3fImmutable(msg.getStartLat(), msg.getStartAlt(), msg.getStartLon());
-        //if(toMove.isMoving()){
-        //    startLocation = toMove.getMovementLoc();
-        //}
         Vector3fImmutable endLocation = new Vector3fImmutable(msg.getEndLat(), msg.getEndAlt(), msg.getEndLon());
 
         //		if (toMove.getObjectType() == GameObjectType.PlayerCharacter)
@@ -113,8 +116,8 @@ public enum MovementManager {
 
         // if inside a building, convert both locations from the building local reference frame to the world reference frame
 
-        if (msg.getTargetID() > 0) {
-            Building building = BuildingManager.getBuildingFromCache(msg.getTargetID());
+        if (msg.getInBuildingUUID() > 0) {
+            Building building = BuildingManager.getBuildingFromCache(msg.getInBuildingUUID());
             if (building != null) {
 
                 Vector3fImmutable convertLocEnd = new Vector3fImmutable(ZoneManager.convertLocalToWorld(building, endLocation));
@@ -125,8 +128,8 @@ public enum MovementManager {
                 //                }
                 //                else {
                 toMove.setInBuilding(msg.getInBuilding());
-                toMove.setInFloorID(msg.getUnknown01());
-                toMove.setInBuildingID(msg.getTargetID());
+                toMove.setInFloorID(msg.getInBuildingFloor());
+                toMove.setInBuildingID(msg.getInBuildingUUID());
                 msg.setStartCoord(ZoneManager.convertWorldToLocal(building, toMove.getLoc()));
 
                 if (toMove.getObjectType() == GameObjectType.PlayerCharacter) {
@@ -171,9 +174,9 @@ public enum MovementManager {
                 msg.setStartCoord(ZoneManager.convertWorldToLocal(Regions.GetBuildingForRegion(toMove.region), toMove.getLoc()));
                 msg.setEndCoord(ZoneManager.convertWorldToLocal(regionBuilding, endLocation));
                 msg.setInBuilding(toMove.region.level);
-                msg.setUnknown01(toMove.region.room);
-                msg.setTargetType(GameObjectType.Building.ordinal());
-                msg.setTargetID(regionBuilding.getObjectUUID());
+                msg.setInBuildingFloor(toMove.region.room);
+                msg.setStartLocType(GameObjectType.Building.ordinal());
+                msg.setInBuildingUUID(regionBuilding.getObjectUUID());
             }
 
         } else {
@@ -182,8 +185,8 @@ public enum MovementManager {
             toMove.setInBuilding(-1);
             msg.setStartCoord(toMove.getLoc());
             msg.setEndCoord(endLocation);
-            msg.setTargetType(0);
-            msg.setTargetID(0);
+            msg.setStartLocType(0);
+            msg.setInBuildingUUID(0);
         }
 
         //checks sync between character and server, if out of sync, teleport player to original position and return.
@@ -230,7 +233,7 @@ public enum MovementManager {
         toMove.cancelOnMove();
 
         //cancel any attacks for manual move.
-        if ((toMove.getObjectType() == GameObjectType.PlayerCharacter) && msg.getUnknown02() == 0)
+        if ((toMove.getObjectType() == GameObjectType.PlayerCharacter) && msg.getInitiatedFromAttack() == 0)
             toMove.setCombatTarget(null);
 
 
@@ -264,7 +267,7 @@ public enum MovementManager {
         Zone serverZone = null;
 
         serverZone = ZoneManager.findSmallestZone(player.getLoc());
-        cityObject = (City) DbManager.getFromCache(GameObjectType.City, serverZone.getPlayerCityUUID());
+        cityObject = (City) DbManager.getFromCache(GameObjectType.City, serverZone.playerCityUUID);
 
         // Do not send group messages if player is on grid
 
@@ -348,7 +351,7 @@ public enum MovementManager {
             ChatManager.chatSystemInfo((PlayerCharacter) ac, "Finished Alt change, setting the end location to " + ac.getEndLoc().getX() + ' ' + ac.getEndLoc().getZ() + " moving=" + ac.isMoving() + " and current location is " + curLoc.getX() + ' ' + curLoc.getZ());
 
         //Send run/walk/sit/stand to tell the client we are flying / landing etc
-        ac.update(false);
+        ac.update();
         ac.stopMovement(ac.getLoc());
         if (ac.isAlive())
             MovementManager.sendRWSSMsg(ac);
@@ -405,9 +408,7 @@ public enum MovementManager {
             if (bonus.getBool(ModType.Stunned, SourceType.None) || bonus.getBool(ModType.CannotMove, SourceType.None))
                 continue;
 
-            //member.update(false);
-            member.updateLocation();
-            member.updateMovementState();
+            member.update();
 
 
             // All checks passed, let's move the player
@@ -463,34 +464,20 @@ public enum MovementManager {
         }
     }
 
-    public static void translocate(AbstractCharacter teleporter, Vector3fImmutable targetLoc, Regions region) {
+    public static void translocate(AbstractCharacter teleporter, Vector3fImmutable targetLoc) {
 
 
         if (targetLoc == null)
             return;
-
-        Vector3fImmutable oldLoc = new Vector3fImmutable(teleporter.getLoc());
-
         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);
-
+        Vector3fImmutable oldLoc = new Vector3fImmutable(teleporter.getLoc());
+        teleporter.setLoc(targetLoc);
         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

@@ -10,6 +10,7 @@ import engine.net.DispatchMessage;
 import engine.net.client.msg.PetMsg;
 import engine.objects.*;
 import engine.powers.EffectsBase;
+import engine.powers.RuneSkillAdjustEntry;
 import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
@@ -23,92 +24,6 @@ public enum NPCManager {
     NPC_MANAGER;
     public static HashMap<Integer, ArrayList<Integer>> _runeSetMap = new HashMap<>();
 
-    public static void LoadAllRuneSets() {
-        _runeSetMap = DbManager.ItemBaseQueries.LOAD_RUNES_FOR_NPC_AND_MOBS();
-    }
-
-    public static void LoadAllBootySets() {
-        LootManager._bootySetMap = DbManager.LootQueries.LOAD_BOOTY_TABLES();
-    }
-
-    public static void applyRuneSetEffects(Mob mob) {
-
-        // Early exit
-
-        if (mob.runeSet == 0)
-            return;
-
-        //Apply all rune effects.
-
-        if (NPCManager._runeSetMap.get(mob.runeSet).contains(252623)) {
-            mob.isPlayerGuard = true;
-        }
-
-        // Only captains have contracts
-
-        if (mob.contract != null || mob.isPlayerGuard)
-            applyEffectsForRune(mob, 252621);
-
-
-        // Apply effects from RuneSet
-
-        if (mob.runeSet != 0)
-            for (int runeID : _runeSetMap.get(mob.runeSet))
-                applyEffectsForRune(mob, runeID);
-
-        // Not sure why but apply Warrior effects for some reason?
-
-        applyEffectsForRune(mob, 2518);
-    }
-
-    public static void applyEffectsForRune(AbstractCharacter character, int runeID) {
-
-        EffectsBase effectsBase;
-        RuneBase sourceRune = RuneBase.getRuneBase(runeID);
-
-        // Race runes are in the runeset but not in runebase for some reason
-
-        if (sourceRune == null)
-            return;
-
-        for (MobBaseEffects mbe : sourceRune.getEffectsList()) {
-
-            effectsBase = PowersManager.getEffectByToken(mbe.getToken());
-
-            if (effectsBase == null) {
-                Logger.info("Mob: " + character.getObjectUUID() + "  EffectsBase Null for Token " + mbe.getToken());
-                continue;
-            }
-
-            //check to upgrade effects if needed.
-            if (character.effects.containsKey(Integer.toString(effectsBase.getUUID()))) {
-
-                if (mbe.getReqLvl() > (int) character.level)
-                    continue;
-
-                Effect eff = character.effects.get(Integer.toString(effectsBase.getUUID()));
-
-                if (eff == null)
-                    continue;
-
-                //Current effect is a higher rank, dont apply.
-                if (eff.getTrains() > mbe.getRank())
-                    continue;
-
-                //new effect is of a higher rank. remove old effect and apply new one.
-                eff.cancelJob();
-                character.addEffectNoTimer(Integer.toString(effectsBase.getUUID()), effectsBase, mbe.getRank(), true);
-            } else {
-
-                if (mbe.getReqLvl() > (int) character.level)
-                    continue;
-
-                character.addEffectNoTimer(Integer.toString(effectsBase.getUUID()), effectsBase, mbe.getRank(), true);
-            }
-
-        }
-    }
-
     public static void dismissNecroPet(Mob necroPet, boolean updateOwner) {
 
         necroPet.setCombatTarget(null);
@@ -127,10 +42,12 @@ public enum NPCManager {
 
         DbManager.removeFromCache(necroPet);
 
-        PlayerCharacter petOwner = necroPet.getOwner();
+
+        PlayerCharacter petOwner = (PlayerCharacter) necroPet.guardCaptain;
 
         if (petOwner != null) {
-            necroPet.setOwner(null);
+
+            necroPet.guardCaptain = null;
             petOwner.setPet(null);
 
             if (updateOwner == false)
@@ -202,78 +119,6 @@ public enum NPCManager {
         playerCharacter.necroPets.clear();
     }
 
-
-    public static void removeSiegeMinions(Mob mobile) {
-
-        for (Mob toRemove : mobile.siegeMinionMap.keySet()) {
-
-            if (mobile.isMoving()) {
-
-                mobile.stopMovement(mobile.getLoc());
-
-                if (toRemove.parentZone != null)
-                    toRemove.parentZone.zoneMobSet.remove(toRemove);
-            }
-
-            try {
-                toRemove.clearEffects();
-            } catch (Exception e) {
-                Logger.error(e.getMessage());
-            }
-
-            if (toRemove.parentZone != null)
-                toRemove.parentZone.zoneMobSet.remove(toRemove);
-
-            WorldGrid.RemoveWorldObject(toRemove);
-            WorldGrid.removeObject(toRemove);
-            DbManager.removeFromCache(toRemove);
-
-            PlayerCharacter petOwner = toRemove.getOwner();
-
-            if (petOwner != null) {
-
-                petOwner.setPet(null);
-                toRemove.setOwner(null);
-
-                PetMsg petMsg = new PetMsg(5, null);
-                Dispatch dispatch = Dispatch.borrow(petOwner, petMsg);
-                DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.PRIMARY);
-            }
-        }
-    }
-
-    public static boolean removeMobileFromBuilding(Mob mobile, Building building) {
-
-        // Remove npc from it's building
-
-        try {
-            mobile.clearEffects();
-        } catch (Exception e) {
-            Logger.error(e.getMessage());
-        }
-
-        if (mobile.parentZone != null)
-            mobile.parentZone.zoneMobSet.remove(mobile);
-
-        if (building != null) {
-            building.getHirelings().remove(mobile);
-            removeSiegeMinions(mobile);
-        }
-
-        // Delete npc from database
-
-        if (DbManager.MobQueries.DELETE_MOB(mobile) == 0)
-            return false;
-
-        // Remove npc from the simulation
-
-        mobile.removeFromCache();
-        DbManager.removeFromCache(mobile);
-        WorldGrid.RemoveWorldObject(mobile);
-        WorldGrid.removeObject(mobile);
-        return true;
-    }
-
     public static void loadAllPirateNames() {
 
         DbManager.NPCQueries.LOAD_PIRATE_NAMES();
@@ -340,10 +185,19 @@ public enum NPCManager {
         else
             buildingSlot = BuildingManager.getAvailableSlot(abstractCharacter.building);
 
-        //if (buildingSlot == -1)
-            //Logger.error("No available slot for NPC: " + abstractCharacter.getObjectUUID());
+        // Override slot for siege engines
 
-        abstractCharacter.building.getHirelings().put(abstractCharacter, buildingSlot);
+        if (abstractCharacter.getObjectType().equals(Enum.GameObjectType.Mob) && ((Mob) abstractCharacter).behaviourType.equals(Enum.MobBehaviourType.SiegeEngine)) {
+            Mob siegeMobile = (Mob) abstractCharacter;
+            buildingSlot = siegeMobile.guardCaptain.minions.size() + 2;
+        }
+
+        if (buildingSlot == -1)
+            Logger.error("No available slot for NPC: " + abstractCharacter.getObjectUUID());
+
+        // Pets are regular mobiles not hirelings (Siege engines)
+        if (abstractCharacter.contract != null)
+            abstractCharacter.building.hirelings.addIfAbsent(abstractCharacter);
 
         // Override bind and location for  this npc derived
         // from BuildingManager slot location data.
@@ -370,4 +224,251 @@ 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,8 +9,7 @@
 package engine.gameManager;
 
 import engine.Enum.*;
-import engine.InterestManagement.HeightMap;
-import engine.InterestManagement.InterestManager;
+import engine.InterestManagement.Terrain;
 import engine.InterestManagement.WorldGrid;
 import engine.db.handlers.dbEffectsBaseHandler;
 import engine.db.handlers.dbPowerHandler;
@@ -54,13 +53,10 @@ public enum PowersManager {
     public static HashMap<Integer, AbstractPowerAction> powerActionsByID = new HashMap<>();
     public static HashMap<String, Integer> ActionTokenByIDString = new HashMap<>();
     public static HashMap<String, Integer> AnimationOverrides = new HashMap<>();
-    public static HashMap<Integer, ArrayList<MobPowerEntry>> AllMobPowers;
+    public static HashMap<Integer, ArrayList<RunePowerEntry>> _allRunePowers;
+    public static HashMap<Integer, ArrayList<RuneSkillAdjustEntry>> _allRuneSkillAdjusts;
     private static JobScheduler js;
 
-    private PowersManager() {
-
-    }
-
     public static void initPowersManager(boolean fullPowersLoad) {
 
         if (fullPowersLoad)
@@ -104,6 +100,16 @@ public enum PowersManager {
         }
     }
 
+    public static ArrayList<RunePowerEntry> getPowersForRune(int rune_id) {
+
+        ArrayList<RunePowerEntry> powerEntries = PowersManager._allRunePowers.get(rune_id);
+
+        if (powerEntries == null)
+            powerEntries = new ArrayList<>();
+
+        return powerEntries;
+    }
+
     // This pre-loads all powers and effects
     public static void InitializePowers() {
 
@@ -164,47 +170,6 @@ public enum PowersManager {
     public static void usePower(final PerformActionMsg msg, ClientConnection origin,
                                 boolean sendCastToSelf) {
 
-        PlayerCharacter pc = SessionManager.getPlayerCharacter(origin);
-
-        if(pc == null)
-            return;
-
-        if(pc.getRecycleTimers().containsKey(msg.getPowerUsedID())) {
-            return;
-        }
-        if(!pc.isFlying() && powersBaseByToken.get(msg.getPowerUsedID()) != null && powersBaseByToken.get(msg.getPowerUsedID()).isSpell) //cant be sitting if flying
-            CombatManager.toggleSit(false,origin);
-
-        //if(pc.isMoving())
-            //pc.stopMovement(pc.getMovementLoc());
-        if(msg.getPowerUsedID() != 421084024 && origin.getPlayerCharacter().getPromotionClassID() != 2513) {
-            if (!origin.getPlayerCharacter().getPowers().containsKey(msg.getPowerUsedID())) {
-                Logger.error(origin.getPlayerCharacter().getFirstName() + " attempted to cast a power they do not have");
-                return;
-            }
-        }
-        //crusader sacrifice
-        if((msg.getPowerUsedID() == 428695403 && msg.getTargetID() == pc.getObjectUUID())){
-            RecyclePowerMsg recyclePowerMsg = new RecyclePowerMsg(msg.getPowerUsedID());
-            Dispatch dispatch = Dispatch.borrow(origin.getPlayerCharacter(), recyclePowerMsg);
-            DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
-
-            // Send Fail to cast message
-            if (pc != null) {
-                sendPowerMsg(pc, 2, msg);
-                if (pc.isCasting()) {
-                    pc.update(false);
-                }
-
-                pc.setIsCasting(false);
-            }
-            return;
-        }
-
-        if(msg.getPowerUsedID() == -1851459567){//backstab
-            applyPower(pc,pc,pc.loc,-1851459567,msg.getNumTrains(),false);
-        }
-
         if (usePowerA(msg, origin, sendCastToSelf)) {
             // Cast failed for some reason, reset timer
 
@@ -213,20 +178,19 @@ public enum PowersManager {
             DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
 
             // Send Fail to cast message
+            PlayerCharacter pc = SessionManager
+                    .getPlayerCharacter(origin);
+
             if (pc != null) {
                 sendPowerMsg(pc, 2, msg);
                 if (pc.isCasting()) {
-                    pc.update(false);
+                    pc.update();
                 }
 
                 pc.setIsCasting(false);
             }
 
         }
-
-        if(msg.getPowerUsedID() == 429429978){
-            origin.getPlayerCharacter().getRecycleTimers().remove(429429978);
-        }
     }
 
     public static void useMobPower(Mob caster, AbstractCharacter target, PowersBase pb, int rank) {
@@ -235,8 +199,7 @@ public enum PowersManager {
         msg.setUnknown04(1);
 
         if (useMobPowerA(msg, caster)) {
-            if(pb.token == -1994153779)
-                InterestManager.setObjectDirty(caster);
+            //sendMobPowerMsg(caster,2,msg); //Lol wtf was i thinking sending msg's to mobs... ZZZZ
         }
     }
 
@@ -247,56 +210,8 @@ public enum PowersManager {
         if (playerCharacter == null)
             return false;
 
-        //if(playerCharacter.getRecycleTimers().containsKey(msg.getPowerUsedID())){
-       //     playerCharacter.setIsCasting(false);
-        //    playerCharacter.setItemCasting(false);
-        //    return false;
-        //}
-
         boolean CSRCast = false;
 
-        if(msg.getPowerUsedID() == 430628895) {
-
-            boolean failed = false;// group teleport
-            City city = ZoneManager.getCityAtLocation(playerCharacter.loc);
-            if (city == null) {
-                failed = true;
-            }//else{
-             //   Bane bane = city.getBane();
-             //   if (bane == null) {
-             //       failed = true;
-             //   }else{
-             //       if(!bane.getSiegePhase().equals(SiegePhase.WAR)){
-             //           failed = true;
-             //       }
-             //   }
-            //}
-            if(failed){
-                //check to see if we are at an active mine
-                Zone zone = ZoneManager.findSmallestZone(playerCharacter.loc);
-                if(zone != null){
-                    Mine mine = null;
-                    for(Building building : zone.zoneBuildingSet){
-                        if(building.getBlueprint().getBuildingGroup().equals(BuildingGroup.MINE)){
-                            mine = Mine.getMineFromTower(building.getObjectUUID());
-                        }
-                    }
-                    if(mine != null){
-                        failed = !mine.isActive;
-                    }
-                }
-            }
-
-            if(failed) {
-                playerCharacter.setIsCasting(false);
-
-                RecyclePowerMsg recyclePowerMsg = new RecyclePowerMsg(msg.getPowerUsedID());
-                Dispatch dispatch = Dispatch.borrow(playerCharacter, recyclePowerMsg);
-                DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
-
-                return false;
-            }
-        }
 
         if (MBServerStatics.POWERS_DEBUG) {
             ChatManager.chatSayInfo(
@@ -333,7 +248,6 @@ public enum PowersManager {
 
         // get power
         PowersBase pb = PowersManager.powersBaseByToken.get(msg.getPowerUsedID());
-
         if (pb == null) {
             ChatManager.chatSayInfo(playerCharacter,
                     "This power is not implemented yet.");
@@ -345,35 +259,6 @@ public enum PowersManager {
             // return false;
         }
 
-        //check for movement buffs while flying
-        if(playerCharacter.isFlying()) {
-            switch(pb.token){
-                case 429005674:
-                case 429505739:
-                case 431054700:
-                case 428005600:
-                case 431610080:
-                case 427935608:
-                case 427857146:
-                case 427988218:
-                case 431854842:
-                case 421074170:
-                case 429611355:
-                case 428955899:
-                case 1794395699:
-                case 429428796:
-                case 1514898036:
-                    ChatManager.chatSystemInfo(playerCharacter, "You Cannot Fly While Having A MovementBuff");
-                    //resync stamina
-                    playerCharacter.setStamina(playerCharacter.getStamina(), playerCharacter);
-
-                    // Update all surrounding clients.
-                    TargetedActionMsg cmm = new TargetedActionMsg(playerCharacter);
-                    DispatchMessage.dispatchMsgToInterestArea(playerCharacter, cmm, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
-                    return true;
-            }
-        }
-
         if (playerCharacter.getLastPower() != null)
             return true;
 
@@ -381,18 +266,17 @@ public enum PowersManager {
 
 
         // Check powers for normal users
-        if(msg.getPowerUsedID() != 421084024) {
-            if (playerCharacter.getPowers() == null || !playerCharacter.getPowers().containsKey(msg.getPowerUsedID()))
-                if (!playerCharacter.isCSR()) {
-                    if (!MBServerStatics.POWERS_DEBUG) {
-                        //  ChatManager.chatSayInfo(pc, "You may not cast that spell!");
+        if (playerCharacter.getPowers() == null || !playerCharacter.getPowers().containsKey(msg.getPowerUsedID()))
+            if (!playerCharacter.isCSR()) {
+                if (!MBServerStatics.POWERS_DEBUG) {
+                    //  ChatManager.chatSayInfo(pc, "You may not cast that spell!");
+
+                    Logger.info("usePowerA(): Cheat attempted? '" + msg.getPowerUsedID() + "' was not associated with " + playerCharacter.getName());
+                    return true;
+                }
+            } else
+                CSRCast = true;
 
-                        Logger.info("usePowerA(): Cheat attempted? '" + msg.getPowerUsedID() + "' was not associated with " + playerCharacter.getName());
-                        return true;
-                    }
-                } else
-                    CSRCast = true;
-        }
         // get numTrains for power
         int trains = msg.getNumTrains();
 
@@ -402,14 +286,6 @@ public enum PowersManager {
             msg.setNumTrains(trains);
         }
 
-        //double stack point values for some useless disc spells
-        switch(pb.token){
-            case 429420458: // BH eyes
-            case 429601664: // huntsman skin the beast
-                msg.setNumTrains(msg.getNumTrains() * 2);
-                break;
-        }
-
         // can't go over total trains by player
         if (playerCharacter.getPowers() != null && playerCharacter.getPowers().containsKey(msg.getPowerUsedID())) {
             CharacterPower cp = playerCharacter.getPowers().get(msg.getPowerUsedID());
@@ -501,20 +377,15 @@ public enum PowersManager {
                 float range = pb.getRange();
                 // verify target is in range
 
-                if(pb.token != 429396028) {
-
-                    if (verifyInvalidRange(playerCharacter, target, range))
-                        // (pc.getLoc().distance(target.getLoc()) > pb.getRange()) {
-                        // TODO send message that target is out of range
-                        return true;
-// verify target is valid type
-                    if (!validateTarget(target, playerCharacter, pb))
-                        return true;
-                }else{
-                    pb.isSpell = false;
-                }
 
+                if (verifyInvalidRange(playerCharacter, target, range))
+                    // (pc.getLoc().distance(target.getLoc()) > pb.getRange()) {
+                    // TODO send message that target is out of range
+                    return true;
 
+                // verify target is valid type
+                if (!validateTarget(target, playerCharacter, pb))
+                    return true;
 
 
                 if (AbstractWorldObject.IsAbstractCharacter(target))
@@ -545,23 +416,6 @@ public enum PowersManager {
                 }
             }
 
-            if(!passed){
-                if (playerCharacter.getRace().getName().contains("Shade")) {
-                    if(playerCharacter.getHidden() > 0){
-                        switch(msg.getPowerUsedID()){
-                            case -1851459567:
-                            case 2094922127:
-                            case -355707373:
-                            case 246186475:
-                            case 666419835:
-                            case 1480354319:
-                                passed = true;
-                                break;
-                        }
-                    }
-                }
-            }
-
             if (!passed)
                 return true;
         }
@@ -640,6 +494,7 @@ public enum PowersManager {
         // Validity checks passed, move on to casting spell
         //get caster's live counter
         int casterLiveCounter = playerCharacter.getLiveCounter();
+
         // run recycle job for when cast is available again, don't bother adding the timer for CSRs
         if (time > 0) {
             FinishRecycleTimeJob frtj = new FinishRecycleTimeJob(playerCharacter, msg);
@@ -666,7 +521,7 @@ public enum PowersManager {
 
         // make person casting stand up if spell (unless they're casting a chant which does not make them stand up)
         if (pb.isSpell() && !pb.isChant() && playerCharacter.isSit()) {
-            playerCharacter.update(false);
+            playerCharacter.update();
             playerCharacter.setSit(false);
             UpdateStateMsg updateStateMsg = new UpdateStateMsg(playerCharacter);
             DispatchMessage.dispatchMsgToInterestArea(playerCharacter, updateStateMsg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
@@ -674,12 +529,10 @@ public enum PowersManager {
         }
 
         // update cast (use skill) fail condition
-        if(pb.token != 429396028 && pb.breaksForm) {
-            playerCharacter.cancelOnCast();
-        }
+        playerCharacter.cancelOnCast();
 
         // update castSpell (use spell) fail condition if spell
-        if (pb.isSpell() && pb.breaksForm)
+        if (pb.isSpell())
             playerCharacter.cancelOnSpell();
 
         // get cast time in ms.
@@ -689,12 +542,13 @@ public enum PowersManager {
 
 
         if (time > 100) {
-            playerCharacter.update(false);
+            playerCharacter.update();
             playerCharacter.setIsCasting(true);
         }
 
 
         playerCharacter.setLastMovementState(playerCharacter.getMovementState());
+
         // run timer job to end cast
         if (time < 1) // run immediately
             finishUsePower(copyMsg, playerCharacter, casterLiveCounter, targetLiveCounter);
@@ -820,11 +674,10 @@ public enum PowersManager {
 
         // make person casting stand up if spell (unless they're casting a chant which does not make them stand up)
         // update cast (use skill) fail condition
-        if(pb.breaksForm)
-            caster.cancelOnCast();
+        caster.cancelOnCast();
 
         // update castSpell (use spell) fail condition if spell
-        if (pb.isSpell() && pb.breaksForm)
+        if (pb.isSpell())
             caster.cancelOnSpell();
 
         // get cast time in ms.
@@ -854,56 +707,14 @@ public enum PowersManager {
     // called when a spell finishes casting. perform actions
     public static void finishUsePower(final PerformActionMsg msg, PlayerCharacter playerCharacter, int casterLiveCounter, int targetLiveCounter) {
 
-       // if(true) {
-        //    newFinishCast(msg);
-        //    return;
-        //}
-
-        //if(HandleItemEnchantments(playerCharacter, msg)) {
-        //    playerCharacter.setIsCasting(false);
-        //    PerformActionMsg castMsg = new PerformActionMsg(msg);
-        //    castMsg.setNumTrains(9999);
-        //    castMsg.setUnknown04(2);
-        //    DispatchMessage.dispatchMsgToInterestArea(playerCharacter, castMsg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
-        //    return;
-        //}
         PerformActionMsg performActionMsg;
         Dispatch dispatch;
 
         if (playerCharacter == null || msg == null)
             return;
 
-        //handle sprint for bard sprint
-        if(msg.getPowerUsedID() == 429005674){
-            msg.setPowerUsedID(429611355);
-        }
-
-        //handle root and snare break for wildkin's chase
-        if(msg.getPowerUsedID() == 429494441) {
-            playerCharacter.removeEffectBySource(EffectSourceType.Root,40,true);
-            playerCharacter.removeEffectBySource(EffectSourceType.Snare,40,true);
-        }
-
-        //handle power block portion for shade hide
-        if(playerCharacter.getRace().getName().contains("Shade")) {
-            if (msg.getPowerUsedID() == 429407306 || msg.getPowerUsedID() == 429495514) {
-                int trains = msg.getNumTrains() - 1;
-                if (trains < 1)
-                    trains = 1;
-                applyPower(playerCharacter, playerCharacter, playerCharacter.loc, 429397210, trains, false);
-                playerCharacter.removeEffectBySource(EffectSourceType.Invisibility,40,true);
-                applyPower(playerCharacter, playerCharacter, playerCharacter.loc, msg.getPowerUsedID(), msg.getNumTrains(), false);
-            }
-        }
-        if(msg.getTargetType() == GameObjectType.PlayerCharacter.ordinal()) {
-            PlayerCharacter target = PlayerCharacter.getPlayerCharacter(msg.getTargetID());
-            if (msg.getPowerUsedID() == 429601664)
-                if(target.getPromotionClassID() != 2516)//templar
-                    PlayerCharacter.getPlayerCharacter(msg.getTargetID()).removeEffectBySource(EffectSourceType.Transform, msg.getNumTrains(), true);
-        }
-
         if (playerCharacter.isCasting()) {
-            playerCharacter.update(false);
+            playerCharacter.update();
             playerCharacter.updateStamRegen(-100);
         }
 
@@ -943,9 +754,6 @@ public enum PowersManager {
             return;
         }
 
-        if(pb.targetSelf)
-            msg.setTargetID(playerCharacter.getObjectUUID());
-
         int trains = msg.getNumTrains();
 
         // verify player is not stunned or power type is blocked
@@ -1008,16 +816,15 @@ public enum PowersManager {
                 }
                 float range = pb.getRange() + speedRange;
 
-                if(pb.token != 429396028) {
 
-                    if (verifyInvalidRange(playerCharacter, mainTarget, range)) {
+                if (verifyInvalidRange(playerCharacter, mainTarget, range)) {
 
-                        sendPowerMsg(playerCharacter, 8, msg);
-                        return;
-                    }
-                    // (pc.getLoc().distance(target.getLoc()) > pb.getRange()) {
-                    // TODO send message that target is out of range
+                    sendPowerMsg(playerCharacter, 8, msg);
+                    return;
                 }
+                // (pc.getLoc().distance(target.getLoc()) > pb.getRange()) {
+                // TODO send message that target is out of range
+
 
             }
 
@@ -1039,8 +846,6 @@ public enum PowersManager {
             return;
         }
 
-        playerCharacter.setHateValue(pb.getHateValue(trains));
-
         //Send Cast Message.
 //		PerformActionMsg castMsg = new PerformActionMsg(msg);
 //		castMsg.setNumTrains(9999);
@@ -1091,8 +896,6 @@ public enum PowersManager {
             //Power is aiding a target, handle aggro if combat target is a Mob.
             if (!pb.isHarmful() && target.getObjectType() == GameObjectType.PlayerCharacter) {
                 PlayerCharacter pcTarget = (PlayerCharacter) target;
-                if (!pb.isHarmful())
-                    Mob.HandleAssistedAggro(playerCharacter, pcTarget);
             }
 
             // update target of used power timer
@@ -1106,13 +909,6 @@ public enum PowersManager {
 
             //Player didn't miss power, send finish cast. Miss cast already sent.
 
-            //if (playerCharacter.isBoxed) {
-            //    if (AbstractCharacter.IsAbstractCharacter(target)) {
-            //        if (target.getObjectType().equals(GameObjectType.PlayerCharacter)) {
-            //            return;
-             //       }
-             //   }
-            //}
 
             // finally Apply actions
             for (ActionsBase ab : pb.getActions()) {
@@ -1122,7 +918,7 @@ public enum PowersManager {
                     continue;
                 // If something blocks the action, then stop
 
-                if (ab.blocked(target, pb, trains, playerCharacter)) {
+                if (ab.blocked(target, pb, trains)) {
 
                     PowersManager.sendEffectMsg(playerCharacter, 5, ab, pb);
                     continue;
@@ -1209,18 +1005,7 @@ public enum PowersManager {
 
 
         //DispatchMessage.dispatchMsgToInterestArea(playerCharacter, msg, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
-//handle mob hate values
-        HashSet<AbstractWorldObject> mobs = WorldGrid.getObjectsInRangePartial(playerCharacter.loc,60.0f,MBServerStatics.MASK_MOB);
-        for(AbstractWorldObject awo : mobs){
-            Mob mobTarget = (Mob)awo;
-            if(mobTarget.hate_values != null) {
-                if (mobTarget.hate_values.containsKey(playerCharacter)) {
-                    mobTarget.hate_values.put(playerCharacter, mobTarget.hate_values.get(playerCharacter) + pb.getHateValue(trains));
-                } else {
-                    mobTarget.hate_values.put(playerCharacter, pb.getHateValue(trains));
-                }
-            }
-        }
+
 
     }
 
@@ -1309,7 +1094,7 @@ public enum PowersManager {
                     continue;
                 // If something blocks the action, then stop
 
-                if (ab.blocked(target, pb, trains, caster))
+                if (ab.blocked(target, pb, trains))
                     continue;
                 // TODO handle overwrite stack order here
                 String stackType = ab.getStackType();
@@ -1451,7 +1236,7 @@ public enum PowersManager {
 
         PlayerCharacter target = SessionManager
                 .getPlayerCharacterByLowerCaseName(msg.getTargetName());
-        if (target == null || target.equals(pc)) {
+        if (target == null || target.equals(pc) || target.isCombat()) {
 
             if (target == null) // Player not found. Send not found message
                 ChatManager.chatInfoError(pc,
@@ -1510,7 +1295,7 @@ public enum PowersManager {
         // Handle Accepting or Denying a summons.
         // set timer based on summon type.
         boolean wentThrough = false;
-        if (msg.accepted()) {
+        if (msg.accepted())
             // summons accepted, let's move the player if within time
             if (source.isAlive()) {
 
@@ -1555,16 +1340,6 @@ public enum PowersManager {
                 else
                     duration = 45000; // Belgosh Summons, 45 seconds
 
-                boolean enemiesNear = false;
-                for (AbstractWorldObject awo : WorldGrid.getObjectsInRangePartial(pc.loc, MBServerStatics.CHARACTER_LOAD_RANGE, MBServerStatics.MASK_PLAYER)) {
-                    PlayerCharacter playerCharacter = (PlayerCharacter) awo;
-                    if (!playerCharacter.guild.getNation().equals(pc.guild.getNation())) {
-                        enemiesNear = true;
-                    }
-                }
-
-                if (enemiesNear && !pc.isInSafeZone())
-                    duration += 60000;
 
                 // Teleport to summoners location
                 FinishSummonsJob fsj = new FinishSummonsJob(source, pc);
@@ -1574,10 +1349,7 @@ public enum PowersManager {
                     timers.put("Summon", jc);
                 wentThrough = true;
             }
-        }else{
-            // recycle summons power
-            finishRecycleTime(428523680, source, true);
-        }
+
         // Summons failed
         if (!wentThrough)
             // summons refused. Let's be nice and reset recycle timer
@@ -1693,28 +1465,8 @@ public enum PowersManager {
         }
 
         // create list of characters
-        HashSet<AbstractCharacter> trackChars;
-
-        PowersBase trackPower = PowersManager.getPowerByToken(msg.getPowerToken());
-        if(trackPower != null && trackPower.category.equals("TRACK")){
-            trackChars = getTrackList(playerCharacter);
-        }else{
-            trackChars = RangeBasedAwo.getTrackList(allTargets, playerCharacter, maxTargets);
-        }
-
-
-
-        //switch(msg.getPowerToken()){
-        //    case 431511776: // Hunt Foe Huntress
-        //    case 429578587: // Hunt Foe Scout
-        //    case 429503360: // Track Huntsman
-        //    case 44106356: //
-        //        trackChars = getTrackList(playerCharacter);
-        //        break;
-        //    default:
-        //        trackChars = RangeBasedAwo.getTrackList(allTargets, playerCharacter, maxTargets);
-        //        break;
-        //}
+        HashSet<AbstractCharacter> trackChars = RangeBasedAwo.getTrackList(
+                allTargets, playerCharacter, maxTargets);
 
         TrackWindowMsg trackWindowMsg = new TrackWindowMsg(msg);
 
@@ -1727,30 +1479,6 @@ public enum PowersManager {
 
     }
 
-    public static HashSet<AbstractCharacter> getTrackList(PlayerCharacter tracker){
-        HashSet<AbstractCharacter> list = new HashSet<AbstractCharacter>();
-        HashSet<AbstractWorldObject> shortList = WorldGrid.getObjectsInRangePartial(tracker.loc,MBServerStatics.CHARACTER_LOAD_RANGE, MBServerStatics.MASK_PLAYER);
-        HashSet<AbstractWorldObject> fullList = WorldGrid.getObjectsInRangePartial(tracker.loc,1408, MBServerStatics.MASK_PLAYER);
-        ArrayList<Guild> guildsPresent = new ArrayList<>();
-        for(AbstractWorldObject awo : shortList){
-            PlayerCharacter pc = (PlayerCharacter)awo;
-            if(!guildsPresent.contains(pc.guild.getNation())){
-                guildsPresent.add(pc.guild.getNation());
-            }
-        }
-        for(AbstractWorldObject awo : fullList){
-            if(awo.equals(tracker))
-                continue;
-            PlayerCharacter pc = (PlayerCharacter)awo;
-            if(!pc.isAlive())
-                continue;
-            if(guildsPresent.contains(pc.guild.getNation()))
-                list.add(pc);
-        }
-
-        return list;
-    }
-
     private static void sendRecyclePower(int token, ClientConnection origin) {
         RecyclePowerMsg recyclePowerMsg = new RecyclePowerMsg(token);
 
@@ -1866,10 +1594,6 @@ public enum PowersManager {
     private static void applyPowerA(AbstractCharacter ac, AbstractWorldObject target,
                                     Vector3fImmutable targetLoc, PowersBase pb, int trains,
                                     boolean fromItem) {
-
-        if(fromItem && pb.token == 429021400)
-            trains = 40;
-
         int time = pb.getCastTime(trains);
         if (!fromItem)
             finishApplyPowerA(ac, target, targetLoc, pb, trains, false);
@@ -1928,18 +1652,6 @@ public enum PowersManager {
     public static void finishApplyPowerA(AbstractCharacter ac,
                                          AbstractWorldObject target, Vector3fImmutable targetLoc,
                                          PowersBase pb, int trains, boolean fromChant) {
-
-
-        //if (ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
-         //   PlayerCharacter pc = (PlayerCharacter) ac;
-         //   if (pc.isBoxed && pb.token != -2133617927) {
-         //       if(AbstractCharacter.IsAbstractCharacter(target)){
-         //           if (target.getObjectType().equals(GameObjectType.PlayerCharacter)){
-         //               return;
-         //           }
-        //        }
-        //    }
-        //}
         // finally Apply actions
         ArrayList<ActionsBase> actions = pb.getActions();
         for (ActionsBase ab : actions) {
@@ -1947,7 +1659,7 @@ public enum PowersManager {
             if (trains < ab.getMinTrains() || trains > ab.getMaxTrains())
                 continue;
             // If something blocks the action, then stop
-            if (ab.blocked(target, pb, trains, ac))
+            if (ab.blocked(target, pb, trains))
                 // sendPowerMsg(pc, 5, msg);
                 continue;
             // TODO handle overwrite stack order here
@@ -2020,10 +1732,14 @@ public enum PowersManager {
         }
     }
 
-    public static void runPowerAction(AbstractCharacter source, AbstractWorldObject awo, Vector3fImmutable targetLoc, ActionsBase ab, int trains, PowersBase pb) {
+    public static void runPowerAction(AbstractCharacter source,
+                                      AbstractWorldObject awo, Vector3fImmutable targetLoc,
+                                      ActionsBase ab, int trains, PowersBase pb) {
         AbstractPowerAction pa = ab.getPowerAction();
         if (pa == null) {
-            Logger.error("runPowerAction(): PowerAction not found of IDString: " + ab.getEffectID());
+            Logger.error(
+                    "runPowerAction(): PowerAction not found of IDString: "
+                            + ab.getEffectID());
             return;
         }
         pa.startAction(source, awo, targetLoc, trains, ab, pb);
@@ -2056,7 +1772,7 @@ public enum PowersManager {
                 } else {
                     targetLoc = tl;
                     try {
-                        targetLoc = targetLoc.setY(HeightMap.getWorldHeight(targetLoc)); //on ground
+                        targetLoc = targetLoc.setY(Terrain.getWorldHeight(targetLoc)); //on ground
                     } catch (Exception e) {
                         Logger.error(e);
                         targetLoc = tl;
@@ -2258,7 +1974,7 @@ public enum PowersManager {
                 } else {
                     targetLoc = tl;
                     try {
-                        targetLoc = targetLoc.setY(HeightMap.getWorldHeight(targetLoc)); //on ground
+                        targetLoc = targetLoc.setY(Terrain.getWorldHeight(targetLoc)); //on ground
                     } catch (Exception e) {
                         Logger.error(e);
                     }
@@ -2476,7 +2192,7 @@ public enum PowersManager {
 
         // set player is not casting for regens
         if (pc.isCasting()) {
-            pc.update(false);
+            pc.update();
         }
         pc.setIsCasting(false);
 
@@ -2518,8 +2234,7 @@ public enum PowersManager {
     public static boolean testAttack(PlayerCharacter pc, AbstractWorldObject awo,
                                      PowersBase pb, PerformActionMsg msg) {
         // Get defense for target
-        //float atr = CharacterSkill.getATR(pc, pb.getSkillName());
-        float atr = PlayerCombatStats.getSpellAtr(pc, pb);
+        float atr = CharacterSkill.getATR(pc, pb.getSkillName());
         float defense;
 
         if (AbstractWorldObject.IsAbstractCharacter(awo)) {
@@ -2529,26 +2244,28 @@ public enum PowersManager {
             defense = 0f;
         // Get hit chance
 
-        //if (pc.getDebug(16)) {
-        //    String smsg = "ATR: " + atr + ", Defense: " + defense;
-         //   ChatManager.chatSystemInfo(pc, smsg);
-        //}
+        if (pc.getDebug(16)) {
+            String smsg = "ATR: " + atr + ", Defense: " + defense;
+            ChatManager.chatSystemInfo(pc, smsg);
+        }
 
-        //int chance;
+        int chance;
 
-        //if (atr > defense || defense == 0)
-        //    chance = 94;
-        //else {
-        //    float dif = atr / defense;
-        //    if (dif <= 0.8f)
-        //        chance = 4;
-        //    else
-        //        chance = ((int) (450 * (dif - 0.8f)) + 4);
-        //}
+        if (atr > defense || defense == 0)
+            chance = 94;
+        else {
+            float dif = atr / defense;
+            if (dif <= 0.8f)
+                chance = 4;
+            else
+                chance = ((int) (450 * (dif - 0.8f)) + 4);
+        }
 
         // calculate hit/miss
+        int roll = ThreadLocalRandom.current().nextInt(100);
 
-        if (CombatManager.LandHit((int)atr,(int)defense)) {
+        boolean disable = true;
+        if (roll < chance) {
             // Hit, check if dodge kicked in
             if (awo instanceof AbstractCharacter) {
                 AbstractCharacter tarAc = (AbstractCharacter) awo;
@@ -2560,15 +2277,6 @@ public enum PowersManager {
                     dodgeMsg.setTargetID(awo.getObjectUUID());
                     sendPowerMsg(pc, 4, dodgeMsg);
                     return true;
-                } else if (testPassive(pc, tarAc, "Block")) {
-                    // Dodge fired, send dodge message
-                    //PerformActionMsg dodgeMsg = new PerformActionMsg(msg);
-                    //dodgeMsg.setTargetType(awo.getObjectType().ordinal());
-                    //dodgeMsg.setTargetID(awo.getObjectUUID());
-                    //sendPowerMsg(pc, 4, dodgeMsg);
-                    TargetedActionMsg cmm = new TargetedActionMsg(pc, 75, tarAc, MBServerStatics.COMBAT_SEND_BLOCK);
-                    DispatchMessage.sendToAllInRange(tarAc, cmm);
-                    return true;
                 }
             }
             return false;
@@ -2616,12 +2324,7 @@ public enum PowersManager {
             if (AbstractWorldObject.IsAbstractCharacter(awo)) {
                 AbstractCharacter tarAc = (AbstractCharacter) awo;
                 // Handle Dodge passive
-                boolean passiveFired = false;
-                passiveFired =  testPassive(caster, tarAc, "Dodge");
-                if(!passiveFired)
-                    passiveFired =  testPassive(caster, tarAc, "Block");
-
-                return passiveFired;
+                return testPassive(caster, tarAc, "Dodge");
             }
             return false;
         } else
@@ -2862,9 +2565,7 @@ public enum PowersManager {
     }
 
     public static void cancelOnStun(AbstractCharacter ac) {
-        if(ac.getObjectType().equals(GameObjectType.PlayerCharacter)){
-            //PlayerCharacter.GroundPlayer((PlayerCharacter)ac);
-        }
+
     }
 
     private static PowersBase getLastPower(AbstractCharacter ac) {
@@ -3010,191 +2711,6 @@ public enum PowersManager {
         }
     }
 
-    public static boolean breakForm(int token) {
-        switch (token) {
-            case 429505865:
-            case 429407561:
-            case 429492073:
-            case 429644123:
-            case 429393769:
-            case 429545819:
-            case 429426537:
-            case 429590377:
-            case 429508425:
-            case 429541193:
-            case 429573961:
-            case 427924330:
-            case 429402918:
-            case 429545688:
-            case 429005674:
-            case 429637823:
-            case 429590426:
-            case 428066972:
-            case 429441862:
-            case 431611756:
-            case 431578988:
-            case 429502506:
-            case 429398191:
-            case 429447384:
-            case 428892191:
-            case 431579167:
-            case 430977067:
-            case 429409100:
-            case 429441868:
-            case 429594877:
-            case 427908971:
-            case 683741153:
-            case 429770569:
-            case 429452379:
-            case 429605055:
-            case 429086971:
-            case 429443230:
-            case 429505400:
-            case 429492122:
-            case 429643992:
-            case 550062236:
-            case 429498252:
-            case 429611224:
-            case 429441834:
-            case 428918940:
-            case 429633739:
-            case 429633579:
-            case 429568043:
-            case 429048646:
-            case 428392639:
-            case 428425407:
-            case 429054168:
-            case 429021400:
-            case 428955864:
-            case 429119704:
-            case 428890328:
-            case 428923096:
-            case 429218008:
-            case 429086936:
-            case 428988632:
-            case 428688204:
-            case 429514603:
-            case 428924959:
-            case 429393818:
-            case 429720966:
-            case 428982463:
-            case 427933887:
-            case 429572287:
-            case 429501222:
-            case 430694431:
-            case 429436131:
-            case 430006124:
-            case 429611355:
-            case 428005600:
-            case 427935608:
-            case 428949695:
-            case 427988218:
-            case 429414616:
-            case 429496495:
-            case 429428796:
-            case 563795754:
-            case 428988217:
-            case 429432716:
-            case 428955899:
-            case 429393286:
-            case 550062220:
-            case 429495557:
-            case 429401278:
-            case 428377478:
-            case 429409094:
-            case 428191947:
-            case 429434474:
-            case 429403363:
-            case 429512920:
-            case 429419611:
-            case 429645676:
-            case 429602895:
-            case 429605071:
-            case 429592428:
-            case 429500010:
-            case 429406602:
-            case 429426586:
-            case 429633898:
-            case 550062212:
-            case 429994027:
-            case 430813227:
-            case 429928491:
-            case 430026795:
-            case 429517915:
-            case 431854842:
-            case 429767544:
-            case 429502507:
-            case 428398816:
-            case 429446315:
-            case 429441979:
-                return false;
-        }
-        return true;
-    }
-
-    public static boolean HandleItemEnchantments(PlayerCharacter pc, PerformActionMsg msg){
-        switch(msg.getPowerUsedID()){
-            case 429505998: // Reinforce Item
-            case 429407694: // hone weapon
-            case 429440462: // hone armor
-            case 429016905: //poison blade
-            case 429505610: // poison blade
-            case 427908971: // consecrate weapon
-            case 429439055: // mark of slaying
-            case 429605702: // annoint blade
-            case 429414682: // slay rat
-            case 429594877: // consecrate weapon
-            case 429440895: // charm of slaying
-            case 429491437: // infuse with power
-                PowersBase pb = PowersManager.getPowerByToken(msg.getPowerUsedID());
-                if(pb == null)
-                    return false;
-                for (ActionsBase action : pb.getActions()){
-                    try {
-                        if(msg.getNumTrains() > action.maxTrains)
-                            continue;
-                        EffectsBase eb = action.getPowerAction().getEffectsBase();
-                        if(eb == null)
-                            return false;
-                        //Effect eff = pc.addEffectNoTimer(eb.getName(),eb,msg.getNumTrains(),false);
-                        //if(eff == null){
-                        //    Logger.error(pc.getFirstName() + " failed to apply self buff: " + msg.getPowerUsedID());
-                        //}
-
-                        UsePowerJob asj = new UsePowerJob(pc,msg,pb.getToken(),pb,pc.getLiveCounter(),pc.getLiveCounter());
-
-                        JobContainer jc = JobScheduler.getInstance().scheduleJob(asj, 1800000);
-                        Effect eff = new Effect(jc, eb, msg.getNumTrains());
-                       // pc.effects.put("CASTABLE", eff);
-                        pc.addEffect("CASTABLE",1800,asj,eb,msg.getNumTrains());
-                        pc.applyAllBonuses();
-
-                        ApplyEffectMsg pum = new ApplyEffectMsg();
-                        pum.setEffectID(eff.getEffectToken());
-                        pum.setSourceType(pc.getObjectType().ordinal());
-                        pum.setSourceID(pc.getObjectUUID());
-                        pum.setTargetType(pc.getObjectType().ordinal());
-                        pum.setTargetID(pc.getObjectUUID());
-                        pum.setNumTrains(eff.getTrains());
-                        pum.setUnknown05(1);
-                        pum.setUnknown02(2);
-                        pum.setUnknown06((byte) 1);
-                        pum.setEffectSourceType(GameObjectType.PlayerCharacter.ordinal());
-                        pum.setEffectSourceID(pc.getObjectUUID());
-                        pum.setDuration(1800);
-
-
-                        DispatchMessage.dispatchMsgToInterestArea(pc, pum, DispatchChannel.PRIMARY, MBServerStatics.CHARACTER_LOAD_RANGE, true, false);
-                    }
-                    catch(Exception e){
-
-                    }
-                }
-                return true;
-        }
-        return false;
-    }
-
 }
 
 

src/engine/gameManager/SimulationManager.java

@@ -10,7 +10,10 @@ package engine.gameManager;
 
 import engine.Enum;
 import engine.Enum.GameObjectType;
-import engine.objects.*;
+import engine.objects.AbstractGameObject;
+import engine.objects.City;
+import engine.objects.PlayerCharacter;
+import engine.objects.Runegate;
 import org.pmw.tinylog.Logger;
 
 import java.sql.Connection;
@@ -30,7 +33,7 @@ public enum SimulationManager {
     SERVERHEARTBEAT;
 
     private static final long CITY_PULSE = 2000;
-    private static final long RUNEGATE_PULSE = 1000;
+    private static final long RUNEGATE_PULSE = 3000;
     private static final long UPDATE_PULSE = 1000;
     private static final long FlIGHT_PULSE = 100;
     public static Duration executionTime = Duration.ofNanos(1);
@@ -91,13 +94,16 @@ public enum SimulationManager {
                     "Fatal error in City Pulse: DISABLED. Error Message : "
                             + e.getMessage());
         }
-        //try {
+        try {
 
-        //    if ((_updatePulseTime != 0) && (System.currentTimeMillis() > _updatePulseTime))
-        //        pulseUpdate();
-        //} catch (Exception e) {
-         //   Logger.error("Fatal error in Update Pulse: DISABLED");
-        //}
+            if ((_updatePulseTime != 0)
+                    && (System.currentTimeMillis() > _updatePulseTime))
+                pulseUpdate();
+        } catch (Exception e) {
+            Logger.error(
+                    "Fatal error in Update Pulse: DISABLED");
+            //  _runegatePulseTime = 0;
+        }
 
         try {
             if ((_runegatePulseTime != 0)
@@ -110,18 +116,9 @@ public enum SimulationManager {
         }
 
         try {
-            if ((_cityPulseTime != 0) && (System.currentTimeMillis() > _cityPulseTime)) {
-                try {
-                    pulseCities();
-                }catch(Exception e){
-
-                }
-                try {
-                    ArenaManager.pulseArenas();
-                }catch(Exception e){
-
-                }
-            }
+            if ((_cityPulseTime != 0)
+                    && (System.currentTimeMillis() > _cityPulseTime))
+                pulseCities();
         } catch (Exception e) {
             Logger.error(
                     "Fatal error in City Pulse: DISABLED. Error Message : "
@@ -130,25 +127,6 @@ public enum SimulationManager {
 
         }
 
-        //try{
-        //    HellgateManager.pulseHellgates();
-        //}catch(Exception e){
-        //    Logger.error("Failed to pulse hellgates");
-       //     Logger.error(e.getMessage());
-        //}
-
-        try{
-            if(ZoneManager.hotZone != null && HotzoneManager.hotzoneMob != null && !HotzoneManager.hotzoneMob.isAlive()){
-                HotzoneManager.ClearHotzone();
-            }
-        }catch(Exception e){
-
-        }
-        try{
-            HotzoneManager.pulse();
-        }catch(Exception e){
-//
-        }
         SimulationManager.executionTime = Duration.between(startTime, Instant.now());
 
         if (executionTime.compareTo(executionMax) > 0)
@@ -176,11 +154,7 @@ public enum SimulationManager {
 
             if (player == null)
                 continue;
-            try {
-                player.update(false);
-            }catch(Exception e){
-
-            }
+            player.update();
         }
 
         _updatePulseTime = System.currentTimeMillis() + 500;
@@ -229,12 +203,8 @@ public enum SimulationManager {
             city = (City) cityObject;
             city.onEnter();
         }
-        for(Mine mine : Mine.getMines()){
-            if(mine != null && mine.isActive)
-                mine.onEnter();
-        }
-        _cityPulseTime = System.currentTimeMillis() + CITY_PULSE;
 
+        _cityPulseTime = System.currentTimeMillis() + CITY_PULSE;
     }
 
     /*
@@ -244,10 +214,6 @@ public enum SimulationManager {
     private void pulseRunegates() {
 
         for (Runegate runegate : Runegate._runegates.values()) {
-            for(Portal portal : runegate._portals)
-                if(!portal.isActive())
-                    portal.activate(false);
-
             runegate.collidePortals();
         }
 

src/engine/gameManager/SpecialLootHandler.java

@@ -1,277 +0,0 @@
-package engine.gameManager;
-
-import engine.InterestManagement.WorldGrid;
-import engine.math.Vector3fImmutable;
-import engine.objects.*;
-import engine.server.MBServerStatics;
-
-import java.util.*;
-import java.util.concurrent.ThreadLocalRandom;
-
-public class SpecialLootHandler {
-    public static final List<Integer> DWARVEN_contracts = Arrays.asList(
-            35250, 35251, 35252, 35253, 35254, 35255, 35256, 35257, 35258, 35259, 35260, 35261, 35262, 35263
-    );
-
-    public static final List<Integer> INVORRI_contracts = Arrays.asList(
-            35050, 35051, 35052, 35053, 35054, 35055, 35056, 35057, 35058, 35059, 35060, 35061, 35062, 35063
-    );
-
-    public static final List<Integer> SHADE_contracts = Arrays.asList(
-            35400, 35401, 35402, 35403, 35404, 35405, 35406, 35407, 35408, 35409, 35410, 35411, 35412, 35413,
-            35414, 35415, 35416, 35417, 35418, 35419, 35420, 35421, 35422, 35423, 35424, 35425, 35426, 35427
-    );
-
-    public static final List<Integer> VAMPIRE_contracts = Arrays.asList(
-            35545, 35546, 35547, 35548, 35549, 35550, 35551, 35552, 35553, 35554, 35555, 35556, 35557, 35558,
-            35559, 35560, 35561, 35562, 35563, 35564, 35565, 35566, 35567, 35568, 35569, 35570
-    );
-
-    public static final List<Integer> IREKEI_contracts = Arrays.asList(
-            35100, 35101, 35102, 35103, 35104, 35105, 35106, 35107, 35108, 35109, 35110, 35111, 35112, 35113,
-            35114, 35115, 35116, 35117, 35118, 35119, 35120, 35121, 35122, 35123, 35124, 35125, 35126, 35127
-    );
-
-    public static final List<Integer> AMAZON_contracts = Arrays.asList(
-            35200, 35201, 35202, 35203, 35204, 35205, 35206, 35207, 35208, 35209, 35210, 35211, 35212, 35213
-    );
-
-    public static final List<Integer> GWENDANNEN_contracts = Arrays.asList(
-            35350, 35351, 35352, 35353, 35354, 35355, 35356, 35357, 35358, 35359, 35360, 35361, 35362, 35363,
-            35364, 35365, 35366, 35367, 35368, 35369, 35370, 35371, 35372, 35373, 35374, 35375, 35376, 35377
-    );
-
-    public static final List<Integer> NEPHILIM_contracts = Arrays.asList(
-            35500, 35501, 35502, 35503, 35504, 35505, 35506, 35507, 35508, 35509, 35510, 35511, 35512, 35513,
-            35514, 35515, 35516, 35517, 35518, 35519, 35520, 35521, 35522, 35523, 35524, 35525
-    );
-
-    public static final List<Integer> ELVEN_contracts = Arrays.asList(
-            35000, 35001, 35002, 35003, 35004, 35005, 35006, 35007, 35008, 35009, 35010, 35011, 35012, 35013,
-            35014, 35015, 35016, 35017, 35018, 35019, 35020, 35021, 35022, 35023, 35024, 35025, 35026, 35027
-    );
-
-    public static final List<Integer> CENTAUR_contracts = Arrays.asList(
-            35150, 35151, 35152, 35153, 35154, 35155, 35156, 35157, 35158, 35159, 35160, 35161, 35162, 35163,
-            35164, 35165, 35166, 35167, 35168, 35169, 35170, 35171, 35172, 35173, 35174, 35175, 35176, 35177
-    );
-
-    public static final List<Integer> LIZARDMAN_contracts = Arrays.asList(
-            35300, 35301, 35302, 35303, 35304, 35305, 35306, 35307, 35308, 35309, 35310, 35311, 35312, 35313
-    );
-
-    public static final List<Integer> GLASS_ITEMS = Arrays.asList(
-            7000100, 7000110, 7000120, 7000130, 7000140, 7000150, 7000160, 7000170, 7000180, 7000190,
-            7000200, 7000210, 7000220, 7000230, 7000240, 7000250, 7000270, 7000280
-    );
-
-    public static final List<Integer> STAT_RUNES = Arrays.asList(
-            250001, 250002, 250003, 250004, 250005, 250006, 250007, 250008, 250010, 250011,
-            250012, 250013, 250014, 250015, 250016, 250017, 250019, 250020, 250021, 250022,
-            250023, 250024, 250025, 250026, 250028, 250029, 250030, 250031, 250032, 250033,
-            250034, 250035, 250037, 250038, 250039, 250040, 250041, 250042, 250043, 250044
-    );
-
-    public static final List<Integer> racial_guard = Arrays.asList(
-            841,951,952,1050,1052,1180,1182,1250,1252,1350,1352,1450,
-            1452,1500,1502,1525,1527,1550,1552,1575,1577,1600,1602,1650,1652,1700,980100,
-            980102
-    );
-
-    public static void RollContract(Mob mob){
-
-        Zone zone = getMacroZone(mob);
-        if(zone == null)
-            return;
-
-        int contactId = 0;
-        int roll = ThreadLocalRandom.current().nextInt(250);
-        if(roll == 125){
-            contactId = getContractForZone(zone);
-        }
-        if(contactId == 0)
-            return;
-
-        ItemBase contractBase = ItemBase.getItemBase(contactId);
-        if(contractBase == null)
-            return;
-
-        if(mob.getCharItemManager() == null)
-            return;
-
-        MobLoot contract = new MobLoot(mob,contractBase,false);
-        mob.getCharItemManager().addItemToInventory(contract);
-
-    }
-
-    public static Zone getMacroZone(Mob mob){
-
-        Zone parentZone = mob.parentZone;
-        if(parentZone == null)
-            return null;
-
-        while(!parentZone.isMacroZone() && !parentZone.equals(ZoneManager.getSeaFloor())){
-            parentZone = parentZone.getParent();
-        }
-
-        return parentZone;
-
-        //for(Zone zone : ZoneManager.macroZones){
-        //    HashSet<AbstractWorldObject> inZone = WorldGrid.getObjectsInRangePartial(zone.getLoc(),zone.getBounds().getHalfExtents().x * 2f, MBServerStatics.MASK_MOB);
-        //    if(inZone.contains(mob)){
-        //        return zone;
-         //   }
-        //}
-        //return null;
-    }
-
-    public static int getContractForZone(Zone zone){
-        Random random = new Random();
-        switch (zone.getObjectUUID())
-        {
-            case 178:
-                // Kralgaar Holm
-                return DWARVEN_contracts.get(random.nextInt(DWARVEN_contracts.size()));
-            case 122:
-                // Aurrochs Skrae
-                return INVORRI_contracts.get(random.nextInt(INVORRI_contracts.size()));
-            case 197:
-                // Ymur's Crown
-                return INVORRI_contracts.get(random.nextInt(INVORRI_contracts.size()));
-            case 234:
-                // Ecklund Wilds
-                return INVORRI_contracts.get(random.nextInt(INVORRI_contracts.size()));
-            case 313:
-                // Greensward Pyre
-                return SHADE_contracts.get(random.nextInt(SHADE_contracts.size()));
-            case 331:
-                // The Doomplain
-                return VAMPIRE_contracts.get(random.nextInt(VAMPIRE_contracts.size()));
-            case 353:
-                // Thollok Marsh
-                return LIZARDMAN_contracts.get(random.nextInt(LIZARDMAN_contracts.size()));
-            case 371:
-                // The Black Bog
-                return LIZARDMAN_contracts.get(random.nextInt(LIZARDMAN_contracts.size()));
-            case 388:
-                // Sevaath Mere
-                return LIZARDMAN_contracts.get(random.nextInt(LIZARDMAN_contracts.size()));
-            case 418:
-                // Valkos Wilds
-                return GWENDANNEN_contracts.get(random.nextInt(GWENDANNEN_contracts.size()));
-            case 437:
-                // Grimscairne
-                return SHADE_contracts.get(random.nextInt(SHADE_contracts.size()));
-            case 475:
-                // Phaedra's Prize
-                return AMAZON_contracts.get(random.nextInt(AMAZON_contracts.size()));
-            case 491:
-                // Holloch Forest
-                return GWENDANNEN_contracts.get(random.nextInt(GWENDANNEN_contracts.size()));
-            case 508:
-                // Aeran Belendor
-                return ELVEN_contracts.get(random.nextInt(ELVEN_contracts.size()));
-            case 532:
-                // Tainted Swamp
-                return NEPHILIM_contracts.get(random.nextInt(NEPHILIM_contracts.size()));
-            case 550:
-                // Aerath Hellendroth
-                return ELVEN_contracts.get(random.nextInt(ELVEN_contracts.size()));
-            case 569:
-                // Aedroch Highlands
-                return GWENDANNEN_contracts.get(random.nextInt(GWENDANNEN_contracts.size()));
-            case 590:
-                // Fellgrim Forest
-                return GWENDANNEN_contracts.get(random.nextInt(GWENDANNEN_contracts.size()));
-            case 616:
-                // Derros Plains
-                return CENTAUR_contracts.get(random.nextInt(CENTAUR_contracts.size()));
-            case 632:
-                // Ashfell Plain
-                return SHADE_contracts.get(random.nextInt(SHADE_contracts.size()));
-            case 717:
-                // Kharsoom
-                return IREKEI_contracts.get(random.nextInt(IREKEI_contracts.size()));
-            case 737:
-                // Leth'khalivar Desert
-                return IREKEI_contracts.get(random.nextInt(IREKEI_contracts.size()));
-            case 761:
-                // The Blood Sands
-                return IREKEI_contracts.get(random.nextInt(IREKEI_contracts.size()));
-            case 785:
-                // Vale of Nar Addad
-                return IREKEI_contracts.get(random.nextInt(IREKEI_contracts.size()));
-            case 824:
-                // Western Battleground
-                return NEPHILIM_contracts.get(random.nextInt(NEPHILIM_contracts.size()));
-            case 842:
-                // Pandemonium
-                return NEPHILIM_contracts.get(random.nextInt(NEPHILIM_contracts.size()));
-            case 951:
-                //Bone Marches
-                return VAMPIRE_contracts.get(random.nextInt(VAMPIRE_contracts.size()));
-            case 952:
-                //plain of ashes
-                return VAMPIRE_contracts.get(random.nextInt(VAMPIRE_contracts.size()));
-        }
-        return 0;
-    }
-
-    public static void RollGlass(Mob mob){
-
-        int roll = ThreadLocalRandom.current().nextInt(10000);
-        if(roll != 5000)
-            return;
-
-        Random random = new Random();
-        int glassId = GLASS_ITEMS.get(random.nextInt(GLASS_ITEMS.size()));
-        ItemBase glassBase = ItemBase.getItemBase(glassId);
-        if(glassBase == null)
-            return;
-
-        if(mob.getCharItemManager() == null)
-            return;
-
-        MobLoot glass = new MobLoot(mob,glassBase,false);
-        mob.getCharItemManager().addItemToInventory(glass);
-    }
-
-    public static void RollRune(Mob mob){
-        int runeID = 0;
-        int roll = ThreadLocalRandom.current().nextInt(250);
-        Random random = new Random();
-        if(roll == 125){
-            runeID = STAT_RUNES.get(random.nextInt(STAT_RUNES.size()));
-        }
-        if(runeID == 0)
-            return;
-
-        ItemBase runeBase = ItemBase.getItemBase(runeID);
-        if(runeBase == null)
-            return;
-
-        if(mob.getCharItemManager() == null)
-            return;
-
-        MobLoot rune = new MobLoot(mob,runeBase,false);
-        mob.getCharItemManager().addItemToInventory(rune);
-    }
-
-    public static void RollRacialGuard(Mob mob){
-        int roll = ThreadLocalRandom.current().nextInt(5000);
-        if(roll != 2500)
-            return;
-
-        Random random = new Random();
-        int guardId = racial_guard.get(random.nextInt(racial_guard.size()));
-        ItemBase guardBase = ItemBase.getItemBase(guardId);
-        if(guardBase == null)
-            return;
-
-        if(mob.getCharItemManager() == null)
-            return;
-
-        MobLoot guard = new MobLoot(mob,guardBase,false);
-        mob.getCharItemManager().addItemToInventory(guard);
-    }
-}

src/engine/gameManager/StrongholdManager.java

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

src/engine/gameManager/ZergManager.java

@@ -1,274 +0,0 @@
-package engine.gameManager;
-import engine.InterestManagement.WorldGrid;
-import engine.objects.*;
-import engine.server.MBServerStatics;
-
-import java.util.ArrayList;
-
-public class ZergManager {
-
-    public static float getCurrentMultiplier(int count, int maxCount){
-        switch(maxCount) {
-            case 3: return getMultiplier3Man(count);
-            case 5: return getMultiplier5Man(count);
-            case 10: return getMultiplier10Man(count);
-            case 20: return getMultiplier20Man(count);
-            case 30: return getMultiplier30Man(count);
-            case 40: return getMultiplier40Man(count);
-            default: return 1.0f; //unlimited
-        }
-    }
-    public static float getMultiplier3Man(int count) {
-        if(count < 4)
-            return 1.0f;
-
-        if(count > 6)
-            return 0.0f;
-
-        switch(count){
-            case 4: return 0.50f;
-            case 5: return 0.0f;
-            case 6: return 0.0f;
-            default: return 1.0f;
-        }
-    }
-    public static float getMultiplier5Man(int count) {
-        if(count < 6)
-            return 1.0f;
-
-        if(count > 10)
-            return 0.0f;
-
-        switch(count){
-            case 6: return 0.75f;
-            case 7: return 0.57f;
-            case 8: return 0.44f;
-            case 9: return 0.33f;
-            case 10: return 0.25f;
-            default: return 1.0f;
-        }
-    }
-    public static float getMultiplier10Man(int count) {
-        if(count < 11)
-            return 1.0f;
-
-        if(count > 20)
-            return 0.0f;
-
-        switch(count){
-            case 11: return 0.86f;
-            case 12: return 0.75f;
-            case 13: return 0.65f;
-            case 14: return 0.57f;
-            case 15: return 0.50f;
-            case 16: return 0.44f;
-            case 17: return 0.38f;
-            case 18: return 0.33f;
-            case 19: return 0.29f;
-            case 20: return 0.25f;
-            default: return 1.0f;
-        }
-    }
-    public static float getMultiplier20Man(int count) {
-        if(count < 21)
-            return 1.0f;
-
-        if(count > 40)
-            return 0.0f;
-
-        switch (count)
-        {
-            case 21: return 0.93f;
-            case 22: return 0.86f;
-            case 23: return 0.80f;
-            case 24: return 0.75f;
-            case 25: return 0.70f;
-            case 26: return 0.65f;
-            case 27: return 0.61f;
-            case 28: return 0.57f;
-            case 29: return 0.53f;
-            case 30: return 0.50f;
-            case 31: return 0.47f;
-            case 32: return 0.44f;
-            case 33: return 0.41f;
-            case 34: return 0.38f;
-            case 35: return 0.36f;
-            case 36: return 0.33f;
-            case 37: return 0.31f;
-            case 38: return 0.29f;
-            case 39: return 0.27f;
-            case 40: return 0.25f;
-            default: return 1.0f;
-        }
-
-    }
-    public static float getMultiplier30Man(int count) {
-        if(count < 31)
-            return 1.0f;
-
-        if(count > 60)
-            return 0.0f;
-
-        switch (count)
-        {
-            case 31: return 0.95f;
-            case 32: return 0.91f;
-            case 33: return 0.86f;
-            case 34: return 0.82f;
-            case 35: return 0.79f;
-            case 36: return 0.75f;
-            case 37: return 0.72f;
-            case 38: return 0.68f;
-            case 39: return 0.65f;
-            case 40: return 0.63f;
-            case 41: return 0.60f;
-            case 42: return 0.57f;
-            case 43: return 0.55f;
-            case 44: return 0.52f;
-            case 45: return 0.50f;
-            case 46: return 0.48f;
-            case 47: return 0.46f;
-            case 48: return 0.44f;
-            case 49: return 0.42f;
-            case 50: return 0.40f;
-            case 51: return 0.38f;
-            case 52: return 0.37f;
-            case 53: return 0.35f;
-            case 54: return 0.33f;
-            case 55: return 0.32f;
-            case 56: return 0.30f;
-            case 57: return 0.29f;
-            case 58: return 0.28f;
-            case 59: return 0.26f;
-            case 60: return 0.25f;
-            default: return 1.0f;
-        }
-
-    }
-    public static float getMultiplier40Man(int count) {
-        if(count < 41)
-            return 1.0f;
-
-        if(count > 80)
-            return 0.0f;
-
-        switch (count)
-        {
-            case 41: return 0.96f;
-            case 42: return 0.93f;
-            case 43: return 0.90f;
-            case 44: return 0.86f;
-            case 45: return 0.83f;
-            case 46: return 0.80f;
-            case 47: return 0.78f;
-            case 48: return 0.75f;
-            case 49: return 0.72f;
-            case 50: return 0.70f;
-            case 51: return 0.68f;
-            case 52: return 0.65f;
-            case 53: return 0.63f;
-            case 54: return 0.61f;
-            case 55: return 0.59f;
-            case 56: return 0.57f;
-            case 57: return 0.55f;
-            case 58: return 0.53f;
-            case 59: return 0.52f;
-            case 60: return 0.50f;
-            case 61: return 0.48f;
-            case 62: return 0.47f;
-            case 63: return 0.45f;
-            case 64: return 0.44f;
-            case 65: return 0.42f;
-            case 66: return 0.41f;
-            case 67: return 0.40f;
-            case 68: return 0.38f;
-            case 69: return 0.37f;
-            case 70: return 0.36f;
-            case 71: return 0.35f;
-            case 72: return 0.33f;
-            case 73: return 0.32f;
-            case 74: return 0.31f;
-            case 75: return 0.30f;
-            case 76: return 0.29f;
-            case 77: return 0.28f;
-            case 78: return 0.27f;
-            case 79: return 0.26f;
-            case 80: return 0.25f;
-            default: return 1.0f;
-        }
-    }
-
-    public static void MineTracker(Mine mine){
-        Building tower = BuildingManager.getBuildingFromCache(mine.getBuildingID());
-        if(tower == null)
-            return;
-
-        float affectedRange = MBServerStatics.CHARACTER_LOAD_RANGE * 3;
-        mine.zergTracker.compileCurrent(tower.loc, affectedRange);
-        mine.zergTracker.sortByNation();
-        mine.zergTracker.compileLeaveQue(tower.loc, affectedRange);
-        mine.zergTracker.processLeaveQue();
-        mine.zergTracker.applyMultiplier(mine.capSize);
-    }
-
-    public static void PrintDetailsToClient(PlayerCharacter pc){
-        String newline = "\r\n ";
-        String outstring = newline + "ZERG MANAGER DETAILS FOR: " + pc.getFirstName() + newline;
-        Mine attended = null;
-        for(Mine mine : Mine.getMines()){
-            Building tower = BuildingManager.getBuilding(mine.getBuildingID());
-            if(tower == null)
-                continue;
-
-            float rangeSquared = (MBServerStatics.CHARACTER_LOAD_RANGE * 3) * (MBServerStatics.CHARACTER_LOAD_RANGE * 3);
-
-            if(pc.loc.distanceSquared(tower.loc) < rangeSquared){
-                attended = mine;
-            }
-        }
-        if(attended != null){
-            outstring += "Mine Cap: " + attended.capSize + newline;
-            Building tower = BuildingManager.getBuilding(attended.getBuildingID());
-            if(tower == null)
-                return;
-
-            int count = 0;
-            ArrayList<PlayerCharacter> stillPresent = new ArrayList<>();
-            ArrayList<PlayerCharacter> gonePlayers = new ArrayList<>();
-            for(Integer countedID : attended.mineAttendees.keySet()){
-                PlayerCharacter counted = PlayerCharacter.getFromCache(countedID);
-                if(counted != null){
-                    if(counted.guild.getNation().equals(pc.guild.getNation())) {
-                        Long timeGone = System.currentTimeMillis() - attended.mineAttendees.get(countedID);
-                        if(timeGone > 5000){
-                            //outstring += counted.getFirstName() + " GONE FOR: " + timeGone/1000 + " SECONDS" + newline;
-                            gonePlayers.add(counted);
-                        }else{
-                            //outstring += counted.getFirstName() + " STILL PRESENT" + newline;
-                            stillPresent.add(counted);
-                        }
-                        count ++;
-                    }
-                }
-            }
-            outstring += newline + "TOTAL NATION MEMBERS COUNTED: " + count + newline;
-            outstring += newline + "PLAYERS PRESENT:" + newline;
-            for(PlayerCharacter present : stillPresent){
-                outstring += present.getFirstName() + newline;
-            }
-            outstring += newline + "PLAYERS GONE:" + newline;
-            for(PlayerCharacter gone : gonePlayers){
-                Long timeGone = System.currentTimeMillis() - attended.mineAttendees.get(gone.getObjectUUID());
-                if(timeGone > 5000) {
-                    outstring += gone.getFirstName() + " GONE FOR: " + timeGone / 1000 + " SECONDS" + newline;
-                }
-            }
-        }else{
-            outstring += "Mine: Not Within Mine Distance" + newline;
-        }
-
-        outstring += newline + "Zerg Multiplier: " + pc.ZergMultiplier + newline;
-
-        ChatManager.chatSystemInfo(pc, outstring);
-    }
-}

src/engine/gameManager/ZoneManager.java

@@ -9,8 +9,7 @@
 package engine.gameManager;
 
 import engine.Enum;
-import engine.db.archive.CityRecord;
-import engine.db.archive.DataWarehouse;
+import engine.InterestManagement.Terrain;
 import engine.math.Bounds;
 import engine.math.Vector2f;
 import engine.math.Vector3f;
@@ -18,13 +17,16 @@ 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;
 
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ThreadLocalRandom;
 
 /*
  * Class contains methods and structures which
@@ -34,6 +36,8 @@ 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);
@@ -43,9 +47,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 */
-    private static Zone seaFloor = null;
+    public static Zone seaFloor = null;
 
     // Find all zones coordinates fit into, starting with Sea Floor
 
@@ -58,8 +62,8 @@ public enum ZoneManager {
 
         if (zone != null) {
             allIn.add(zone);
-            while (zone.getParent() != null) {
-                zone = zone.getParent();
+            while (zone.parent != null) {
+                zone = zone.parent;
                 allIn.add(zone);
             }
         }
@@ -68,7 +72,7 @@ public enum ZoneManager {
 
     // Find smallest zone coordinates fit into.
 
-    public static final Zone findSmallestZone(final Vector3fImmutable loc) {
+    public static Zone findSmallestZone(final Vector3fImmutable loc) {
 
         Zone zone = ZoneManager.seaFloor;
 
@@ -81,13 +85,13 @@ public enum ZoneManager {
 
             childFound = false;
 
-            ArrayList<Zone> nodes = zone.getNodes();
+            ArrayList<Zone> nodes = zone.nodes;
 
             // Logger.info("soze", "" + nodes.size());
             if (nodes != null)
                 for (Zone child : nodes) {
 
-                    if (Bounds.collide(loc, child.getBounds()) == true) {
+                    if (Bounds.collide(loc, child.bounds)) {
                         zone = child;
                         childFound = true;
                         break;
@@ -97,14 +101,18 @@ public enum ZoneManager {
         return zone;
     }
 
-    public static void addZone(final int zoneID, final Zone zone) {
+    // Returns the number of available hotZones
+    // remaining in this cycle (1am)
 
-        ZoneManager.zonesByID.put(zoneID, zone);
+    public static int availableHotZones() {
 
-        ZoneManager.zonesByUUID.put(zone.getObjectUUID(), zone);
+        int count = 0;
 
-        ZoneManager.zonesByName.put(zone.getName().toLowerCase(), zone);
+        for (Zone zone : ZoneManager.macroZones)
+            if (ZoneManager.validHotZone(zone))
+                count = count + 1;
 
+        return count;
     }
 
     // Resets the  availability of hotZones
@@ -113,8 +121,8 @@ public enum ZoneManager {
     public static void resetHotZones() {
 
         for (Zone zone : ZoneManager.macroZones)
-            if (zone.hasBeenHotzone)
-                zone.hasBeenHotzone = false;
+            if (zone.wasHotzonw)
+                zone.wasHotzonw = false;
 
     }
 
@@ -131,18 +139,18 @@ public enum ZoneManager {
         return ZoneManager.zonesByName.get(zoneName);
     }
 
-    public static final Collection<Zone> getAllZones() {
+    public static Collection<Zone> getAllZones() {
         return ZoneManager.zonesByUUID.values();
     }
 
-    public static final void setHotZone(final Zone zone) {
+    public static void setHotZone(final Zone zone) {
 
         if (!zone.isMacroZone())
             return;
 
         ZoneManager.hotZone = zone;
         ZoneManager.hotZoneCycle = 1;  // Used with HOTZONE_DURATION from config.
-        zone.hasBeenHotzone = true;
+        zone.wasHotzonw = true;
         ZoneManager.hotZoneLastUpdate = LocalDateTime.now().withMinute(0).withSecond(0).atZone(ZoneId.systemDefault()).toInstant();
 
     }
@@ -152,37 +160,32 @@ public enum ZoneManager {
         if (ZoneManager.hotZone == null)
             return false;
 
-        return (Bounds.collide(loc, ZoneManager.hotZone.getBounds()) == true);
+        return (Bounds.collide(loc, ZoneManager.hotZone.bounds));
     }
 
-    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();
+    public static void populateZoneCollections(final Zone zone) {
 
         // 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.isPlayerCity()) {
-            addPlayerCityZone(zone);
+        if (zone.guild_zone) {
+            ZoneManager.playerCityZones.add(zone);
             return;
         }
 
-        if (zone.isNPCCity())
+        if (zone.isNPCCity)
             addNPCCityZone(zone);
 
     }
@@ -192,67 +195,114 @@ public enum ZoneManager {
     }
 
     private static void addNPCCityZone(final Zone zone) {
-        zone.setNPCCity(true);
+        zone.isNPCCity = 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;
+        ArrayList<Integer> zoneArray = new ArrayList<>();
+
+        if (ZoneManager.macroZones.isEmpty())
+            return;
+
+        // Reset hotZone availability if none are left.
+
+        if (ZoneManager.availableHotZones() == 0)
+            ZoneManager.resetHotZones();
+
+        for (Zone zone : ZoneManager.macroZones)
+            if (validHotZone(zone))
+                zoneArray.add(zone.getObjectUUID());
+
+        int entryIndex = ThreadLocalRandom.current().nextInt(zoneArray.size());
+
+        hotZone = ZoneManager.getZoneByUUID(zoneArray.get(entryIndex));
+
+        if (hotZone == null) {
+            Logger.error("Hotzone is null");
+            return;
+        }
+
+        ZoneManager.setHotZone(hotZone);
+
+    }
+
+    public static final boolean validHotZone(Zone zone) {
+
+        if (zone.peace_zone == (byte) 1)
+            return false; // no safe zone hotzones// if (this.hotzone == null)
+
+        if (zone.equals(ZoneManager.seaFloor))
+            return false;
+
+        if (zone.nodes.isEmpty())
+            return false;
+
+        //no duplicate hotZones
+
+        if (zone.wasHotzonw == true)
+            return false;
+
+        // Enforce min level
+
+        if (zone.min_level < Integer.parseInt(ConfigManager.MB_HOTZONE_MIN_LEVEL.getValue()))
+            return false;
+
+        if (ZoneManager.hotZone != null)
+            return ZoneManager.hotZone.getObjectUUID() != zone.getObjectUUID();
+
+        return true;
     }
 
     // Converts world coordinates to coordinates local to a given zone.
 
     public static Vector3fImmutable worldToLocal(Vector3fImmutable worldVector,
-                                                 Zone serverZone) {
+                                                 Zone zone) {
 
         Vector3fImmutable localCoords;
 
-        localCoords = new Vector3fImmutable(worldVector.x - serverZone.absX,
-                worldVector.y - serverZone.absY, worldVector.z
-                - serverZone.absZ);
+        localCoords = new Vector3fImmutable(worldVector.x - zone.absX,
+                worldVector.y - zone.absY, worldVector.z
+                - zone.absZ);
 
         return localCoords;
     }
 
-    public static Vector2f worldToZoneSpace(Vector3fImmutable worldVector,
-                                            Zone serverZone) {
+    public static Vector2f worldToZoneOffset(Vector3fImmutable worldLoc,
+                                             Zone zone) {
+
+        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(serverZone.getLoc().x, serverZone.getLoc().z);
-        zoneOrigin = zoneOrigin.subtract(new Vector2f(serverZone.getBounds().getHalfExtents().x, serverZone.getBounds().getHalfExtents().y));
+        zoneOrigin = new Vector2f(zone.getLoc().x, zone.getLoc().z);
+        zoneOrigin = zoneOrigin.subtract(new Vector2f(zone.bounds.getHalfExtents().x, zone.bounds.getHalfExtents().y));
 
         // Local coordinate in world space translated to an offset from the calculated zone origin.
 
-        localCoords = new Vector2f(worldVector.x, worldVector.z);
+        localCoords = new Vector2f(worldLoc.x, worldLoc.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.
@@ -268,9 +318,10 @@ 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);
@@ -280,12 +331,10 @@ public enum ZoneManager {
     //used for regions, Building bounds not set yet.
     public static Vector3f convertLocalToWorld(Building building, Vector3f localPos, Bounds bounds) {
 
-        // convert from SB rotation value to radians
-
+        // handle building rotation
 
         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));
@@ -308,13 +357,11 @@ public enum ZoneManager {
     public static City getCityAtLocation(Vector3fImmutable worldLoc) {
 
         Zone currentZone;
-        ArrayList<Zone> zoneList;
-        City city;
 
         currentZone = ZoneManager.findSmallestZone(worldLoc);
 
-        if (currentZone.isPlayerCity())
-            return City.getCity(currentZone.getPlayerCityUUID());
+        if (currentZone.guild_zone)
+            return City.getCity(currentZone.playerCityUUID);
 
         return null;
     }
@@ -337,16 +384,16 @@ public enum ZoneManager {
 
 
         treeBounds = Bounds.borrow();
-        treeBounds.setBounds(new Vector2f(positionX, positionZ), new Vector2f(Enum.CityBoundsType.PLACEMENT.extents, Enum.CityBoundsType.PLACEMENT.extents), 0.0f);
+        treeBounds.setBounds(new Vector2f(positionX, positionZ), new Vector2f(Enum.CityBoundsType.PLACEMENT.halfExtents, Enum.CityBoundsType.PLACEMENT.halfExtents), 0.0f);
 
-        zoneList = currentZone.getNodes();
+        zoneList = currentZone.nodes;
 
         for (Zone zone : zoneList) {
 
             if (zone.isContinent())
                 continue;
 
-            if (Bounds.collide(treeBounds, zone.getBounds(), 0.0f))
+            if (Bounds.collide(treeBounds, zone.bounds, 0.0f))
                 validLocation = false;
         }
 
@@ -354,30 +401,36 @@ public enum ZoneManager {
         return validLocation;
     }
 
-    public static void loadCities(Zone zone) {
+    public static float calculateGlobalZoneHeight(Zone zone) {
 
-        ArrayList<City> cities = DbManager.CityQueries.GET_CITIES_BY_ZONE(zone.getObjectUUID());
+        float worldAltitude = MBServerStatics.SEA_FLOOR_ALTITUDE;
 
-        for (City city : cities) {
+        // Seafloor
 
-            city.setParent(zone);
-            city.setObjectTypeMask(MBServerStatics.MASK_CITY);
-            city.setLoc(city.getLoc()); // huh?
+        if (ZoneManager.seaFloor.equals(zone))
+            return worldAltitude;
 
-//not player city, must be npc city..
+        // Children of seafloor
 
-            if (!zone.isPlayerCity())
-                zone.setNPCCity(true);
+        if (ZoneManager.seaFloor.equals(zone.parent))
+            return worldAltitude + zone.yOffset;
 
-            if ((ConfigManager.serverType.equals(Enum.ServerType.WORLDSERVER)) && (city.getHash() == null)) {
+        // return height from heightmap engine at zone location
 
-                city.setHash();
+        worldAltitude = Terrain.getWorldHeight(zone.parent, zone.getLoc());
 
-                if (DataWarehouse.recordExists(Enum.DataRecordType.CITY, city.getObjectUUID()) == false) {
-                    CityRecord cityRecord = CityRecord.borrow(city, Enum.RecordEventType.CREATE);
-                    DataWarehouse.pushToWarehouse(cityRecord);
-                }
-            }
-        }
+        // Add zone offset to value
+
+        worldAltitude += zone.yOffset;
+
+        return worldAltitude;
+    }
+
+    public static boolean isLocUnderwater(Vector3fImmutable currentLoc) {
+
+        float localAltitude = Terrain.getWorldHeight(currentLoc);
+        Zone zone = findSmallestZone(currentLoc);
+
+        return localAltitude < zone.sea_level;
     }
 }

src/engine/job/AbstractJob.java

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

src/engine/job/AbstractScheduleJob.java

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

src/engine/job/JobContainer.java

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

src/engine/job/JobThread.java

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

src/engine/job/JobWorker.java

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

src/engine/jobs/AbstractEffectJob.java

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

src/engine/jobs/ActivateBaneJob.java

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

src/engine/jobs/AttackJob.java

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

src/engine/jobs/BaneDefaultTimeJob.java

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

src/engine/jobs/BasicScheduledJob.java

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

src/engine/jobs/BonusCalcJob.java

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

src/engine/jobs/CSessionCleanupJob.java

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

src/engine/jobs/ChangeAltitudeJob.java

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

src/engine/jobs/ChantJob.java

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

src/engine/jobs/CloseGateJob.java

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

src/engine/jobs/DamageOverTimeJob.java

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

src/engine/jobs/DatabaseUpdateJob.java

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

src/engine/jobs/DebugTimerJob.java

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

src/engine/jobs/DeferredPowerJob.java

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

src/engine/jobs/DisconnectJob.java

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