Framework for workorder creation.

# Conflicts:
#	src/engine/mobileAI/Threads/MobRespawnThread.java

src/engine/Enum.java

@@ -469,7 +469,7 @@ 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()
@@ -2310,10 +2310,10 @@ public class Enum {
         ZONE(875),
         PLACEMENT(876);
 
-        public final float extents;
+        public final float halfExtents;
 
-        CityBoundsType(float extents) {
-            this.extents = extents;
+        CityBoundsType(float halfExtents) {
+            this.halfExtents = halfExtents;
         }
     }
 
@@ -2822,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),
@@ -2847,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),
@@ -2857,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;
@@ -2878,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

@@ -140,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)) {
@@ -340,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())
@@ -372,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);
@@ -437,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());
@@ -467,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());
 
@@ -480,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);

src/engine/InterestManagement/Terrain.java

@@ -0,0 +1,237 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      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_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.
+
+        float max_blend = this.zone.template.max_blend;
+        float min_blend = this.zone.template.min_blend;
+
+        // Zones with a zero blend inherit from their parent terrain
+
+        if (this.zone.template.max_blend == 0) {
+            Zone parentZone = this.getNextZoneWithTerrain(this.zone.parent);
+            max_blend = parentZone.template.max_blend;
+            min_blend = parentZone.template.min_blend;
+        }
+
+        Vector2f major_blend = new Vector2f(max_blend / this.zone.major_radius,
+                min_blend / this.zone.major_radius);
+
+        Vector2f minor_blend = new Vector2f(max_blend / this.zone.minor_radius,
+                min_blend / this.zone.minor_radius);
+
+        if (major_blend.y > 0.4f)
+            blend_ratio.x = major_blend.y;
+        else
+            blend_ratio.x = Math.min(major_blend.x, 0.4f);
+
+        if (minor_blend.y > 0.4f)
+            blend_ratio.y = minor_blend.y;
+        else
+            blend_ratio.y = Math.min(minor_blend.x, 0.4f);
+
+        // Scale coefficient for this terrain
+
+        this.terrain_scale = this.zone.template.terrain_max_y / 255f;
+    }
+
+    public static Zone getNextZoneWithTerrain(Zone zone) {
+
+        // Not all zones have a terrain.  Some are for display only
+        // and heights returned are from the parent heightmap.  This
+        // is controlled in the JSON via the has_terrain_gen field.
+
+        Zone terrain_zone = zone;
+
+        if (zone == null)
+            return ZoneManager.seaFloor;
+
+        if (zone.terrain != null)
+            return zone;
+
+        if (zone.equals(ZoneManager.seaFloor))
+            return zone;
+
+        while (terrain_zone.terrain == null)
+            terrain_zone = terrain_zone.parent;
+
+        return terrain_zone;
+    }
+
+    public static float getWorldHeight(Zone zone, Vector3fImmutable world_loc) {
+
+        // Retrieve the next zone with a terrain defined.
+
+        Zone terrainZone = getNextZoneWithTerrain(zone);
+        Zone parentZone = getNextZoneWithTerrain(zone.parent);
+
+        // Transform world loc into zone space coordinate system
+
+        Vector2f terrainLoc = ZoneManager.worldToTerrainSpace(world_loc, terrainZone);
+        Vector2f parentLoc = ZoneManager.worldToTerrainSpace(world_loc, parentZone);
+
+        // Offset from origin needed for blending function
+
+        Vector2f terrainOffset = ZoneManager.worldToZoneOffset(world_loc, terrainZone);
+
+        // Interpolate height for this position in both terrains
+
+        float interpolatedChildHeight = terrainZone.terrain.getInterpolatedTerrainHeight(terrainLoc);
+        interpolatedChildHeight += terrainZone.global_height;
+
+        float interpolatedParentTerrainHeight = parentZone.terrain.getInterpolatedTerrainHeight(parentLoc);
+        interpolatedParentTerrainHeight += parentZone.global_height;
+
+        // Blend between terrains
+
+        float blendCoefficient = terrainZone.terrain.getTerrainBlendCoefficient(terrainOffset);
+
+        float terrainHeight = interpolatedChildHeight * blendCoefficient;
+        terrainHeight += interpolatedParentTerrainHeight * (1 - blendCoefficient);
+
+        return terrainHeight;
+
+    }
+
+    public static float getWorldHeight(Vector3fImmutable world_loc) {
+
+        Zone currentZone = ZoneManager.findSmallestZone(world_loc);
+
+        return getWorldHeight(currentZone, world_loc);
+
+    }
+
+    public Vector2f getTerrainCell(Vector2f terrain_loc) {
+
+        // Calculate terrain cell with offset
+
+        Vector2f terrain_cell = new Vector2f(terrain_loc.x / this.cell_size.x, terrain_loc.y / this.cell_size.y);
+
+        // Clamp values when standing directly on pole
+
+        terrain_cell.x = Math.max(0, Math.min(this.cell_count.x - 1, terrain_cell.x));
+        terrain_cell.y = Math.max(0, Math.min(this.cell_count.y - 1, terrain_cell.y));
+
+        return terrain_cell;
+    }
+
+    public float getInterpolatedTerrainHeight(Vector2f terrain_loc) {
+
+        float interpolatedHeight;
+
+        // Early exit for guild zones
+
+        if (this.zone.guild_zone)
+            return 5.0f;
+
+        // Determine terrain and offset from top left vertex
+
+        Vector2f terrain_cell = getTerrainCell(terrain_loc);
+
+        int pixel_x = (int) Math.floor(terrain_cell.x);
+        int pixel_y = (int) Math.floor(terrain_cell.y);
+
+        Vector2f pixel_offset = new Vector2f(terrain_cell.x % 1, terrain_cell.y % 1);
+
+        // 4 surrounding vertices from the pixel array.
+
+        short top_left_pixel = terrain_pixel_data[pixel_x][pixel_y];
+        short top_right_pixel = terrain_pixel_data[pixel_x + 1][pixel_y];
+        short bottom_left_pixel = terrain_pixel_data[pixel_x][pixel_y + 1];
+        short bottom_right_pixel = terrain_pixel_data[pixel_x + 1][pixel_y + 1];
+
+        // Interpolate between the 4 vertices
+
+        interpolatedHeight = top_left_pixel * (1 - pixel_offset.x) * (1 - pixel_offset.y);
+        interpolatedHeight += top_right_pixel * (1 - pixel_offset.y) * (pixel_offset.x);
+        interpolatedHeight += (bottom_left_pixel * (1 - pixel_offset.x) * pixel_offset.y);
+        interpolatedHeight += (bottom_right_pixel * pixel_offset.y * pixel_offset.x);
+
+        interpolatedHeight *= this.terrain_scale; // Scale height
+
+        return interpolatedHeight;
+
+    }
+
+    public float getTerrainBlendCoefficient(Vector2f zone_offset) {
+
+        // Normalize terrain offset
+
+        Vector2f normalizedOffset = new Vector2f(Math.abs(zone_offset.x) / this.zone.template.major_radius,
+                Math.abs(zone_offset.y) / this.zone.template.minor_radius);
+
+        float blendCoefficient;
+
+        if (normalizedOffset.x <= 1 - blend_ratio.x || normalizedOffset.x <= normalizedOffset.y) {
+
+            if (normalizedOffset.y < 1 - blend_ratio.y)
+                return 1;
+
+            blendCoefficient = (normalizedOffset.y - (1 - blend_ratio.y)) / blend_ratio.y;
+        } else
+            blendCoefficient = (normalizedOffset.x - (1 - blend_ratio.x)) / blend_ratio.x;
+
+        blendCoefficient = (float) Math.atan((0.5f - blendCoefficient) * PI);
+
+        return (blendCoefficient + 1) * 0.5f;
+    }
+}

src/engine/db/archive/CityRecord.java

@@ -67,7 +67,7 @@ public class CityRecord extends DataRecord {
         cityRecord.locX = cityRecord.city.getTOL().getLoc().x;
         cityRecord.locY = -cityRecord.city.getTOL().getLoc().z; // flip sign on 'y' coordinate
 
-        cityRecord.zoneHash = cityRecord.city.getParent().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/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

@@ -96,14 +96,12 @@ public class dbCityHandler extends dbHandlerBase {
         return objectList;
     }
 
-    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/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/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);

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

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

src/engine/devcmd/cmds/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/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,65 @@ 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 gridSquare = heightmapZone.terrain.getTerrainCell(childZoneLoc);
+        gridSquare.x = (float) Math.floor(gridSquare.x);
+        gridSquare.y = (float) Math.floor(gridSquare.y);
 
-        Zone currentZone = ZoneManager.findSmallestZone(pc.getLoc());
+        this.throwbackInfo(playerCharacter, "Current Zone : " + currentZone.zoneName);
+        this.throwbackInfo(playerCharacter, "Heightmap Zone : " + heightmapZone.zoneName);
+        this.throwbackInfo(playerCharacter, "Parent Zone: " + parentZone.zoneName);
 
-        if (currentZone == null)
-            return;
+        this.throwbackInfo(playerCharacter, "Grid : " + "[" + gridSquare.x + "]" + "[" + gridSquare.y + "]");
+        this.throwbackInfo(playerCharacter, "offset: " + "[" + childZoneOffset.x + "]" + "[" + childZoneOffset.y + "]");
+        this.throwbackInfo(playerCharacter, "Normalized offset: " + "[" + normalizedOffset.x + "]" + "[" + normalizedOffset.y + "]");
+        this.throwbackInfo(playerCharacter, "Heightmap blend Values: max/min" + heightmapZone.template.min_blend + " /" + heightmapZone.template.max_blend);
+        this.throwbackInfo(playerCharacter, "Parent blend Values: nax/min" + parentZone.template.min_blend + " /" + parentZone.template.max_blend);
+        this.throwbackInfo(playerCharacter, "Blend coefficient: " + heightmapZone.terrain.getTerrainBlendCoefficient(childZoneOffset));
 
-        Zone parentZone = currentZone.getParent();
-
-        HeightMap heightMap = currentZone.getHeightMap();
-
-
-        //find the next parents heightmap if the currentzone heightmap is null.
-        while (heightMap == null) {
-
-            if (currentZone == ZoneManager.getSeaFloor()) {
-                this.throwbackInfo(pc, "Could not find a heightmap to get height.");
-                break;
-            }
-
-            this.throwbackError(pc, "Heightmap does not exist for " + currentZone.getName());
-            this.throwbackInfo(pc, "Using parent zone instead: ");
-            currentZone = currentZone.getParent();
-            heightMap = currentZone.getHeightMap();
-        }
-
-
-        if ((heightMap == null) || (currentZone == ZoneManager.getSeaFloor())) {
-            this.throwbackInfo(pc, currentZone.getName() + " has no heightmap ");
-            this.throwbackInfo(pc, "Current altitude: " + currentZone.absY);
-            return;
-        }
-
-        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

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

src/engine/devcmd/cmds/InfoCmd.java

@@ -387,7 +387,7 @@ public class InfoCmd extends AbstractDevCmd {
                     output += newline;
                     output += "EquipSet: " + targetNPC.getEquipmentSetID();
                     output += newline;
-                    output += "Parent Zone LoadNum : " + targetNPC.getParentZone().getLoadNum();
+                    output += "Parent Zone LoadNum : " + targetNPC.getParentZone().templateID;
 
                 }
 
@@ -440,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;
@@ -471,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
                 }

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

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

src/engine/devcmd/cmds/PrintRunesCmd.java

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

src/engine/devcmd/cmds/PrintStatsCmd.java

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

src/engine/devcmd/cmds/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.getHirelings().keySet())
+            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);
@@ -209,11 +175,13 @@ public class RemoveObjectCmd extends AbstractDevCmd {
         if (npc.building != null)
             npc.building.getHirelings().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);

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

@@ -31,6 +31,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 +41,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);
@@ -104,7 +108,6 @@ public enum BuildingManager {
         if (building == null)
             return false;
 
-
         if (building.getRank() == -1)
             return false;
 
@@ -112,26 +115,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;
 
@@ -308,6 +310,72 @@ public enum BuildingManager {
 
     }
 
+    public static void removeHireling(Building building, AbstractCharacter hireling) {
+
+        if (hireling.getObjectType().equals(GameObjectType.Mob)) {
+
+            Mob guardCaptain = (Mob) hireling;
+
+            // Clear minions from database if a guard captain
+
+            if (guardCaptain.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN))
+                DbManager.MobQueries.REMOVE_ALL_MINIONS(hireling.getObjectUUID());
+        }
+
+        // Clear minions from world
+
+        for (Integer minionUUID : hireling.minions) {
+            Mob minionMob = Mob.getMob(minionUUID);
+            DbManager.removeFromCache(minionMob);
+            WorldGrid.RemoveWorldObject(minionMob);
+            WorldGrid.unloadObject(minionMob);
+
+            if (minionMob.getParentZone() != null)
+                minionMob.getParentZone().zoneMobSet.remove(minionMob);
+        }
+
+        // Remove hireling from building
+
+        building.getHirelings().remove(hireling);
+
+        // Remove from zone mob set
+
+        if (hireling.getObjectType().equals(GameObjectType.Mob)) {
+
+            Mob hirelingMob = (Mob) hireling;
+
+            if (hirelingMob.getParentZone() != null)
+                if (hirelingMob.getParentZone().zoneMobSet.contains(hirelingMob))
+                    hirelingMob.getParentZone().zoneMobSet.remove(hireling);
+
+        }
+
+        if (hireling.getObjectType().equals(GameObjectType.NPC)) {
+
+            NPC hirelingNPC = (NPC) hireling;
+
+            if (hirelingNPC.getParentZone() != null)
+                if (hirelingNPC.getParentZone().zoneNPCSet.contains(hirelingNPC))
+                    hirelingNPC.getParentZone().zoneNPCSet.remove(hireling);
+
+        }
+
+        // Unload hireling from world
+
+        DbManager.removeFromCache(hireling);
+        WorldGrid.RemoveWorldObject(hireling);
+        WorldGrid.removeObject(hireling);
+
+        // Delete hireling from database
+
+        if (hireling.getObjectType().equals(GameObjectType.Mob))
+            DbManager.MobQueries.DELETE_MOB((Mob) hireling);
+        else
+            DbManager.NPCQueries.DELETE_NPC((NPC) hireling);
+
+    }
+
+
     public static void cleanupHirelings(Building building) {
 
         // Early exit:  Cannot have hirelings in a building
@@ -320,42 +388,18 @@ public enum BuildingManager {
 
         if (building.getRank() < 1) {
 
-            for (AbstractCharacter slottedNPC : building.getHirelings().keySet()) {
+            for (AbstractCharacter slottedNPC : building.getHirelings().keySet())
+                BuildingManager.removeHireling(building, slottedNPC);
 
-                if (slottedNPC.getObjectType() == Enum.GameObjectType.NPC)
-                    ((NPC) slottedNPC).remove();
-                else if (slottedNPC.getObjectType() == Enum.GameObjectType.Mob)
-                    NPCManager.removeMobileFromBuilding(((Mob) slottedNPC), building);
-            }
             return;
         }
 
         // Delete hireling if building has deranked.
+
         for (AbstractCharacter hireling : building.getHirelings().keySet()) {
 
-            NPC npc = null;
-            Mob mob = null;
-
-            if (hireling.getObjectType() == Enum.GameObjectType.NPC)
-                npc = (NPC) hireling;
-            else if (hireling.getObjectType() == Enum.GameObjectType.Mob)
-                mob = (Mob) hireling;
-
             if (building.getHirelings().get(hireling) > building.getBlueprint().getSlotsForRank(building.getRank()))
-
-                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);
-                }
+                BuildingManager.removeHireling(building, hireling);
 
         }
 
@@ -452,18 +496,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
             }
@@ -471,18 +515,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
             }
@@ -530,41 +574,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;
         }
@@ -787,4 +853,111 @@ public enum BuildingManager {
         }
 
     }
+
+    public static void rebuildMine(Building mineBuilding) {
+        setRank(mineBuilding, 1);
+        mineBuilding.meshUUID = mineBuilding.getBlueprint().getMeshForRank(mineBuilding.rank);
+
+        // New rank mean new max hit points.
+
+        mineBuilding.healthMax = mineBuilding.getBlueprint().getMaxHealth(mineBuilding.rank);
+        mineBuilding.setCurrentHitPoints(mineBuilding.healthMax);
+        mineBuilding.getBounds().setBounds(mineBuilding);
+    }
+
+    public static void setRank(Building building, int rank) {
+
+        int newMeshUUID;
+        boolean success;
+
+
+        // If this building has no blueprint then set rank and exit immediatly.
+
+        if (building.blueprintUUID == 0 || building.getBlueprint() != null && building.getBlueprint().getBuildingGroup().equals(BuildingGroup.MINE)) {
+            building.rank = rank;
+            DbManager.BuildingQueries.CHANGE_RANK(building.getObjectUUID(), rank);
+            return;
+        }
+
+        // Delete any upgrade jobs before doing anything else.  It won't quite work
+        // if in a few lines we happen to delete this building.
+
+        JobContainer jc = building.getTimers().get("UPGRADE");
+
+        if (jc != null) {
+            if (!JobScheduler.getInstance().cancelScheduledJob(jc))
+                Logger.error("failed to cancel existing upgrade job.");
+        }
+
+        // Attempt write to database, or delete the building
+        // if we are destroying it.
+
+        if (rank == -1)
+            success = DbManager.BuildingQueries.DELETE_FROM_DATABASE(building);
+        else
+            success = DbManager.BuildingQueries.updateBuildingRank(building, rank);
+
+        if (success == false) {
+            Logger.error("Error writing to database UUID: " + building.getObjectUUID());
+            return;
+        }
+
+        building.isDeranking.compareAndSet(false, true);
+
+        // Change the building's rank
+
+        building.rank = rank;
+
+        // New rank means new mesh
+
+        newMeshUUID = building.getBlueprint().getMeshForRank(building.rank);
+        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

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

src/engine/gameManager/CombatManager.java

@@ -30,8 +30,6 @@ import java.util.HashSet;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
 
-import static engine.math.FastMath.sqr;
-
 public enum CombatManager {
 
     COMBATMANAGER;
@@ -41,63 +39,6 @@ public enum CombatManager {
     /**
      * Message sent by player to attack something.
      */
-    public static void setAttackTarget(AttackCmdMsg msg, ClientConnection origin) throws MsgSendException {
-
-        PlayerCharacter player;
-        int targetType;
-        AbstractWorldObject target;
-
-        if (TargetedActionMsg.un2cnt == 60 || TargetedActionMsg.un2cnt == 70)
-            return;
-
-        player = SessionManager.getPlayerCharacter(origin);
-
-        if (player == null)
-            return;
-
-        //source must match player this account belongs to
-
-        if (player.getObjectUUID() != msg.getSourceID() || player.getObjectType().ordinal() != msg.getSourceType()) {
-            Logger.error("Msg Source ID " + msg.getSourceID() + " Does not Match Player ID " + player.getObjectUUID());
-            return;
-        }
-
-        targetType = msg.getTargetType();
-
-        if (targetType == GameObjectType.PlayerCharacter.ordinal()) {
-            target = PlayerCharacter.getFromCache(msg.getTargetID());
-        } else if (targetType == GameObjectType.Building.ordinal()) {
-            target = BuildingManager.getBuildingFromCache(msg.getTargetID());
-        } else if (targetType == GameObjectType.Mob.ordinal()) {
-            target = Mob.getFromCache(msg.getTargetID());
-        } else {
-            player.setCombatTarget(null);
-            return; //not valid type to attack
-        }
-
-        // quit of the combat target is already the current combat target
-        // or there is no combat target
-
-        if (target == null)
-            return;
-
-        //set sources target
-
-        player.setCombatTarget(target);
-
-        //put in combat if not already
-
-        if (!player.isCombat())
-            toggleCombat(true, origin);
-
-        //make character stand if sitting
-
-        if (player.isSit())
-            toggleSit(false, origin);
-
-        AttackTarget(player, target);
-
-    }
 
     public static void AttackTarget(PlayerCharacter playerCharacter, AbstractWorldObject target) {
 
@@ -141,11 +82,6 @@ public enum CombatManager {
             if (off == null)
                 CombatManager.createTimer(playerCharacter, MBServerStatics.SLOT_OFFHAND, 1, true); // attack in 0.1 of a second
         }
-
-        City playerCity = ZoneManager.getCityAtLocation(playerCharacter.getLoc());
-
-        if (playerCity != null && playerCity.getGuild().getNation().equals(playerCharacter.getGuild().getNation()) == false && playerCity.cityOutlaws.contains(playerCharacter.getObjectUUID()) == false)
-            playerCity.cityOutlaws.add(playerCharacter.getObjectUUID());
     }
 
     public static void setAttackTarget(PetAttackMsg msg, ClientConnection origin) throws MsgSendException {
@@ -523,7 +459,7 @@ public enum CombatManager {
     /**
      * Attempt to attack target
      */
-    private static void attack(AbstractCharacter ac, AbstractWorldObject target, Item weapon, ItemBase wb, boolean mainHand) {
+    private static void attack(AbstractCharacter attacker, AbstractWorldObject target, Item weapon, ItemBase wb, boolean mainHand) {
 
         float atr;
         int minDamage, maxDamage;
@@ -531,20 +467,20 @@ public enum CombatManager {
 
         try {
 
-            if (ac == null)
+            if (attacker == null)
                 return;
 
             if (target == null)
                 return;
 
             if (mainHand) {
-                atr = ac.getAtrHandOne();
-                minDamage = ac.getMinDamageHandOne();
-                maxDamage = ac.getMaxDamageHandOne();
+                atr = attacker.getAtrHandOne();
+                minDamage = attacker.getMinDamageHandOne();
+                maxDamage = attacker.getMaxDamageHandOne();
             } else {
-                atr = ac.getAtrHandTwo();
-                minDamage = ac.getMinDamageHandTwo();
-                maxDamage = ac.getMaxDamageHandTwo();
+                atr = attacker.getAtrHandTwo();
+                minDamage = attacker.getMinDamageHandTwo();
+                maxDamage = attacker.getMaxDamageHandTwo();
             }
 
             boolean tarIsRat = false;
@@ -563,9 +499,9 @@ public enum CombatManager {
             //Dont think we need to do this anymore.
 
             if (tarIsRat)
-                if (ac.getBonuses().getFloatPercentAll(ModType.Slay, SourceType.Rat) != 0) {   //strip away current % dmg buffs then add with rat %
+                if (attacker.getBonuses().getFloatPercentAll(ModType.Slay, SourceType.Rat) != 0) {   //strip away current % dmg buffs then add with rat %
 
-                    float percent = 1 + ac.getBonuses().getFloatPercentAll(ModType.Slay, SourceType.Rat);
+                    float percent = 1 + attacker.getBonuses().getFloatPercentAll(ModType.Slay, SourceType.Rat);
 
                     minDamage *= percent;
                     maxDamage *= percent;
@@ -576,24 +512,24 @@ public enum CombatManager {
             //subtract stamina
 
             if (wb == null)
-                ac.modifyStamina(-0.5f, ac, true);
+                attacker.modifyStamina(-0.5f, attacker, true);
             else {
                 float stam = wb.getWeight() / 3;
                 stam = (stam < 1) ? 1 : stam;
-                ac.modifyStamina(-(stam), ac, true);
+                attacker.modifyStamina(-(stam), attacker, true);
             }
 
-            ac.cancelOnAttackSwing();
+            attacker.cancelOnAttackSwing();
 
             errorTrack = 2;
 
             //set last time this player has attacked something.
 
-            if (target.getObjectType().equals(GameObjectType.PlayerCharacter) && target.getObjectUUID() != ac.getObjectUUID() && ac.getObjectType() == GameObjectType.PlayerCharacter) {
-                ac.setTimeStamp("LastCombatPlayer", System.currentTimeMillis());
+            if (target.getObjectType().equals(GameObjectType.PlayerCharacter) && target.getObjectUUID() != attacker.getObjectUUID() && attacker.getObjectType() == GameObjectType.PlayerCharacter) {
+                attacker.setTimeStamp("LastCombatPlayer", System.currentTimeMillis());
                 ((PlayerCharacter) target).setTimeStamp("LastCombatPlayer", System.currentTimeMillis());
             } else
-                ac.setTimeStamp("LastCombatMob", System.currentTimeMillis());
+                attacker.setTimeStamp("LastCombatMob", System.currentTimeMillis());
 
             errorTrack = 3;
 
@@ -604,42 +540,16 @@ public enum CombatManager {
             if (target.getObjectType().equals(GameObjectType.Building)) {
 
                 if (BuildingManager.getBuildingFromCache(target.getObjectUUID()) == null) {
-                    ac.setCombatTarget(null);
+                    attacker.setCombatTarget(null);
                     return;
                 }
 
                 defense = 0;
 
-                Building building = (Building) target;
-
-                if (building.getParentZone() != null && building.getParentZone().isPlayerCity()) {
-
-                    if (System.currentTimeMillis() > building.getTimeStamp("CallForHelp")) {
-
-                        building.getTimestamps().put("CallForHelp", System.currentTimeMillis() + 15000);
-
-                        for (Mob mob : building.getParentZone().zoneMobSet) {
-                            if (!mob.isPlayerGuard())
-                                continue;
-
-                            if (mob.getCombatTarget() != null)
-                                continue;
-
-                            if (mob.getGuild() != null && building.getGuild() != null)
-                                if (!Guild.sameGuild(mob.getGuild().getNation(), building.getGuild().getNation()))
-                                    continue;
-
-                            if (mob.getLoc().distanceSquared2D(building.getLoc()) > sqr(300))
-                                continue;
-
-                            mob.setCombatTarget(ac);
-                        }
-                    }
-                }
             } else {
                 AbstractCharacter tar = (AbstractCharacter) target;
                 defense = tar.getDefenseRating();
-                handleRetaliate(tar, ac);   //Handle target attacking back if in combat and has no other target
+                handleRetaliate(tar, attacker);   //Handle target attacking back if in combat and has no other target
             }
 
             errorTrack = 4;
@@ -665,11 +575,11 @@ public enum CombatManager {
 
             if (roll < chance) {
 
-                if (ac.getObjectType().equals(GameObjectType.PlayerCharacter))
-                    updateAttackTimers((PlayerCharacter) ac, target, true);