add offset for runegate teleport regions

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.template == 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) {
+        CityBoundsType(float halfExtents) {
-            this.extents = extents;
+            this.halfExtents = halfExtents;
         }
     }
 
@@ -2877,10 +2877,11 @@ public class Enum {
 
     public enum AIAgentType {
         MOBILE,
+        GUARDCAPTAIN,
+        GUARDMINION,
+        GUARDWALLARCHER,
         PET,
         CHARMED,
-
+        SIEGEENGINE;
-        SIEGEENGINE,
-        GUARD;
     }
 }

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());

src/engine/InterestManagement/Terrain.java

@@ -0,0 +1,224 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      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.terrain_image;
+
+        // Configure PLANAR zones to use the same 16x16 pixel image
+        // that all similar terrains share.  (See JSON)
+
+        if (this.zone.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.
+
+        Vector2f major_blend = new Vector2f(this.zone.max_blend / this.zone.major_radius,
+                this.zone.min_blend / this.zone.major_radius);
+
+        Vector2f minor_blend = new Vector2f(this.zone.max_blend / this.zone.minor_radius,
+                this.zone.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.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;
+
+        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.
+
+        float top_left_pixel = terrain_pixel_data[pixel_x][pixel_y];
+        float top_right_pixel = terrain_pixel_data[pixel_x + 1][pixel_y];
+        float bottom_left_pixel = terrain_pixel_data[pixel_x][pixel_y + 1];
+        float 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.major_radius,
+                Math.abs(zone_offset.y) / this.zone.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/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

@@ -33,7 +33,7 @@ public class dbMobHandler extends dbHandlerBase {
         Mob mobile = null;
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("CALL `mob_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("CALL `mob_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?);")) {
 
             preparedStatement.setLong(1, toAdd.parentZoneUUID);
             preparedStatement.setInt(2, toAdd.loadID);
@@ -48,6 +48,7 @@ public class dbMobHandler extends dbHandlerBase {
             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();
 
@@ -110,7 +111,7 @@ public class dbMobHandler extends dbHandlerBase {
             ResultSet rs = preparedStatement.executeQuery();
 
             while (rs.next()) {
-                String minionName = rs.getString("name");
+                String minionName = rs.getString("minionName");
                 Mob toCreate = Mob.createGuardMinion(guardCaptain, guardCaptain.getLevel(), minionName);
 
                 if (toCreate == null)
@@ -126,15 +127,13 @@ public class dbMobHandler extends dbHandlerBase {
         }
     }
 
-    public boolean ADD_TO_GUARDS(final long captainUID, final int mobBaseID, final String name, final int slot) {
+    public boolean ADD_GUARD_MINION(final long captainUID, final String minionName) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_guards` (`captainUID`, `mobBaseID`,`name`, `slot`) VALUES (?,?,?,?)")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_guards` (`captainUID`, `minionName`) VALUES (?,?)")) {
 
             preparedStatement.setLong(1, captainUID);
-            preparedStatement.setInt(2, mobBaseID);
+            preparedStatement.setString(2, minionName);
-            preparedStatement.setString(3, name);
-            preparedStatement.setInt(4, slot);
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -144,14 +143,13 @@ public class dbMobHandler extends dbHandlerBase {
         }
     }
 
-    public boolean REMOVE_FROM_GUARDS(final long captainUID, final int mobBaseID, final int slot) {
+    public boolean REMOVE_GUARD_MINION(final long captainUID, final String minionName) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=? AND `mobBaseID`=? AND `slot` =?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=? AND `minionName`=? LIMIT 1;")) {
 
             preparedStatement.setLong(1, captainUID);
-            preparedStatement.setInt(2, mobBaseID);
+            preparedStatement.setString(2, minionName);
-            preparedStatement.setInt(3, slot);
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -161,6 +159,20 @@ public class dbMobHandler extends dbHandlerBase {
         }
     }
 
+    public boolean REMOVE_ALL_MINIONS(final long captainUID) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_guards` WHERE `captainUID`=?;")) {
+
+            preparedStatement.setLong(1, captainUID);
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+            return false;
+        }
+    }
 
     public ArrayList<Mob> GET_ALL_MOBS_FOR_ZONE(Zone zone) {
 

src/engine/db/handlers/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

@@ -11,8 +11,6 @@ package engine.db.handlers;
 
 import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.gameManager.ZoneManager;
-import engine.math.Vector2f;
 import engine.objects.Zone;
 import org.pmw.tinylog.Logger;
 
@@ -33,18 +31,18 @@ public class dbZoneHandler extends dbHandlerBase {
         ArrayList<Zone> wsmList = new ArrayList<>();
         wsmList.addAll(zone.getNodes());
         if (zone.absX == 0.0f) {
-            zone.absX = zone.getXCoord();
+            zone.absX = zone.xOffset;
         }
         if (zone.absY == 0.0f) {
-            zone.absY = zone.getYCoord();
+            zone.absY = zone.yOffset;
         }
         if (zone.absZ == 0.0f) {
-            zone.absZ = zone.getZCoord();
+            zone.absZ = zone.zOffset;
         }
         for (Zone child : zone.getNodes()) {
-            child.absX = child.getXCoord() + zone.absX;
+            child.absX = child.xOffset + zone.absX;
-            child.absY = child.getYCoord() + zone.absY;
+            child.absY = child.yOffset + zone.absY;
-            child.absZ = child.getZCoord() + zone.absZ;
+            child.absZ = child.zOffset + zone.absZ;
             wsmList.addAll(this.GET_ALL_NODES(child));
         }
         return wsmList;
@@ -91,26 +89,6 @@ public class dbZoneHandler extends dbHandlerBase {
         return zoneList;
     }
 
-    public void LOAD_ZONE_EXTENTS() {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_zone_size`;")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-
-            while (rs.next()) {
-                Vector2f zoneSize = new Vector2f();
-                int loadNum = rs.getInt("loadNum");
-                zoneSize.x = rs.getFloat("xRadius");
-                zoneSize.y = rs.getFloat("zRadius");
-                ZoneManager._zone_size_data.put(loadNum, zoneSize);
-            }
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-    }
-
     public boolean DELETE_ZONE(final Zone zone) {
 
         try (Connection connection = DbManager.getConnection();

src/engine/devcmd/cmds/AddMobCmd.java

@@ -9,6 +9,7 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum;
 import engine.Enum.GameObjectType;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.ChatManager;
@@ -43,7 +44,7 @@ public class AddMobCmd extends AbstractDevCmd {
                 MobBase mb = (MobBase) mobbaseAGO;
                 int loadID = mb.getObjectUUID();
                 Mob mob = Mob.createMob(loadID, Vector3fImmutable.getRandomPointInCircle(pc.getLoc(), 100),
-                        null, zone, null, null, "", 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, zone, null, null, "", 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. ");
+                        throwbackInfo(pcSender, zoneMicro.zoneName + " at location  " + zoneMicro.getLoc().toString() + " has " + size + " mobs. ");
-                        System.out.println(zoneMicro.getName() + " 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,63 @@ 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.major_radius,
+                Math.abs(childZoneOffset.y) / heightmapZone.minor_radius);
+        Vector2f parentZoneLoc = ZoneManager.worldToTerrainSpace(playerCharacter.getLoc(), parentZone);
 
-        this.throwbackInfo(pc, "Character Height: " + pc.getCharacterHeight());
+        float childHeight = heightmapZone.terrain.getInterpolatedTerrainHeight(childZoneLoc);
-        this.throwbackInfo(pc, "Character Height to start swimming: " + pc.centerHeight);
+        childHeight = childHeight + heightmapZone.global_height;
 
-        Zone zone = ZoneManager.findSmallestZone(pc.getLoc());
+        float parentHeight = parentZone.terrain.getInterpolatedTerrainHeight(parentZoneLoc);
-        this.throwbackInfo(pc, "Water Level : " + zone.getSeaLevel());
+        parentHeight += parentZone.global_height;
-        this.throwbackInfo(pc, "Character Water Level Above : " + (pc.getCharacterHeight() + height - zone.getSeaLevel()));
 
-        if (end)
+        float blendedHeight = Terrain.getWorldHeight(currentZone, playerCharacter.getLoc());
-            return;
 
-        Vector2f gridSquare;
+        Vector2f gridSquare = heightmapZone.terrain.getTerrainCell(childZoneLoc);
-        Vector2f gridOffset;
+        gridSquare.x = (float) Math.floor(gridSquare.x);
-        Vector2f parentGrid;
+        gridSquare.y = (float) Math.floor(gridSquare.y);
-        Vector2f parentLoc = new Vector2f(-1, -1);
 
-        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)
+        this.throwbackInfo(playerCharacter, "Grid : " + "[" + gridSquare.x + "]" + "[" + gridSquare.y + "]");
-            return;
+        this.throwbackInfo(playerCharacter, "offset: " + "[" + childZoneOffset.x + "]" + "[" + childZoneOffset.y + "]");
+        this.throwbackInfo(playerCharacter, "Normalized offset: " + "[" + normalizedOffset.x + "]" + "[" + normalizedOffset.y + "]");
+        this.throwbackInfo(playerCharacter, "Blend: " + heightmapZone.terrain.getTerrainBlendCoefficient(childZoneOffset));
 
-        Zone parentZone = currentZone.getParent();
+        this.throwbackInfo(playerCharacter, "------------");
-
-        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, "Child Height: " + Math.ceil(childHeight));
+        this.throwbackInfo(playerCharacter, "Parent Height : " + Math.ceil(parentHeight));
+        this.throwbackInfo(playerCharacter, "Blended Height : " + 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.template);
     }
 
     @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().template;
 
                 }
 
@@ -473,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().template;
                 } 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;

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)
+        if(equip != null){
-            getWeaponBase(2, equip);
+           if(equip.get(2) != null && !equip.get(2).getItemBase().isShield()){
-        if (main == null && off == null) {
+                //off hand weapon
-            out += "Main Hand: atr: " + tar.getAtrHandOne() + ", damage: " + tar.getMinDamageHandOne() + " to " + tar.getMaxDamageHandOne() + ", speed: " + tar.getSpeedHandOne() + ", range: 6" + newline;
+                out += "Attack Rating: " + tar.atrHandTwo + newline;
-        } else {
+                out += "Damage: " + tar.minDamageHandTwo + " - " + tar.maxDamageHandTwo + newline;
-            if (main != null)
+                out += "Range: " + tar.rangeHandTwo + newline;
-                out += "Main Hand: atr: " + tar.getAtrHandOne() + ", damage: " + tar.getMinDamageHandOne() + " to " + tar.getMaxDamageHandOne() + ", speed: " + tar.getSpeedHandOne() + ", range: " + main.getRange() + newline;
+               out += "Attack Speed: " + tar.speedHandTwo + newline;
-            if (off != null)
+            } else{
-                out += "Main Hand: atr: " + tar.getAtrHandTwo() + ", damage: " + tar.getMinDamageHandTwo() + " to " + tar.getMaxDamageHandTwo() + ", speed: " + tar.getSpeedHandTwo() + ", range: " + off.getRange() + newline;
+               out += "Attack Rating: " + tar.atrHandOne + newline;
+               out += "Damage: " + tar.minDamageHandOne + " - " + tar.maxDamageHandOne + newline;
+               out += "Range: " + tar.rangeHandOne + newline;
+               out += "Attack Speed: " + tar.speedHandOne + newline;
+            }
         }
         out += "isAlive: " + tar.isAlive() + ", Combat: " + tar.isCombat() + newline;
 

src/engine/devcmd/cmds/PurgeObjectsCmd.java

@@ -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.siegeMinionMap.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.siegeMinionMap.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)
+        if (serverZone.parent != null)
-            outString += " Parent: " + serverZone.getParent().getName();
+            outString += " Parent: " + serverZone.parent.zoneName;
         else
             outString += "Parent: NONE";
 

src/engine/devcmd/cmds/RegionCmd.java

@@ -9,9 +9,9 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
-import engine.objects.AbstractGameObject;
+import engine.objects.*;
-import engine.objects.PlayerCharacter;
 
 import java.lang.reflect.Field;
 
@@ -25,42 +25,17 @@ public class RegionCmd extends AbstractDevCmd {
     protected void _doCmd(PlayerCharacter pc, String[] words,
                           AbstractGameObject target) {
 
-
+        Regions region = ((AbstractCharacter)target).region;
-        if (pc.region == null) {
+        if (region == null) {
             this.throwbackInfo(pc, "No Region Found.");
             return;
         }
 
-
+        if(region != null) {
-        String newLine = System.getProperty("line.separator");
+            this.throwbackInfo(pc, "Region Info: " + ((AbstractCharacter) target).getName());
-        String result = "";
+            this.throwbackInfo(pc, "Region Name: " + region);
-        result += (pc.region.getClass().getSimpleName());
+            this.throwbackInfo(pc, "Region Height: " + region.lerpY((AbstractCharacter)target));
-        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);
-        }
-        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()) {
+        // Remove hirelings for this building
-            NPC npc = null;
-            Mob mobA = null;
 
-            if (ac.getObjectType() == GameObjectType.NPC)
+        for (AbstractCharacter abstractCharacter : building.getHirelings().keySet())
-                npc = (NPC) ac;
+            BuildingManager.removeHireling(building, abstractCharacter);
-            else if (ac.getObjectType() == GameObjectType.Mob)
-                mobA = (Mob) ac;
 
-            if (npc != null) {
-                for (Mob mob : npc.siegeMinionMap.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.siegeMinionMap.keySet()) {
+        for (Integer minionUUID : npc.minions) {
-            WorldGrid.RemoveWorldObject(mob);
+            Mob minionMob = Mob.getMob(minionUUID);
-            WorldGrid.removeObject(mob, pc);
+            WorldGrid.RemoveWorldObject(minionMob);
-            if (mob.getParentZone() != null)
+            WorldGrid.removeObject(minionMob, pc);
-                mob.getParentZone().zoneMobSet.remove(mob);
+
+            if (minionMob.getParentZone() != null)
+                minionMob.getParentZone().zoneMobSet.remove(minionMob);
         }
 
         DbManager.NPCQueries.DELETE_NPC(npc);

src/engine/devcmd/cmds/SeaAuditCmd.java

@@ -0,0 +1,43 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.ZoneManager;
+import engine.objects.AbstractGameObject;
+import engine.objects.PlayerCharacter;
+import engine.objects.Zone;
+
+public class SeaAuditCmd extends AbstractDevCmd {
+
+    public SeaAuditCmd() {
+        super("seaaudit");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter playerCharacter, String[] words,
+                          AbstractGameObject target) {
+
+        for (Zone zone : ZoneManager.getAllZones())
+            if (zone.seaLevel > zone.global_height)
+                this.throwbackInfo(playerCharacter, zone.getObjectUUID() + zone.zoneName);
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Queries heightmap engine";
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "' /getheight";
+    }
+
+}

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/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, serverZone, null, null, "", 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();
+        output += "loadNum: " + zone.template;
-        if (zone.getParent() != null) {
+        if (zone.parent != null) {
-            output += StringUtils.addWS(", parent: " + zone.getParent().getObjectUUID(), 30);
+            output += StringUtils.addWS(", parent: " + zone.parent.getObjectUUID(), 30);
-            output += "Parentabs: x: " + zone.getParent().getAbsX() + ", y: " + zone.getParent().getAbsY() + ", z: " + zone.getParent().getAbsZ();
+            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) {
+        if (zone.terrain != null) {
-            output += "HeightMap ID: " + zone.getHeightMap().getHeightMapID();
+            output += "Terrain image: " + zone.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.seaLevel;
         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) {
 
@@ -130,7 +127,7 @@ public class ZoneInfoCmd extends AbstractDevCmd {
 
             for (Zone child : nodes) {
                 output += newline;
-                output += child.getName() + " (" + child.getLoadNum() + ')';
+                output += child.zoneName + " (" + child.template + ')';
             }
         }
         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.template + ") " + zone.getObjectUUID());
 
         // NPC
 

src/engine/devcmd/cmds/aiInfoCmd.java

@@ -9,13 +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;
 
 
@@ -57,6 +61,27 @@ public class aiInfoCmd extends AbstractDevCmd {
         Mob mob = (Mob) target;
         output = "Mob AI Information:" + newline;
         output += mob.getName() + 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) {
@@ -87,11 +112,44 @@ public class aiInfoCmd extends AbstractDevCmd {
 
         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;
 
-        for (int token : mob.mobPowers.keySet())
+        ArrayList<RunePowerEntry> powerEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.getMobBaseID()));
-            output += PowersManager.getPowerByToken(token).getName() + newline;
+
+        // 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

@@ -308,6 +308,72 @@ public enum BuildingManager {
 
     }
 
+    public static void removeHireling(Building building, AbstractCharacter hireling) {
+
+        if (hireling.getObjectType().equals(GameObjectType.Mob)) {
+
+            Mob guardCaptain = (Mob) hireling;
+
+            // Clear minions from database if a guard captain
+
+            if (guardCaptain.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN))
+                DbManager.MobQueries.REMOVE_ALL_MINIONS(hireling.getObjectUUID());
+        }
+
+        // Clear minions from world
+
+        for (Integer minionUUID : hireling.minions) {
+            Mob minionMob = Mob.getMob(minionUUID);
+            DbManager.removeFromCache(minionMob);
+            WorldGrid.RemoveWorldObject(minionMob);
+            WorldGrid.unloadObject(minionMob);
+
+            if (minionMob.getParentZone() != null)
+                minionMob.getParentZone().zoneMobSet.remove(minionMob);
+        }
+
+        // Remove hireling from building
+
+        building.getHirelings().remove(hireling);
+
+        // Remove from zone mob set
+
+        if (hireling.getObjectType().equals(GameObjectType.Mob)) {
+
+            Mob hirelingMob = (Mob) hireling;
+
+            if (hirelingMob.getParentZone() != null)
+                if (hirelingMob.getParentZone().zoneMobSet.contains(hirelingMob))
+                    hirelingMob.getParentZone().zoneMobSet.remove(hireling);
+
+        }
+
+        if (hireling.getObjectType().equals(GameObjectType.NPC)) {
+
+            NPC hirelingNPC = (NPC) hireling;
+
+            if (hirelingNPC.getParentZone() != null)
+                if (hirelingNPC.getParentZone().zoneNPCSet.contains(hirelingNPC))
+                    hirelingNPC.getParentZone().zoneNPCSet.remove(hireling);
+
+        }
+
+        // Unload hireling from world
+
+        DbManager.removeFromCache(hireling);
+        WorldGrid.RemoveWorldObject(hireling);
+        WorldGrid.removeObject(hireling);
+
+        // Delete hireling from database
+
+        if (hireling.getObjectType().equals(GameObjectType.Mob))
+            DbManager.MobQueries.DELETE_MOB((Mob) hireling);
+        else
+            DbManager.NPCQueries.DELETE_NPC((NPC) hireling);
+
+    }
+
+
     public static void cleanupHirelings(Building building) {
 
         // Early exit:  Cannot have hirelings in a building
@@ -320,42 +386,18 @@ public enum BuildingManager {
 
         if (building.getRank() < 1) {
 
-            for (AbstractCharacter slottedNPC : building.getHirelings().keySet()) {
+            for (AbstractCharacter slottedNPC : building.getHirelings().keySet())
+                BuildingManager.removeHireling(building, slottedNPC);
 
-                if (slottedNPC.getObjectType() == Enum.GameObjectType.NPC)
-                    ((NPC) slottedNPC).remove();
-                else if (slottedNPC.getObjectType() == Enum.GameObjectType.Mob)
-                    NPCManager.removeMobileFromBuilding(((Mob) slottedNPC), building);
-            }
             return;
         }
 
         // Delete hireling if building has deranked.
+
         for (AbstractCharacter hireling : building.getHirelings().keySet()) {
 
-            NPC npc = null;
-            Mob mob = null;
-
-            if (hireling.getObjectType() == Enum.GameObjectType.NPC)
-                npc = (NPC) hireling;
-            else if (hireling.getObjectType() == Enum.GameObjectType.Mob)
-                mob = (Mob) hireling;
-
             if (building.getHirelings().get(hireling) > building.getBlueprint().getSlotsForRank(building.getRank()))
-
+                BuildingManager.removeHireling(building, hireling);
-                if (npc != null) {
-                    if (!npc.remove())
-                        Logger.error("Failed to remove npc " + npc.getObjectUUID()
-                                + "from Building " + building.getObjectUUID());
-                    else
-                        building.getHirelings().remove(npc);
-                } else if (mob != null) {
-                    if (!NPCManager.removeMobileFromBuilding(mob, building))
-                        Logger.error("Failed to remove npc " + npc.getObjectUUID()
-                                + "from Building " + building.getObjectUUID());
-                    else
-                        building.getHirelings().remove(npc);
-                }
 
         }
 
@@ -530,41 +572,63 @@ public enum BuildingManager {
         else
             rank = 10;
 
-        Mob mob;
+        Mob mobile;
         NPC npc;
 
         if (NPC.ISWallArcher(contract)) {
 
-            mob = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, building, contract, 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(), zone, building, contract, 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(), zone, building, contract, pirateName, rank);
+            mobile = Mob.createMob(contract.getMobbaseID(), Vector3fImmutable.ZERO, contractOwner.getGuild(), zone, building, contract, pirateName, rank, Enum.AIAgentType.GUARDCAPTAIN);
 
-            if (mob == null)
+            if (mobile == null)
                 return false;
 
-            mob.setLoc(mob.getLoc());
+            // Configure AI and write new mobile to disk
+
+            mobile.behaviourType = Enum.MobBehaviourType.GuardCaptain;
+            mobile = DbManager.MobQueries.PERSIST(mobile);
+
+            // Spawn new mobile
+
+            mobile.setLoc(mobile.getLoc());
 
             return true;
         }

src/engine/gameManager/ChatManager.java

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

src/engine/gameManager/CombatManager.java

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

src/engine/gameManager/DbManager.java

@@ -70,7 +70,6 @@ public enum DbManager {
     public static final dbBlueprintHandler BlueprintQueries = new dbBlueprintHandler();
     public static final dbBoonHandler BoonQueries = new dbBoonHandler();
     public static final dbShrineHandler ShrineQueries = new dbShrineHandler();
-    public static final dbHeightMapHandler HeightMapQueries = new dbHeightMapHandler();
     public static final dbRunegateHandler RunegateQueries = new dbRunegateHandler();
 
     public static final dbPowerHandler PowerQueries = new dbPowerHandler();

src/engine/gameManager/DevCmdManager.java

@@ -46,9 +46,11 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new GetZoneCmd());
         DevCmdManager.registerDevCmd(new ZoneSetCmd());
         DevCmdManager.registerDevCmd(new PrintBankCmd());
+        DevCmdManager.registerDevCmd(new PrintEffectsCmd());
         DevCmdManager.registerDevCmd(new PrintEquipCmd());
         DevCmdManager.registerDevCmd(new PrintInventoryCmd());
         DevCmdManager.registerDevCmd(new PrintVaultCmd());
+        DevCmdManager.registerDevCmd(new PrintRunesCmd());
         DevCmdManager.registerDevCmd(new PrintStatsCmd());
         DevCmdManager.registerDevCmd(new PrintSkillsCmd());
         DevCmdManager.registerDevCmd(new PrintPowersCmd());
@@ -128,7 +130,6 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new SetForceRenameCityCmd());
         DevCmdManager.registerDevCmd(new GotoObj());
         DevCmdManager.registerDevCmd(new convertLoc());
-        DevCmdManager.registerDevCmd(new AuditHeightMapCmd());
         DevCmdManager.registerDevCmd(new UnloadFurnitureCmd());
         DevCmdManager.registerDevCmd(new SetNpcEquipSetCmd());
         DevCmdManager.registerDevCmd(new SetBuildingAltitudeCmd());
@@ -143,7 +144,7 @@ public enum DevCmdManager {
         DevCmdManager.registerDevCmd(new ApplyBonusCmd());
         DevCmdManager.registerDevCmd(new AuditFailedItemsCmd());
         DevCmdManager.registerDevCmd(new SlotTestCmd());
-
+        DevCmdManager.registerDevCmd(new SeaAuditCmd());
     }
 
     private static void registerDevCmd(AbstractDevCmd cmd) {

src/engine/gameManager/LootManager.java

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

src/engine/gameManager/MovementManager.java

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

src/engine/gameManager/NPCManager.java

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

src/engine/gameManager/PowersManager.java

@@ -9,7 +9,7 @@
 package engine.gameManager;
 
 import engine.Enum.*;
-import engine.InterestManagement.HeightMap;
+import engine.InterestManagement.Terrain;
 import engine.InterestManagement.WorldGrid;
 import engine.db.handlers.dbEffectsBaseHandler;
 import engine.db.handlers.dbPowerHandler;
@@ -53,13 +53,10 @@ public enum PowersManager {
     public static HashMap<Integer, AbstractPowerAction> powerActionsByID = new HashMap<>();
     public static HashMap<String, Integer> ActionTokenByIDString = new HashMap<>();
     public static HashMap<String, Integer> AnimationOverrides = new HashMap<>();
-    public static HashMap<Integer, ArrayList<MobPowerEntry>> AllMobPowers;
+    public static HashMap<Integer, ArrayList<RunePowerEntry>> _allRunePowers;
+    public static HashMap<Integer, ArrayList<RuneSkillAdjustEntry>> _allRuneSkillAdjusts;
     private static JobScheduler js;
 
-    private PowersManager() {
-
-    }
-
     public static void initPowersManager(boolean fullPowersLoad) {
 
         if (fullPowersLoad)
@@ -103,6 +100,16 @@ public enum PowersManager {
         }
     }
 
+    public static ArrayList<RunePowerEntry> getPowersForRune(int rune_id) {
+
+        ArrayList<RunePowerEntry> powerEntries = PowersManager._allRunePowers.get(rune_id);
+
+        if (powerEntries == null)
+            powerEntries = new ArrayList<>();
+
+        return powerEntries;
+    }
+
     // This pre-loads all powers and effects
     public static void InitializePowers() {
 
@@ -1765,7 +1772,7 @@ public enum PowersManager {
                 } else {
                     targetLoc = tl;
                     try {
-                        targetLoc = targetLoc.setY(HeightMap.getWorldHeight(targetLoc)); //on ground
+                        targetLoc = targetLoc.setY(Terrain.getWorldHeight(targetLoc)); //on ground
                     } catch (Exception e) {
                         Logger.error(e);
                         targetLoc = tl;
@@ -1967,7 +1974,7 @@ public enum PowersManager {
                 } else {
                     targetLoc = tl;
                     try {
-                        targetLoc = targetLoc.setY(HeightMap.getWorldHeight(targetLoc)); //on ground
+                        targetLoc = targetLoc.setY(Terrain.getWorldHeight(targetLoc)); //on ground
                     } catch (Exception e) {
                         Logger.error(e);
                     }

src/engine/gameManager/ZoneManager.java

@@ -9,6 +9,7 @@
 package engine.gameManager;
 
 import engine.Enum;
+import engine.InterestManagement.Terrain;
 import engine.db.archive.CityRecord;
 import engine.db.archive.DataWarehouse;
 import engine.math.Bounds;
@@ -24,7 +25,10 @@ import org.pmw.tinylog.Logger;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ThreadLocalRandom;
 
@@ -45,9 +49,9 @@ public enum ZoneManager {
     public static Instant hotZoneLastUpdate;
     public static Zone hotZone = null;
     public static int hotZoneCycle = 0;  // Used with HOTZONE_DURATION from config.
-    public static HashMap<Integer, Vector2f> _zone_size_data = new HashMap<>();
+
     /* Instance variables */
-    private static Zone seaFloor = null;
+    public static Zone seaFloor = null;
 
     // Find all zones coordinates fit into, starting with Sea Floor
 
@@ -60,8 +64,8 @@ public enum ZoneManager {
 
         if (zone != null) {
             allIn.add(zone);
-            while (zone.getParent() != null) {
+            while (zone.parent != null) {
-                zone = zone.getParent();
+                zone = zone.parent;
                 allIn.add(zone);
             }
         }
@@ -70,7 +74,7 @@ public enum ZoneManager {
 
     // Find smallest zone coordinates fit into.
 
-    public static final Zone findSmallestZone(final Vector3fImmutable loc) {
+    public static Zone findSmallestZone(final Vector3fImmutable loc) {
 
         Zone zone = ZoneManager.seaFloor;
 
@@ -89,7 +93,7 @@ public enum ZoneManager {
             if (nodes != null)
                 for (Zone child : nodes) {
 
-                    if (Bounds.collide(loc, child.getBounds()) == true) {
+                    if (Bounds.collide(loc, child.bounds)) {
                         zone = child;
                         childFound = true;
                         break;
@@ -105,7 +109,7 @@ public enum ZoneManager {
 
         ZoneManager.zonesByUUID.put(zone.getObjectUUID(), zone);
 
-        ZoneManager.zonesByName.put(zone.getName().toLowerCase(), zone);
+        ZoneManager.zonesByName.put(zone.zoneName.toLowerCase(), zone);
 
     }
 
@@ -147,11 +151,11 @@ public enum ZoneManager {
         return ZoneManager.zonesByName.get(zoneName);
     }
 
-    public static final Collection<Zone> getAllZones() {
+    public static Collection<Zone> getAllZones() {
         return ZoneManager.zonesByUUID.values();
     }
 
-    public static final void setHotZone(final Zone zone) {
+    public static void setHotZone(final Zone zone) {
 
         if (!zone.isMacroZone())
             return;
@@ -168,20 +172,16 @@ public enum ZoneManager {
         if (ZoneManager.hotZone == null)
             return false;
 
-        return (Bounds.collide(loc, ZoneManager.hotZone.getBounds()) == true);
+        return (Bounds.collide(loc, ZoneManager.hotZone.bounds));
-    }
-
-    public static Zone getSeaFloor() {
-        return ZoneManager.seaFloor;
     }
 
     public static void setSeaFloor(final Zone value) {
         ZoneManager.seaFloor = value;
     }
 
-    public static final void populateWorldZones(final Zone zone) {
+    public static void populateWorldZones(final Zone zone) {
 
-        int loadNum = zone.getLoadNum();
+        int loadNum = zone.template;
 
         // Zones are added to separate
         // collections for quick access
@@ -193,12 +193,12 @@ public enum ZoneManager {
         }
 
 
-        if (zone.isPlayerCity()) {
+        if (zone.guild_zone) {
             addPlayerCityZone(zone);
             return;
         }
 
-        if (zone.isNPCCity())
+        if (zone.isNPCCity)
             addNPCCityZone(zone);
 
     }
@@ -208,12 +208,12 @@ public enum ZoneManager {
     }
 
     private static void addNPCCityZone(final Zone zone) {
-        zone.setNPCCity(true);
+        zone.isNPCCity = true;
         ZoneManager.npcCityZones.add(zone);
     }
 
     public static final void addPlayerCityZone(final Zone zone) {
-        zone.setPlayerCity(true);
+        zone.guild_zone = true;
         ZoneManager.playerCityZones.add(zone);
     }
 
@@ -249,7 +249,7 @@ public enum ZoneManager {
 
     public static final boolean validHotZone(Zone zone) {
 
-        if (zone.getSafeZone() == (byte) 1)
+        if (zone.peace_zone == (byte) 1)
             return false; // no safe zone hotzones// if (this.hotzone == null)
 
         if (zone.getNodes().isEmpty())
@@ -265,7 +265,7 @@ public enum ZoneManager {
 
         // Enforce min level
 
-        if (zone.minLvl < Integer.parseInt(ConfigManager.MB_HOTZONE_MIN_LEVEL.getValue()))
+        if (zone.min_level < Integer.parseInt(ConfigManager.MB_HOTZONE_MIN_LEVEL.getValue()))
             return false;
 
         if (ZoneManager.hotZone != null)
@@ -277,36 +277,45 @@ public enum ZoneManager {
     // Converts world coordinates to coordinates local to a given zone.
 
     public static Vector3fImmutable worldToLocal(Vector3fImmutable worldVector,
-                                                 Zone serverZone) {
+                                                 Zone zone) {
 
         Vector3fImmutable localCoords;
 
-        localCoords = new Vector3fImmutable(worldVector.x - serverZone.absX,
+        localCoords = new Vector3fImmutable(worldVector.x - zone.absX,
-                worldVector.y - serverZone.absY, worldVector.z
+                worldVector.y - zone.absY, worldVector.z
-                - serverZone.absZ);
+                - zone.absZ);
 
         return localCoords;
     }
 
-    public static Vector2f worldToZoneSpace(Vector3fImmutable worldVector,
+    public static Vector2f worldToZoneOffset(Vector3fImmutable worldLoc,
-                                            Zone serverZone) {
+                                             Zone zone) {
+
+        Vector2f zoneLoc;
+
+        zoneLoc = new Vector2f(worldLoc.x, worldLoc.z).subtract(zone.getLoc().x, zone.getLoc().z);
+        zoneLoc.y *= -1;
+
+        return zoneLoc;
+
+    }
+
+    public static Vector2f worldToTerrainSpace(Vector3fImmutable worldLoc,
+                                               Zone zone) {
 
         Vector2f localCoords;
         Vector2f zoneOrigin;
 
         // Top left corner of zone is calculated in world space by the center and it's extents.
 
-        zoneOrigin = new Vector2f(serverZone.getLoc().x, serverZone.getLoc().z);
+        zoneOrigin = new Vector2f(zone.getLoc().x, zone.getLoc().z);
-        zoneOrigin = zoneOrigin.subtract(new Vector2f(serverZone.getBounds().getHalfExtents().x, serverZone.getBounds().getHalfExtents().y));
+        zoneOrigin = zoneOrigin.subtract(new Vector2f(zone.bounds.getHalfExtents().x, zone.bounds.getHalfExtents().y));
 
         // Local coordinate in world space translated to an offset from the calculated zone origin.
 
-        localCoords = new Vector2f(worldVector.x, worldVector.z);
+        localCoords = new Vector2f(worldLoc.x, worldLoc.z);
         localCoords = localCoords.subtract(zoneOrigin);
 
-        localCoords.setY((serverZone.getBounds().getHalfExtents().y * 2) - localCoords.y);
-
-
         // TODO : Make sure this value does not go outside the zone's bounds.
 
         return localCoords;
@@ -314,18 +323,6 @@ public enum ZoneManager {
 
     // Converts local zone coordinates to world coordinates
 
-    public static Vector3fImmutable localToWorld(Vector3fImmutable worldVector,
-                                                 Zone serverZone) {
-
-        Vector3fImmutable worldCoords;
-
-        worldCoords = new Vector3fImmutable(worldVector.x + serverZone.absX,
-                worldVector.y + serverZone.absY, worldVector.z
-                + serverZone.absZ);
-
-        return worldCoords;
-    }
-
 
     /**
      * Converts from local (relative to this building) to world.
@@ -386,8 +383,8 @@ public enum ZoneManager {
 
         currentZone = ZoneManager.findSmallestZone(worldLoc);
 
-        if (currentZone.isPlayerCity())
+        if (currentZone.guild_zone)
-            return City.getCity(currentZone.getPlayerCityUUID());
+            return City.getCity(currentZone.playerCityUUID);
 
         return null;
     }
@@ -410,7 +407,7 @@ public enum ZoneManager {
 
 
         treeBounds = Bounds.borrow();
-        treeBounds.setBounds(new Vector2f(positionX, positionZ), new Vector2f(Enum.CityBoundsType.PLACEMENT.extents, Enum.CityBoundsType.PLACEMENT.extents), 0.0f);
+        treeBounds.setBounds(new Vector2f(positionX, positionZ), new Vector2f(Enum.CityBoundsType.PLACEMENT.halfExtents, Enum.CityBoundsType.PLACEMENT.halfExtents), 0.0f);
 
         zoneList = currentZone.getNodes();
 
@@ -419,7 +416,7 @@ public enum ZoneManager {
             if (zone.isContinent())
                 continue;
 
-            if (Bounds.collide(treeBounds, zone.getBounds(), 0.0f))
+            if (Bounds.collide(treeBounds, zone.bounds, 0.0f))
                 validLocation = false;
         }
 
@@ -439,8 +436,8 @@ public enum ZoneManager {
 
 //not player city, must be npc city..
 
-            if (!zone.isPlayerCity())
+            if (!zone.guild_zone)
-                zone.setNPCCity(true);
+                zone.isNPCCity = true;
 
             if ((ConfigManager.serverType.equals(Enum.ServerType.WORLDSERVER)) && (city.getHash() == null)) {
 
@@ -453,4 +450,37 @@ public enum ZoneManager {
             }
         }
     }
+
+    public static float calculateGlobalZoneHeight(Zone zone) {
+
+        float worldAlttitude = MBServerStatics.SEA_FLOOR_ALTITUDE;
+
+        // Seafloor
+
+        if (ZoneManager.seaFloor.equals(zone))
+            return worldAlttitude;
+
+        // Children of seafloor
+
+        if (ZoneManager.seaFloor.equals(zone.parent))
+            return worldAlttitude + zone.yOffset;
+
+        // return height from heightmap engine at zone location
+
+        worldAlttitude = Terrain.getWorldHeight(zone.parent, zone.getLoc());
+
+        // Add zone offset to value
+
+        worldAlttitude += zone.yOffset;
+
+        return worldAlttitude;
+    }
+
+    public static boolean isLocUnderwater(Vector3fImmutable currentLoc) {
+
+        float localAltitude = Terrain.getWorldHeight(currentLoc);
+        Zone zone = findSmallestZone(currentLoc);
+
+        return localAltitude < zone.seaLevel;
+    }
 }

src/engine/jobs/FinishSummonsJob.java

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

src/engine/mobileAI/MobAI.java

@@ -23,6 +23,7 @@ import engine.net.client.msg.PowerProjectileMsg;
 import engine.objects.*;
 import engine.powers.ActionsBase;
 import engine.powers.PowersBase;
+import engine.powers.RunePowerEntry;
 import engine.server.MBServerStatics;
 import org.pmw.tinylog.Logger;
 
@@ -49,17 +50,19 @@ public class MobAI {
                 return;
             }
 
+            if (target.getObjectType().equals(Enum.GameObjectType.PlayerCharacter) &&
+                    !mob.canSee((AbstractCharacter) target)) {
+                mob.setCombatTarget(null);
+                return;
+            }
+
             if (target.getObjectType() == Enum.GameObjectType.PlayerCharacter && canCast(mob)) {
 
-                if (mob.isPlayerGuard() == false && MobCast(mob)) {
+                if (MobCast(mob)) {
                     mob.updateLocation();
                     return;
                 }
 
-                if (mob.isPlayerGuard() == true && GuardCast(mob)) {
-                    mob.updateLocation();
-                    return;
-                }
             }
 
             if (!CombatUtilities.inRangeToAttack(mob, target))
@@ -165,7 +168,7 @@ public class MobAI {
 
             if (playercity != null)
                 for (Mob guard : playercity.getParent().zoneMobSet)
-                    if (guard.behaviourType != null && guard.behaviourType.equals(Enum.MobBehaviourType.GuardCaptain))
+                    if (guard.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN))
                         if (guard.getCombatTarget() == null && !guard.getGuild().equals(mob.getGuild()))
                             guard.setCombatTarget(mob);
 
@@ -249,18 +252,22 @@ public class MobAI {
 
         try {
 
-            //make sure mob is out of combat stance
-
             int patrolDelay = ThreadLocalRandom.current().nextInt((int) (MobAIThread.AI_PATROL_DIVISOR * 0.5f), MobAIThread.AI_PATROL_DIVISOR) + MobAIThread.AI_PATROL_DIVISOR;
 
-            //early exit while waiting to patrol again
+            // early exit while waiting to patrol again.
+            // Minions are force marched if captain is alive
+
+            boolean forced = mob.agentType.equals(Enum.AIAgentType.GUARDMINION) &&
+                    mob.guardCaptain.isAlive();
 
             if (mob.stopPatrolTime + (patrolDelay * 1000) > System.currentTimeMillis())
+                if (!forced)
                     return;
 
-            //guard captains inherit barracks patrol points dynamically
+            //guards inherit barracks patrol points dynamically
 
-            if (mob.behaviourType.equals(Enum.MobBehaviourType.GuardCaptain)) {
+            if (mob.patrolPoints == null || mob.patrolPoints.isEmpty())
+                if (mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN) || mob.agentType.equals(Enum.AIAgentType.GUARDMINION)) {
 
                     Building barracks = mob.building;
 
@@ -275,24 +282,28 @@ public class MobAI {
             if (mob.lastPatrolPointIndex > mob.patrolPoints.size() - 1)
                 mob.lastPatrolPointIndex = 0;
 
+            // Minions are given marching orders by the captain if he is alive
+
+            if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION)) {
+                Mob captain = (Mob) mob.guardCaptain;
+                mob.destination = captain.destination.add(Formation.getOffset(2, mob.guardCaptain.minions.indexOf(mob.getObjectUUID()) + 3));
+                mob.lastPatrolPointIndex = captain.lastPatrolPointIndex;
+            } else {
                 mob.destination = mob.patrolPoints.get(mob.lastPatrolPointIndex);
                 mob.lastPatrolPointIndex += 1;
+            }
+
+            // Captain orders minions to patrol
+
+            if (mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN))
+                for (Integer minionUUID : mob.minions) {
+                    Mob minion = Mob.getMob(minionUUID);
+                    if (minion.isAlive() && minion.combatTarget == null)
+                        MobAI.Patrol(minion);
+                }
 
             MovementUtilities.aiMove(mob, mob.destination, true);
 
-            if (mob.behaviourType.equals(Enum.MobBehaviourType.GuardCaptain))
-                for (Entry<Mob, Integer> minion : mob.siegeMinionMap.entrySet())
-
-                    //make sure mob is out of combat stance
-
-                    if (minion.getKey().despawned == false) {
-                        if (MovementUtilities.canMove(minion.getKey())) {
-                            Vector3f minionOffset = Formation.getOffset(2, minion.getValue() + 3);
-                            minion.getKey().updateLocation();
-                            Vector3fImmutable formationPatrolPoint = new Vector3fImmutable(mob.destination.x + minionOffset.x, mob.destination.y, mob.destination.z + minionOffset.z);
-                            MovementUtilities.aiMove(minion.getKey(), formationPatrolPoint, true);
-                        }
-                    }
         } catch (Exception e) {
             Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: AttackTarget" + " " + e.getMessage());
         }
@@ -300,6 +311,8 @@ public class MobAI {
 
     public static boolean canCast(Mob mob) {
 
+        int contractID = 0;
+
         try {
 
             // Performs validation to determine if a
@@ -308,26 +321,27 @@ public class MobAI {
             if (mob == null)
                 return false;
 
-            if(mob.isPlayerGuard == true){
+            if (mob.isPlayerGuard() == true) {
 
-                int contractID;
+                if(mob.agentType.equals(Enum.AIAgentType.GUARDWALLARCHER))
-
+                    return false; //wall archers don't cast
-                if (mob.behaviourType.equals(Enum.MobBehaviourType.GuardMinion))
+                if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION))
                     contractID = mob.guardCaptain.contract.getContractID();
                 else
                     contractID = mob.contract.getContractID();
 
-                if(Enum.MinionType.ContractToMinionMap.get(contractID).isMage() == false)
+                // exception allowing werewolf and werebear guard captains to cast
+
+                if (Enum.MinionType.ContractToMinionMap.get(contractID).isMage() == false && contractID != 980103 && contractID != 980104)
                     return false;
             }
 
-            if (mob.mobPowers.isEmpty())
+            // Mobile has no powers defined in mobbase or contract..
+
+            if (PowersManager.getPowersForRune(mob.getMobBaseID()).isEmpty() &&
+                    PowersManager.getPowersForRune(contractID).isEmpty())
                 return false;
 
-            if (!mob.canSee((PlayerCharacter) mob.getCombatTarget())) {
-                mob.setCombatTarget(null);
-                return false;
-            }
             if (mob.nextCastTime == 0)
                 mob.nextCastTime = System.currentTimeMillis();
 
@@ -346,8 +360,8 @@ public class MobAI {
             // and casts it on the current target (or itself).  Validation
             // (including empty lists) is done previously within canCast();
 
-            ArrayList<Integer> powerTokens;
+            ArrayList<RunePowerEntry> powerEntries;
-            ArrayList<Integer> purgeTokens;
+            ArrayList<RunePowerEntry> purgeEntries;
             AbstractCharacter target = (AbstractCharacter) mob.getCombatTarget();
 
             if (mob.behaviourType.callsForHelp)
@@ -355,38 +369,58 @@ public class MobAI {
 
             // Generate a list of tokens from the mob powers for this mobile.
 
-            powerTokens = new ArrayList<>(mob.mobPowers.keySet());
+            powerEntries = new ArrayList<>(PowersManager.getPowersForRune(mob.getMobBaseID()));
-            purgeTokens = new ArrayList<>();
+            purgeEntries = new ArrayList<>();
+
+            // 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 = PowersManager.getPowersForRune(mob.contractUUID);
+
+                if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION))
+                    contractEntries = PowersManager.getPowersForRune(mob.guardCaptain.contractUUID);
+
+                powerEntries.addAll(contractEntries);
+
+            }
 
             // If player has this effect on them currently then remove
             // this token from our list.
 
-            for (int powerToken : powerTokens) {
+            for (RunePowerEntry runePowerEntry : powerEntries) {
 
-                PowersBase powerBase = PowersManager.getPowerByToken(powerToken);
+                PowersBase powerBase = PowersManager.getPowerByToken(runePowerEntry.token);
 
                 for (ActionsBase actionBase : powerBase.getActions()) {
 
                     String stackType = actionBase.stackType;
 
                     if (target.getEffects() != null && target.getEffects().containsKey(stackType))
-                        purgeTokens.add(powerToken);
+                        purgeEntries.add(runePowerEntry);
                 }
             }
 
-            powerTokens.removeAll(purgeTokens);
+            powerEntries.removeAll(purgeEntries);
 
             // Sanity check
 
-            if (powerTokens.isEmpty())
+            if (powerEntries.isEmpty())
                 return false;
 
             // Pick random spell from our list of powers
 
-            int powerToken = powerTokens.get(ThreadLocalRandom.current().nextInt(powerTokens.size()));
+            RunePowerEntry runePowerEntry = powerEntries.get(ThreadLocalRandom.current().nextInt(powerEntries.size()));
-            int powerRank = mob.mobPowers.get(powerToken);
 
-            PowersBase mobPower = PowersManager.getPowerByToken(powerToken);
+            PowersBase mobPower = PowersManager.getPowerByToken(runePowerEntry.token);
+            int powerRank = runePowerEntry.rank;
+
+            if (mob.isPlayerGuard())
+                powerRank = getGuardPowerRank(mob);
 
             //check for hit-roll
 
@@ -411,7 +445,7 @@ public class MobAI {
                 msg.setUnknown04(2);
 
                 PowersManager.finishUseMobPower(msg, mob, 0, 0);
-                long randomCooldown = (long)((ThreadLocalRandom.current().nextInt(10,15) * 1000) * MobAIThread.AI_CAST_FREQUENCY);
+                long randomCooldown = (long) ((ThreadLocalRandom.current().nextInt(10, 15) * 1000) * MobAIThread.AI_CAST_FREQUENCY);
 
                 mob.nextCastTime = System.currentTimeMillis() + randomCooldown;
                 return true;
@@ -422,64 +456,10 @@ public class MobAI {
         return false;
     }
 
-    public static boolean GuardCast(Mob mob) {
+    public static int getGuardPowerRank(Mob mob) {
-
-        try {
-            // Method picks a random spell from a mobile's list of powers
-            // and casts it on the current target (or itself).  Validation
-            // (including empty lists) is done previously within canCast();
-
-            ArrayList<Integer> powerTokens;
-            ArrayList<Integer> purgeTokens;
-            AbstractCharacter target = (AbstractCharacter) mob.getCombatTarget();
-
-            if (mob.behaviourType.callsForHelp)
-                MobCallForHelp(mob);
-
-            // Generate a list of tokens from the mob powers for this mobile.
-
-            powerTokens = new ArrayList<>(mob.mobPowers.keySet());
-            purgeTokens = new ArrayList<>();
-
-            // If player has this effect on them currently then remove
-            // this token from our list.
-
-            for (int powerToken : powerTokens) {
-
-                PowersBase powerBase = PowersManager.getPowerByToken(powerToken);
-
-                for (ActionsBase actionBase : powerBase.getActions()) {
-
-                    String stackType = actionBase.stackType;
-
-                    if (target.getEffects() != null && target.getEffects().containsKey(stackType))
-                        purgeTokens.add(powerToken);
-                }
-            }
-
-            powerTokens.removeAll(purgeTokens);
-
-            // Sanity check
-
-            if (powerTokens.isEmpty())
-                return false;
-
-            int powerToken = 0;
-            int nukeRoll = ThreadLocalRandom.current().nextInt(1,100);
-
-            if (nukeRoll < 55) {
-
-                //use direct damage spell
-                powerToken = powerTokens.get(powerTokens.size() - 1);
-
-            } else {
-                //use random spell
-                powerToken = powerTokens.get(ThreadLocalRandom.current().nextInt(powerTokens.size()));
-            }
-
         int powerRank = 1;
 
-            switch(mob.getRank()){
+        switch (mob.getRank()) {
             case 1:
                 powerRank = 10;
                 break;
@@ -502,47 +482,7 @@ public class MobAI {
                 powerRank = 40;
                 break;
         }
-
+        return powerRank;
-            PowersBase mobPower = PowersManager.getPowerByToken(powerToken);
-
-            //check for hit-roll
-
-            if (mobPower.requiresHitRoll)
-                if (CombatUtilities.triggerDefense(mob, mob.getCombatTarget()))
-                    return false;
-
-            // Cast the spell
-
-            if (CombatUtilities.inRange2D(mob, mob.getCombatTarget(), mobPower.getRange())) {
-
-                PerformActionMsg msg;
-
-                if (!mobPower.isHarmful() || mobPower.targetSelf) {
-
-                    if (mobPower.category.equals("DISPEL")) {
-                        PowersManager.useMobPower(mob, target, mobPower, powerRank);
-                        msg = PowersManager.createPowerMsg(mobPower, powerRank, mob, target);
-                    } else {
-                        PowersManager.useMobPower(mob, mob, mobPower, powerRank);
-                        msg = PowersManager.createPowerMsg(mobPower, powerRank, mob, mob);
-                    }
-                } else {
-                    PowersManager.useMobPower(mob, target, mobPower, powerRank);
-                    msg = PowersManager.createPowerMsg(mobPower, powerRank, mob, target);
-                }
-
-                msg.setUnknown04(2);
-
-                PowersManager.finishUseMobPower(msg, mob, 0, 0);
-
-                long randomCooldown = (long)((ThreadLocalRandom.current().nextInt(10,15) * 1000) * MobAIThread.AI_CAST_FREQUENCY);
-                mob.nextCastTime = System.currentTimeMillis() + randomCooldown;
-                return true;
-            }
-        } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: MobCast" + " " + e.getMessage());
-        }
-        return false;
     }
 
     public static void MobCallForHelp(Mob mob) {
@@ -606,9 +546,9 @@ public class MobAI {
 
             //override for guards
 
-            if (mob.despawned && mob.isPlayerGuard) {
+            if (mob.despawned && mob.isPlayerGuard()) {
 
-                if (mob.behaviourType.equals(Enum.MobBehaviourType.GuardMinion)) {
+                if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION)) {
                     if (mob.guardCaptain.isAlive() == false || ((Mob) mob.guardCaptain).despawned == true) {
 
                         //minions don't respawn while guard captain is dead
@@ -625,7 +565,7 @@ public class MobAI {
 
                 //check to send mob home for player guards to prevent exploit of dragging guards away and then teleporting
 
-                if (mob.behaviourType.equals(Enum.MobBehaviourType.Pet1) == false)
+                if (!mob.agentType.equals(Enum.AIAgentType.PET))
                     CheckToSendMobHome(mob);
 
                 return;
@@ -638,15 +578,23 @@ public class MobAI {
                 return;
             }
 
-            //no players loaded, no need to proceed
+            //no players loaded, no need to proceed unless it's a player guard
+            boolean bypassLoadedPlayerCheck = false;
+            if(mob.isPlayerGuard() || mob.isSiege()) {
+                bypassLoadedPlayerCheck = true;
+                if(mob.combatTarget != null && mob.combatTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))
+                    if(mob.combatTarget.loc.distanceSquared(mob.loc) > 10000)
+                        mob.setCombatTarget(null);
+            }
 
-            if (mob.playerAgroMap.isEmpty()) {
+            if (mob.playerAgroMap.isEmpty() && !bypassLoadedPlayerCheck) {
-                if(mob.getCombatTarget() != null)
+                if (mob.getCombatTarget() != null)
                     mob.setCombatTarget(null);
                 return;
             }
 
-            if (mob.behaviourType.equals(Enum.MobBehaviourType.Pet1) == false)
+
+            if (mob.agentType.equals(Enum.AIAgentType.PET) == false)
                 CheckToSendMobHome(mob);
 
             if (mob.getCombatTarget() != null) {
@@ -675,13 +623,9 @@ public class MobAI {
 
             switch (mob.behaviourType) {
                 case GuardCaptain:
-                    GuardCaptainLogic(mob);
-                    break;
                 case GuardMinion:
-                    GuardMinionLogic(mob);
-                    break;
                 case GuardWallArcher:
-                    GuardWallArcherLogic(mob);
+                    GuardLogic(mob);
                     break;
                 case Pet1:
                 case SiegeEngine:
@@ -748,7 +692,6 @@ public class MobAI {
                     aiAgent.setCombatTarget(loadedPlayer);
                     return;
                 }
-
             }
 
             if (aiAgent.getCombatTarget() == null) {
@@ -787,49 +730,41 @@ public class MobAI {
 
                 case Pet1:
 
-
+                    if (mob.guardCaptain == null)
-                    if ((PlayerCharacter) mob.guardCaptain == null)
                         return;
 
+                    //mob no longer has its owner loaded, translate pet to owner
 
-                    if (!mob.playerAgroMap.containsKey(((PlayerCharacter) mob.guardCaptain).getObjectUUID())) {
+                    if (!mob.playerAgroMap.containsKey(mob.guardCaptain.getObjectUUID())) {
-
+                        MovementManager.translocate(mob, mob.guardCaptain.getLoc());
-                        //mob no longer has its owner loaded, translocate pet to owner
-
-
-                        MovementManager.translocate(mob, ((PlayerCharacter) mob.guardCaptain).getLoc(), null);
                         return;
                     }
+
                     if (mob.getCombatTarget() == null) {
 
                         //move back to owner
 
-
+                        if (CombatUtilities.inRange2D(mob, mob.guardCaptain, 6))
-                        if (CombatUtilities.inRange2D(mob, (PlayerCharacter) mob.guardCaptain, 6))
                             return;
 
-
+                        mob.destination = mob.guardCaptain.getLoc();
-                        mob.destination = ((PlayerCharacter) mob.guardCaptain).getLoc();
+                        MovementUtilities.moveToLocation(mob, mob.destination, 5, false);
-                        MovementUtilities.moveToLocation(mob, mob.destination, 5);
                     } else
                         chaseTarget(mob);
                     break;
-                case GuardMinion:
-                    if (!mob.guardCaptain.isAlive() || ((Mob) mob.guardCaptain).despawned)
-                        randomGuardPatrolPoint(mob);
-                    else {
-                        if (mob.getCombatTarget() != null) {
-                            chaseTarget(mob);
-                        }
-                    }
-                    break;
                 default:
                     if (mob.getCombatTarget() == null) {
-                        if (!mob.isMoving())
+
+                        if (!mob.isMoving()) {
+
+                            // Minions only patrol on their own if captain is dead.
+
+                            if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION) == false)
                                 Patrol(mob);
-                        else {
+                            else if (mob.guardCaptain.isAlive() == false)
+                                Patrol(mob);
+                        } else
                             mob.stopPatrolTime = System.currentTimeMillis();
-                        }
                     } else {
                         chaseTarget(mob);
                     }
@@ -901,7 +836,7 @@ public class MobAI {
                 return;
 
             if (mob.getCombatTarget().getObjectType().equals(Enum.GameObjectType.PlayerCharacter) && MovementUtilities.inRangeDropAggro(mob, (PlayerCharacter) mob.getCombatTarget()) == false &&
-                    mob.behaviourType.equals(Enum.MobBehaviourType.Pet1) == false) {
+                    mob.agentType.equals(Enum.AIAgentType.PET) == false) {
 
                 mob.setCombatTarget(null);
                 return;
@@ -917,15 +852,6 @@ public class MobAI {
     private static void CheckToSendMobHome(Mob mob) {
 
         try {
-            if (mob.behaviourType.isAgressive) {
-
-                if (mob.isPlayerGuard()) {
-                    if (mob.behaviourType.equals(Enum.MobBehaviourType.GuardCaptain))
-                        CheckForPlayerGuardAggro(mob);
-                } else {
-                    CheckForAggro(mob);
-                }
-            }
 
             if (mob.getCombatTarget() != null && CombatUtilities.inRange2D(mob, mob.getCombatTarget(), MobAIThread.AI_BASE_AGGRO_RANGE * 0.5f))
                 return;
@@ -940,13 +866,15 @@ public class MobAI {
                     PowersManager.useMobPower(mob, mob, recall, 40);
                     mob.setCombatTarget(null);
 
-                    if (mob.behaviourType.equals(Enum.MobBehaviourType.GuardCaptain) && mob.isAlive()) {
+                    if (mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN) && mob.isAlive()) {
 
                         //guard captain pulls his minions home with him
 
-                        for (Entry<Mob, Integer> minion : mob.siegeMinionMap.entrySet()) {
+                        for (Integer minionUUID : mob.minions) {
-                            PowersManager.useMobPower(minion.getKey(), minion.getKey(), recall, 40);
+                            Mob minion = Mob.getMob(minionUUID);
-                            minion.getKey().setCombatTarget(null);
+
+                            PowersManager.useMobPower(minion, minion, recall, 40);
+                            minion.setCombatTarget(null);
                         }
                     }
                 }
@@ -957,7 +885,7 @@ public class MobAI {
                 mob.setCombatTarget(null);
 
                 for (Integer playerEntry : mob.playerAgroMap.keySet())
-                    mob.playerAgroMap.put(playerEntry,0f);
+                    mob.playerAgroMap.put(playerEntry, 0f);
             }
         } catch (Exception e) {
             Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckToSendMobHome" + " " + e.getMessage());
@@ -968,16 +896,17 @@ public class MobAI {
 
         try {
 
-            float rangeSquared = mob.getRange() * mob.getRange();
+            if(mob.getTimestamps().containsKey("lastChase") == false)
-            float distanceSquared = mob.getLoc().distanceSquared2D(mob.getCombatTarget().getLoc());
+                mob.getTimestamps().put("lastChase",System.currentTimeMillis());
+            else if(System.currentTimeMillis() < mob.getTimestamps().get("lastChase").longValue() + (750 + ThreadLocalRandom.current().nextInt(0,500)))
+                    return;
 
-            if(mob.isMoving() == true && distanceSquared < rangeSquared - 50) {
+            mob.getTimestamps().put("lastChase",System.currentTimeMillis());
-                mob.destination = mob.getLoc();
+
-                MovementUtilities.moveToLocation(mob, mob.destination, 0);
+            if (CombatUtilities.inRange2D(mob, mob.getCombatTarget(), mob.getRange()) == false) {
-            } else if (CombatUtilities.inRange2D(mob, mob.getCombatTarget(), mob.getRange()) == false) {
                 if (mob.getRange() > 15) {
                     mob.destination = mob.getCombatTarget().getLoc();
-                    MovementUtilities.moveToLocation(mob, mob.destination, 0);
+                    MovementUtilities.moveToLocation(mob, mob.destination, 0, false);
                 } else {
 
                     //check if building
@@ -986,11 +915,11 @@ public class MobAI {
                         case PlayerCharacter:
                         case Mob:
                             mob.destination = MovementUtilities.GetDestinationToCharacter(mob, (AbstractCharacter) mob.getCombatTarget());
-                            MovementUtilities.moveToLocation(mob, mob.destination, mob.getRange() + 1);
+                            MovementUtilities.moveToLocation(mob, mob.destination, mob.getRange() + 1, false);
                             break;
                         case Building:
                             mob.destination = mob.getCombatTarget().getLoc();
-                            MovementUtilities.moveToLocation(mob, mob.getCombatTarget().getLoc(), 0);
+                            MovementUtilities.moveToLocation(mob, mob.getCombatTarget().getLoc(), 0, false);
                             break;
                     }
                 }
@@ -1011,17 +940,17 @@ public class MobAI {
 
                 //dont scan self.
 
-                if (mob.equals(awoMob) || (mob.agentType.equals(Enum.AIAgentType.GUARD)) == true)
+                if (mob.equals(awoMob) || (mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN)) == true)
                     continue;
 
                 Mob aggroMob = (Mob) awoMob;
 
                 //don't attack other guards
 
-                if ((aggroMob.agentType.equals(Enum.AIAgentType.GUARD)))
+                if ((aggroMob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN)))
                     continue;
 
-                if (aggroMob.behaviourType.equals(Enum.MobBehaviourType.Pet1))
+                if (aggroMob.agentType.equals(Enum.AIAgentType.PET))
                     continue;
 
                 if (mob.getLoc().distanceSquared2D(aggroMob.getLoc()) > sqr(50))
@@ -1034,40 +963,13 @@ public class MobAI {
         }
     }
 
-    public static void GuardCaptainLogic(Mob mob) {
+    public static void GuardLogic(Mob mob) {
 
         try {
-            if (mob.getCombatTarget() == null)
-                CheckForPlayerGuardAggro(mob);
-
-            AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);
-
-            if (newTarget != null) {
-
-                if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
-                    if (GuardCanAggro(mob, (PlayerCharacter) newTarget))
-                        mob.setCombatTarget(newTarget);
-                } else
-                    mob.setCombatTarget(newTarget);
-
-            }
-
-            CheckMobMovement(mob);
-            CheckForAttack(mob);
-        } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardCaptainLogic" + " " + e.getMessage());
-        }
-    }
-
-    public static void GuardMinionLogic(Mob mob) {
-
-        try {
-            if (!mob.guardCaptain.isAlive()) {
-
             if (mob.getCombatTarget() == null) {
                 CheckForPlayerGuardAggro(mob);
             } else {
-
+                //do not need to look to change target if target is already null
                 AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);
 
                 if (newTarget != null) {
@@ -1077,31 +979,17 @@ public class MobAI {
                             mob.setCombatTarget(newTarget);
                     } else
                         mob.setCombatTarget(newTarget);
+                }
+            }
+
+            if(mob.behaviourType.canRoam)
+                CheckMobMovement(mob);//all guards that can move check to move
+
+            if(mob.combatTarget != null)
+                CheckForAttack(mob); //only check to attack if combat target is not null
 
-                    }
-                }
-            }else {
-                if (mob.guardCaptain.getCombatTarget() != null)
-                    mob.setCombatTarget(mob.guardCaptain.getCombatTarget());
-                else if (mob.getCombatTarget() != null)
-                    mob.setCombatTarget(null);
-            }
-            CheckMobMovement(mob);
-            CheckForAttack(mob);
         } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardMinionLogic" + " " + e.getMessage());
+            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardLogic" + " " + e.getMessage());
-        }
-    }
-
-    public static void GuardWallArcherLogic(Mob mob) {
-
-        try {
-            if (mob.getCombatTarget() == null)
-                CheckForPlayerGuardAggro(mob);
-            else
-                CheckForAttack(mob);
-        } catch (Exception e) {
-            Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardWallArcherLogic" + " " + e.getMessage());
         }
     }
 
@@ -1109,9 +997,8 @@ public class MobAI {
 
         try {
 
-
             if (mob.guardCaptain == null && mob.isNecroPet() == false && mob.isSiege() == false)
-                if (ZoneManager.getSeaFloor().zoneMobSet.contains(mob))
+                if (ZoneManager.seaFloor.zoneMobSet.contains(mob))
                     mob.killCharacter("no owner");
 
             if (MovementUtilities.canMove(mob) && mob.behaviourType.canRoam)
@@ -1204,6 +1091,15 @@ public class MobAI {
             if (!mob.isAlive())
                 return;
 
+            // Defer to captain if possible for current target
+
+            if (mob.agentType.equals(Enum.AIAgentType.GUARDMINION) &&
+                    mob.guardCaptain.isAlive()
+                    && mob.guardCaptain.combatTarget != null) {
+                mob.setCombatTarget(mob.guardCaptain.combatTarget);
+                return;
+            }
+
             ConcurrentHashMap<Integer, Float> loadedPlayers = mob.playerAgroMap;
 
             for (Entry playerEntry : loadedPlayers.entrySet()) {
@@ -1239,27 +1135,39 @@ public class MobAI {
                     mob.setCombatTarget(loadedPlayer);
                     return;
                 }
+            }
+                if (mob.getCombatTarget() == null) {
+
+                    //look for siege equipment to aggro if no players found to aggro
+
+                    HashSet<AbstractWorldObject> awoList = WorldGrid.getObjectsInRangePartial(mob, MobAIThread.AI_BASE_AGGRO_RANGE, MBServerStatics.MASK_SIEGE);
+
+                    for (AbstractWorldObject awoMob : awoList) {
+
+
+                        Mob aggroMob = (Mob) awoMob;
+                        if(GuardCanAggro(mob,aggroMob)) {
+                            mob.setCombatTarget(aggroMob);
+                            return;
+                        }
+                    }
+
             }
         } catch (Exception e) {
             Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: CheckForPlayerGuardAggro" + e.getMessage());
         }
     }
 
-    public static Boolean GuardCanAggro(Mob mob, PlayerCharacter target) {
+    public static Boolean GuardCanAggro(Mob mob, AbstractCharacter target) {
 
         try {
 
+            if (mob.guardedCity.cityOutlaws.contains(target.getObjectUUID()) == true)
+                return true;
+
             if (mob.getGuild().getNation().equals(target.getGuild().getNation()))
                 return false;
 
-            if (mob.behaviourType.equals(Enum.MobBehaviourType.GuardMinion)) {
-                if (((Mob) mob.guardCaptain).building.getCity().cityOutlaws.contains(target.getObjectUUID()) == true) {
-                    return true;
-                }
-            } else if (mob.building.getCity().cityOutlaws.contains(target.getObjectUUID()) == true) {
-                return true;
-            }
-
             //first check condemn list for aggro allowed (allies button is checked)
 
             if (ZoneManager.getCityAtLocation(mob.getLoc()).getTOL().reverseKOS) {
@@ -1337,17 +1245,19 @@ public class MobAI {
 
             MovementUtilities.aiMove(mob, mob.destination, true);
 
-            if (mob.behaviourType.equals(Enum.MobBehaviourType.GuardCaptain)) {
+            if (mob.agentType.equals(Enum.AIAgentType.GUARDCAPTAIN)) {
-                for (Entry<Mob, Integer> minion : mob.siegeMinionMap.entrySet()) {
+                for (Integer minionUUID : mob.minions) {
+
+                    Mob minion = Mob.getMob(minionUUID);
 
                     //make sure mob is out of combat stance
 
-                    if (minion.getKey().despawned == false) {
+                    if (minion.despawned == false) {
-                        if (MovementUtilities.canMove(minion.getKey())) {
+                        if (MovementUtilities.canMove(minion)) {
-                            Vector3f minionOffset = Formation.getOffset(2, minion.getValue() + 3);
+                            Vector3f minionOffset = Formation.getOffset(2, mob.minions.indexOf(minionUUID) + 3);
-                            minion.getKey().updateLocation();
+                            minion.updateLocation();
                             Vector3fImmutable formationPatrolPoint = new Vector3fImmutable(mob.destination.x + minionOffset.x, mob.destination.y, mob.destination.z + minionOffset.z);
-                            MovementUtilities.aiMove(minion.getKey(), formationPatrolPoint, true);
+                            MovementUtilities.aiMove(minion, formationPatrolPoint, true);
                         }
                     }
                 }

src/engine/mobileAI/utilities/CombatUtilities.java

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

src/engine/mobileAI/utilities/MovementUtilities.java

@@ -51,7 +51,7 @@ public class MovementUtilities {
 
                         //Guards recall distance = 814.
                         if (tol != null) {
-                            return !(agent.getLoc().distanceSquared2D(tol.getLoc()) > sqr(Enum.CityBoundsType.ZONE.extents));
+                            return !(agent.getLoc().distanceSquared2D(tol.getLoc()) > sqr(Enum.CityBoundsType.ZONE.halfExtents));
                         }
 
                     }
@@ -68,8 +68,8 @@ public class MovementUtilities {
         float zoneRange = 250;
 
         if (agent.getParentZone() != null) {
-            if (agent.getParentZone().getBounds() != null)
+            if (agent.getParentZone().bounds != null)
-                zoneRange = agent.getParentZone().getBounds().getHalfExtents().x * 2;
+                zoneRange = agent.getParentZone().bounds.getHalfExtents().x * 2;
         }
 
         if (zoneRange > 300)
@@ -147,7 +147,7 @@ public class MovementUtilities {
         return aiAgent.getLoc().ClosestPointOnLine(aggroTarget.getLoc(), aggroTarget.getEndLoc());
     }
 
-    public static void moveToLocation(Mob agent, Vector3fImmutable newLocation, float offset) {
+    public static void moveToLocation(Mob agent, Vector3fImmutable newLocation, float offset, boolean isWalking) {
         try {
 
             //don't move farther than 30 units from player.
@@ -158,7 +158,7 @@ public class MovementUtilities {
 
             agent.setFaceDir(newLoc.subtract2D(agent.getLoc()).normalize());
 
-            aiMove(agent, newLoc, false);
+            aiMove(agent, newLoc, isWalking);
         } catch (Exception e) {
             Logger.error(e.toString());
         }
@@ -244,10 +244,10 @@ public class MovementUtilities {
         msg.setSourceID(agent.getObjectUUID());
         msg.setStartCoord(startLoc);
         msg.setEndCoord(endLoc);
-        msg.setUnknown01(-1);
+        msg.setInBuildingFloor(-1);
         msg.setInBuilding(-1);
-        msg.setTargetType(0);
+        msg.setStartLocType(0);
-        msg.setTargetID(0);
+        msg.setInBuildingUUID(0);
 
 
         try {

src/engine/net/DispatchMessage.java

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

src/engine/net/client/ClientMessagePump.java

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

src/engine/net/client/Protocol.java

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -15,9 +15,6 @@ import engine.net.client.msg.*;
 import engine.objects.*;
 import org.pmw.tinylog.Logger;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-
 /*
  * @Author:
  * @Summary: Processes application protocol message which
@@ -26,8 +23,6 @@ import java.util.HashMap;
 
 public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
 
-    public static HashMap<Integer, ArrayList<Integer>> _minionsByCaptain = null;
-
     public MinionTrainingMsgHandler() {
         super(MinionTrainingMessage.class);
     }
@@ -37,10 +32,11 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
 
         MinionTrainingMessage minionMsg = (MinionTrainingMessage) baseMsg;
 
-        PlayerCharacter player = SessionManager.getPlayerCharacter(origin);
+        PlayerCharacter playerCharacter = SessionManager.getPlayerCharacter(origin);
 
-        if (player == null)
+        if (playerCharacter == null)
             return true;
+
         if (minionMsg.getNpcType() == Enum.GameObjectType.NPC.ordinal()) {
 
             NPC npc = NPC.getFromCache(minionMsg.getNpcID());
@@ -48,23 +44,24 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
             if (npc == null)
                 return true;
 
-            Building b = BuildingManager.getBuildingFromCache(minionMsg.getBuildingID());
+            Building building = BuildingManager.getBuildingFromCache(minionMsg.getBuildingID());
 
-            if (b == null)
+            if (building == null)
                 return true;
 
             //clear minion
 
             if (npc.minionLock.writeLock().tryLock()) {
+
                 try {
                     if (minionMsg.getType() == 2) {
 
                         Mob toRemove = Mob.getFromCache(minionMsg.getUUID());
 
-                        if (!npc.siegeMinionMap.containsKey(toRemove))
+                        if (!npc.minions.contains(toRemove.getObjectUUID()))
                             return true;
 
-                        npc.siegeMinionMap.remove(toRemove);
+                        npc.minions.remove(Integer.valueOf(toRemove.getObjectUUID()));
 
                         WorldGrid.RemoveWorldObject(toRemove);
 
@@ -86,23 +83,21 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
                             }
                         }
 
-                        // we Found the move to remove, lets break the for loop so it doesnt look for more.
+                        ManageCityAssetsMsg mca1 = new ManageCityAssetsMsg(playerCharacter, building);
-
-                        ManageCityAssetsMsg mca1 = new ManageCityAssetsMsg(player, b);
                         mca1.actionType = 3;
-                        mca1.setTargetType(b.getObjectType().ordinal());
+                        mca1.setTargetType(building.getObjectType().ordinal());
-                        mca1.setTargetID(b.getObjectUUID());
+                        mca1.setTargetID(building.getObjectUUID());
 
                         mca1.setTargetType3(npc.getObjectType().ordinal());
                         mca1.setTargetID3(npc.getObjectUUID());
-                        mca1.setAssetName1(b.getName());
+                        mca1.setAssetName1(building.getName());
                         mca1.setUnknown54(1);
 
-                        Dispatch dispatch = Dispatch.borrow(player, mca1);
+                        Dispatch dispatch = Dispatch.borrow(playerCharacter, mca1);
                         DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
 
                         ManageNPCMsg mnm = new ManageNPCMsg(npc);
-                        dispatch = Dispatch.borrow(player, mnm);
+                        dispatch = Dispatch.borrow(playerCharacter, mnm);
                         DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
 
                         //Add Minion
@@ -117,7 +112,7 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
                         if (npc.getContractID() == 842)
                             maxSlots = 1;
 
-                        if (npc.siegeMinionMap.size() == maxSlots)
+                        if (npc.minions.size() == maxSlots)
                             return true;
 
                         int mobBase;
@@ -156,7 +151,7 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
 
                     ManageNPCMsg mnm = new ManageNPCMsg(npc);
                     mnm.setMessageType(1);
-                    Dispatch dispatch = Dispatch.borrow(player, mnm);
+                    Dispatch dispatch = Dispatch.borrow(playerCharacter, mnm);
                     DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
 
                 } finally {
@@ -184,13 +179,13 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
 
                         Mob toRemove = Mob.getFromCache(minionMsg.getUUID());
 
-                        if (!npc.getSiegeMinionMap().containsKey(toRemove))
+                        if (!npc.minions.contains(toRemove.getObjectUUID()))
                             return true;
 
-                        if (!DbManager.MobQueries.REMOVE_FROM_GUARDS(npc.getObjectUUID(), toRemove.getMobBaseID(), npc.getSiegeMinionMap().get(toRemove)))
+                        if (!DbManager.MobQueries.REMOVE_GUARD_MINION(npc.getObjectUUID(), toRemove.firstName))
                             return true;
 
-                        npc.getSiegeMinionMap().remove(toRemove);
+                        npc.minions.remove(Integer.valueOf(toRemove.getObjectUUID()));
 
                         WorldGrid.RemoveWorldObject(toRemove);
 
@@ -199,19 +194,21 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
 
                         DbManager.removeFromCache(toRemove);
 
+                        if (toRemove.agentType.equals(Enum.AIAgentType.SIEGEENGINE)) {
 
-                        PlayerCharacter petOwner = (PlayerCharacter) toRemove.guardCaptain;
+                            PlayerCharacter trebOwner = (PlayerCharacter) toRemove.guardCaptain;
 
-                        if (petOwner != null) {
+                            if (trebOwner != null) {
-                            petOwner.setPet(null);
+                                trebOwner.setPet(null);
 
                                 toRemove.guardCaptain = null;
                                 PetMsg petMsg = new PetMsg(5, null);
-                            Dispatch dispatch = Dispatch.borrow(petOwner, petMsg);
+                                Dispatch dispatch = Dispatch.borrow(trebOwner, petMsg);
                                 DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
                             }
+                        }
 
-                        ManageCityAssetsMsg mca1 = new ManageCityAssetsMsg(player, building);
+                        ManageCityAssetsMsg mca1 = new ManageCityAssetsMsg(playerCharacter, building);
                         mca1.actionType = 3;
                         mca1.setTargetType(building.getObjectType().ordinal());
                         mca1.setTargetID(building.getObjectUUID());
@@ -221,11 +218,11 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
                         mca1.setAssetName1(building.getName());
                         mca1.setUnknown54(1);
 
-                        Dispatch dispatch = Dispatch.borrow(player, mca1);
+                        Dispatch dispatch = Dispatch.borrow(playerCharacter, mca1);
                         DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
 
                         ManageNPCMsg mnm = new ManageNPCMsg(npc);
-                        dispatch = Dispatch.borrow(player, mnm);
+                        dispatch = Dispatch.borrow(playerCharacter, mnm);
                         DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
 
                         //Add Minion
@@ -261,7 +258,7 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
                                 break;
                         }
 
-                        if (npc.getSiegeMinionMap().size() == maxSlots)
+                        if (npc.minions.size() == maxSlots)
                             return true;
 
                         int mobBase = npc.getMobBaseID();
@@ -276,7 +273,7 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
                         if (toCreate == null)
                             return true;
 
-                        if (!DbManager.MobQueries.ADD_TO_GUARDS(npc.getObjectUUID(), mobBase, pirateName, npc.getSiegeMinionMap().size() + 1))
+                        if (!DbManager.MobQueries.ADD_GUARD_MINION(npc.getObjectUUID(), pirateName))
                             return true;
 
                         if (toCreate != null) {
@@ -287,7 +284,7 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
 
                     ManageNPCMsg mnm = new ManageNPCMsg(npc);
                     mnm.setMessageType(1);
-                    Dispatch dispatch = Dispatch.borrow(player, mnm);
+                    Dispatch dispatch = Dispatch.borrow(playerCharacter, mnm);
                     DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY);
 
                 } catch (Exception e) {

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

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

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

@@ -334,7 +334,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
                             Zone zone = ZoneManager.findSmallestZone(player.getLoc());
 
                             if (zone != null) {
-                                if (zone.isPlayerCity()) {
+                                if (zone.guild_zone) {
                                     loc = zone.getLoc();
                                 }
                             }

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

@@ -7,7 +7,6 @@ import engine.Enum.ProfitType;
 import engine.exception.MsgSendException;
 import engine.gameManager.BuildingManager;
 import engine.gameManager.DbManager;
-import engine.gameManager.NPCManager;
 import engine.gameManager.SessionManager;
 import engine.math.FastMath;
 import engine.math.Vector3fImmutable;
@@ -37,7 +36,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         super(OrderNPCMsg.class);
     }
 
-    public static void processRedeedMob(Mob mob, Building building, ClientConnection origin) {
+    public static void processRedeedHireling(AbstractCharacter hireling, Building building, ClientConnection origin) {
 
         PlayerCharacter player;
         Contract contract;
@@ -48,33 +47,28 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         player = SessionManager.getPlayerCharacter(origin);
         itemMan = player.getCharItemManager();
 
-        contract = mob.getContract();
+        contract = hireling.contract;
 
         if (!player.getCharItemManager().hasRoomInventory((short) 1)) {
             ErrorPopupMsg.sendErrorPopup(player, 21);
             return;
         }
 
-        if (!building.getHirelings().containsKey(mob))
+        if (!building.getHirelings().containsKey(hireling))
             return;
 
-        if (!NPCManager.removeMobileFromBuilding(mob, building)) {
+        BuildingManager.removeHireling(building, hireling);
-            PlaceAssetMsg.sendPlaceAssetError(player.getClientConnection(), 1, "A Serious error has occurred. Please post details for to ensure transaction integrity");
-            return;
-        }
-
-        building.getHirelings().remove(mob);
 
         itemBase = ItemBase.getItemBase(contract.getContractID());
 
         if (itemBase == null) {
-            Logger.error("Could not find Contract for npc: " + mob.getObjectUUID());
+            Logger.error("Could not find Contract for npc: " + hireling.getObjectUUID());
             return;
         }
 
         boolean itemWorked = false;
 
-        item = new Item(itemBase, player.getObjectUUID(), Enum.OwnerType.PlayerCharacter, (byte) ((byte) mob.getRank() - 1), (byte) ((byte) mob.getRank() - 1), (short) 1, (short) 1, true, false, Enum.ItemContainerType.INVENTORY, (byte) 0, new ArrayList<>(), "");
+        item = new Item(itemBase, player.getObjectUUID(), Enum.OwnerType.PlayerCharacter, (byte) ((byte) hireling.getRank() - 1), (byte) ((byte) hireling.getRank() - 1), (short) 1, (short) 1, true, false, Enum.ItemContainerType.INVENTORY, (byte) 0, new ArrayList<>(), "");
         item.setNumOfItems(1);
         item.containerType = Enum.ItemContainerType.INVENTORY;
 
@@ -282,28 +276,6 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         }
     }
 
-    private static synchronized void processRedeedNPC(AbstractCharacter abstractCharacter, Building building, ClientConnection origin) {
-
-        // Member variable declaration
-
-        switch (abstractCharacter.getObjectType()) {
-            case NPC:
-                NPC npc = (NPC) abstractCharacter;
-
-                Building cityBuilding = npc.getBuilding();
-
-                if (cityBuilding == null)
-                    return;
-
-                BuildingManager.processRedeedNPC(npc, npc.building, origin);
-                break;
-            case Mob:
-                Mob mob = (Mob) abstractCharacter;
-                processRedeedMob(mob, mob.building, origin);
-                break;
-        }
-    }
-
     private static boolean AddPatrolPoints(int buildingID, ArrayList<Vector3fImmutable> patrolPoints) {
 
         Building building = BuildingManager.getBuildingFromCache(buildingID);
@@ -316,7 +288,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
         if (zone == null)
             return false;
 
-        if (zone.getPlayerCityUUID() == 0)
+        if (zone.playerCityUUID == 0)
             return false;
 
         City city = building.getCity();
@@ -494,7 +466,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
                     if (BuildingManager.PlayerCanControlNotOwner(building, player) == false)
                         return true;
 
-                    processRedeedNPC(npc, building, origin);
+                    processRedeedHireling(npc, building, origin);
                     return true;
                 //MB TODO HANDLE all profits.
                 case 7:
@@ -562,10 +534,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
                     if (building.getHirelings().containsKey(mob) == false)
                         return true;
 
-                    if (NPCManager.removeMobileFromBuilding(mob, building) == false) {
+                    BuildingManager.removeHireling(building, mob);
-                        PlaceAssetMsg.sendPlaceAssetError(player.getClientConnection(), 1, "A Serious error has occurred. Please post details for to ensure transaction integrity");
-                        return true;
-                    }
 
                     ManageCityAssetsMsg manageCityAssetsMsg = new ManageCityAssetsMsg();
                     manageCityAssetsMsg.actionType = SVR_CLOSE_WINDOW;
@@ -600,7 +569,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
                     if (BuildingManager.PlayerCanControlNotOwner(building, player) == false)
                         return true;
 
-                    processRedeedNPC(mob, building, origin);
+                    processRedeedHireling(mob, building, origin);
                     return true;
                 //MB TODO HANDLE all profits.
                 case 7:

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

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

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

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

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

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

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

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

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

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

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

@@ -299,8 +299,8 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
             Set<Building> buildings = ZoneManager.findSmallestZone(assetManager.getLoc()).zoneBuildingSet;
 
             Building tol = null;
-            if (playerZone.getPlayerCityUUID() != 0)
+            if (playerZone.playerCityUUID != 0)
-                city = City.GetCityFromCache(playerZone.getPlayerCityUUID());
+                city = City.GetCityFromCache(playerZone.playerCityUUID);
 
             if (city != null)
                 tol = city.getTOL();
@@ -368,7 +368,7 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
             if (zone == null)
                 return;
 
-            City banedCity = City.getCity(zone.getPlayerCityUUID());
+            City banedCity = City.getCity(zone.playerCityUUID);
 
             if (banedCity == null)
                 return;
@@ -479,7 +479,7 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
             if (zone == null)
                 writer.putString("Forlord");
             else
-                writer.putString(zone.getName());
+                writer.putString(zone.zoneName);
 
             writer.putString(building.getGuild().getName());
 
@@ -621,9 +621,9 @@ public class ManageCityAssetsMsg extends ClientNetMsg {
             } else {
                 writer.putInt(1); //kos on/off?
                 writer.putInt(3); // was 3
-                if (zone.getPlayerCityUUID() != 0 && asset.assetIsProtected()) {
+                if (zone.playerCityUUID != 0 && asset.assetIsProtected()) {
                     writer.putInt(GameObjectType.Building.ordinal());
-                    writer.putInt(City.getCity(zone.getPlayerCityUUID()).getTOL().getObjectUUID());
+                    writer.putInt(City.getCity(zone.playerCityUUID).getTOL().getObjectUUID());
                 } else {
                     writer.putInt(0);
                     writer.putInt(0);

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

@@ -27,7 +27,6 @@ import org.pmw.tinylog.Logger;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 /**
@@ -96,7 +95,7 @@ public class ManageNPCMsg extends ClientNetMsg {
         writer.putString("A weapon suited to laying siege");
     }
 
-    private static void serializeGuardList(ByteBufferWriter writer, int minion) {
+    private static void serializeGuardList(ByteBufferWriter writer, int minion, Mob captain) {
 
         writer.putInt(1);
 
@@ -106,7 +105,7 @@ public class ManageNPCMsg extends ClientNetMsg {
         writer.putInt(minion);
         writer.putInt(1);
         writer.putInt(minion);
-        writer.putInt(1);
+        writer.putInt(captain.getRank());//minion rank
         writer.put((byte) 0);
 
         writer.putInt(600); //roll time
@@ -343,14 +342,17 @@ public class ManageNPCMsg extends ClientNetMsg {
                         writer.putInt(0); //runemaster list
 
                         //artillery captain list
-                        ConcurrentHashMap<Mob, Integer> siegeMinions = npc.siegeMinionMap;
+
-                        writer.putInt(1 + siegeMinions.size());
+                        writer.putInt(1 + npc.minions.size());
                         serializeBulwarkList(writer, 1); //Trebuchet
                         //serializeBulwarkList(writer, 2); //Ballista
 
-                        if (siegeMinions != null && siegeMinions.size() > 0)
+                        if (npc.minions != null && npc.minions.size() > 0)
+
+                            for (Integer minionUUID : npc.minions) {
+
+                                Mob mob = Mob.getMob(minionUUID);
 
-                            for (Mob mob : siegeMinions.keySet()) {
                                 this.unknown83 = mob.getObjectUUID();
                                 writer.putInt(2);
                                 writer.putInt(mob.getObjectType().ordinal());
@@ -666,14 +668,15 @@ public class ManageNPCMsg extends ClientNetMsg {
                         writer.putInt(0); //runemaster list
 
                         //artillery captain list
-                        ConcurrentHashMap<Mob, Integer> siegeMinions = mobA.getSiegeMinionMap();
 
-                        writer.putInt(siegeMinions.size() + 1);
+                        writer.putInt(mobA.minions.size() + 1);
-                        serializeGuardList(writer, mobA.getContract().getContractID()); //Guard
 
-                        if (siegeMinions != null && siegeMinions.size() > 0)
+                        serializeGuardList(writer, mobA.getContract().getContractID(), mobA); //Guard
 
-                            for (Mob mob : siegeMinions.keySet()) {
+                        if (mobA.minions != null && mobA.minions.size() > 0)
+
+                            for (Integer minionUUID : mobA.minions) {
+                                Mob mob = Mob.getMob(minionUUID);
                                 this.unknown83 = mob.getObjectUUID();
                                 writer.putInt(2);
                                 writer.putInt(mob.getObjectType().ordinal());

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

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

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

@@ -73,7 +73,7 @@ public class ViewResourcesMessage extends ClientNetMsg {
         if (this.warehouseBuilding.getParentZone() == null)
             return false;
 
-        this.city = (City) DbManager.getObject(Enum.GameObjectType.City, this.warehouseBuilding.getParentZone().getPlayerCityUUID());
+        this.city = (City) DbManager.getObject(Enum.GameObjectType.City, this.warehouseBuilding.getParentZone().playerCityUUID);
 
         if (this.city == null)
             return false;

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

@@ -73,7 +73,7 @@ public class WorldDataMsg extends ClientNetMsg {
 
         // TODO replace this return with SerializationException
 
-        Zone root = ZoneManager.getSeaFloor();
+        Zone root = ZoneManager.seaFloor;
         if (root == null) {
             Logger.error("Failed to find Sea Floor!");
             return;

src/engine/objects/AbstractCharacter.java

@@ -12,12 +12,10 @@ package engine.objects;
 import engine.Enum;
 import engine.Enum.*;
 import engine.InterestManagement.InterestManager;
+import engine.InterestManagement.Terrain;
 import engine.InterestManagement.WorldGrid;
 import engine.exception.SerializationException;
-import engine.gameManager.CombatManager;
+import engine.gameManager.*;
-import engine.gameManager.ConfigManager;
-import engine.gameManager.MovementManager;
-import engine.gameManager.PowersManager;
 import engine.job.AbstractJob;
 import engine.job.JobContainer;
 import engine.job.JobScheduler;
@@ -39,6 +37,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -71,7 +70,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     public Guild guild;
     protected byte runningTrains;
     protected ConcurrentHashMap<Integer, CharacterPower> powers;
-    protected ConcurrentHashMap<String, CharacterSkill> skills;
+    public ConcurrentHashMap<String, CharacterSkill> skills;
     // Variables NOT to be stored in db
     protected boolean sit = false;
     protected boolean walkMode;
@@ -88,20 +87,20 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     protected AtomicFloat mana = new AtomicFloat();
     protected float manaMax;                                            // Health/Mana/Stamina
     protected AtomicBoolean isAlive = new AtomicBoolean(true);
-    protected Resists resists = new Resists("Genric");
+    public Resists resists = new Resists("Genric");
     protected ConcurrentHashMap<String, JobContainer> timers;
     protected ConcurrentHashMap<String, Long> timestamps;
-    protected int atrHandOne;
+    public int atrHandOne;
-    protected int atrHandTwo;
+    public int atrHandTwo;
-    protected int minDamageHandOne;
+    public int minDamageHandOne;
-    protected int maxDamageHandOne;
+    public int maxDamageHandOne;
-    protected int minDamageHandTwo;
+    public int minDamageHandTwo;
-    protected int maxDamageHandTwo;
+    public int maxDamageHandTwo;
-    protected float rangeHandOne;
+    public float rangeHandOne;
-    protected float rangeHandTwo;
+    public float rangeHandTwo;
-    protected float speedHandOne;
+    public float speedHandOne;
-    protected float speedHandTwo;
+    public float speedHandTwo;
-    protected int defenseRating;
+    public int defenseRating;
     protected boolean isActive; // <-Do not use this for deleting character!
     protected float altitude = 0; // 0=on terrain, 1=tier 1, 2=tier 2, etc.
     protected ConcurrentHashMap<Integer, JobContainer> recycleTimers;
@@ -119,7 +118,11 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     private long takeOffTime = 0;
     private long lastHateUpdate = 0;
     private byte aoecntr = 0;
-    public final ConcurrentHashMap<Mob, Integer> siegeMinionMap = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
+
+    public int hidden = 0; // current rank of hide/sneak/invis
+    public CopyOnWriteArrayList<Integer> minions = new CopyOnWriteArrayList();
+
+    public ArrayList<CharacterRune> runes;
 
     public AbstractCharacter() {
         super();
@@ -512,10 +515,9 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     }
 
     public static void teleport(AbstractCharacter worldObject, final Vector3fImmutable targetLoc) {
-        Regions targetRegion = Regions.GetRegionForTeleport(targetLoc);
         worldObject.locationLock.writeLock().lock();
         try {
-            MovementManager.translocate(worldObject, targetLoc, targetRegion);
+            MovementManager.translocate(worldObject, targetLoc);
             if (worldObject.getObjectType().equals(GameObjectType.PlayerCharacter))
                 InterestManager.INTERESTMANAGER.HandleLoadForTeleport((PlayerCharacter) worldObject);
         } catch (Exception e) {
@@ -983,8 +985,25 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
 
     @Override
     public final void setLoc(final Vector3fImmutable value) {
-        super.setLoc(value); // set the location in the world
+        Regions region = Regions.GetRegionForTeleport(value);
+        float regionHeightOffset = 0;
+        if(region != null){
+            this.region = region;
+            regionHeightOffset = region.lerpY(this);
+            this.inBuilding = region.level; // -1 not in building 0 on ground floor, 1 on first floor etc
+            this.inBuildingID = region.parentBuildingID;
+            this.inFloorID = region.room;
+        } else {
+            this.region = null;
+            this.inBuilding = -1;
+            this.inBuildingID = 0;
+            this.inFloorID = -1;
+        }
+        float terrainHeight = Terrain.getWorldHeight(value);
+        Vector3fImmutable finalLocation = new Vector3fImmutable(value.x,terrainHeight + regionHeightOffset, value.z);
+        super.setLoc(finalLocation); // set the location in the world
         this.resetLastSetLocUpdate();
+
     }
 
     public Vector3fImmutable getMovementLoc() {
@@ -1104,6 +1123,7 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     }
 
     public final void setCombatTarget(final AbstractWorldObject value) {
+
         if(this.getObjectTypeMask() == 2050) {//MOB?
             if (value == null) {
                 if (this.isCombat()) {
@@ -1121,7 +1141,9 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
                 }
             }
         }
+
         this.combatTarget = value;
+
     }
 
     public final ConcurrentHashMap<String, JobContainer> getTimers() {
@@ -1238,11 +1260,29 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
                     CombatManager.handleRetaliate(this, attacker);
                 }
 
+                if(this.getObjectType().equals(GameObjectType.Mob)){
+                    //handle hate value addition
+                    Mob target = (Mob)this;
+                    if (attacker.getObjectType().equals(GameObjectType.PlayerCharacter)) {
+                        target.playerAgroMap.put(attacker.getObjectUUID(), target.playerAgroMap.get(attacker.getObjectUUID()) + value);
+                        if (target.isPlayerGuard()){
+                            if(target.guardedCity != null && target.guardedCity.cityOutlaws.contains(attacker.getObjectUUID()) == false)
+                                target.guardedCity.cityOutlaws.add(attacker.getObjectUUID());
+                        }
+                    }
+                } else if(this.getObjectType().equals(GameObjectType.PlayerCharacter)){
+                    City playerCity = ZoneManager.getCityAtLocation(this.loc);
+                    if(playerCity != null){
+                        if(!attacker.getGuild().getNation().equals(playerCity.getGuild().getNation()))
+                            if(!playerCity.getGuild().getNation().getAllyList().contains(attacker.getGuild().getNation()))
+                                if(!playerCity.cityOutlaws.contains(attacker.getObjectUUID()))
+                                    playerCity.cityOutlaws.add(attacker.getObjectUUID());
+                    }
+                }
                 return newHealth - oldHealth;
             } finally {
                 this.healthLock.writeLock().unlock();
             }
-
         } catch (InterruptedException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
@@ -1428,10 +1468,9 @@ public abstract class AbstractCharacter extends AbstractWorldObject {
     }
 
     public void teleport(final Vector3fImmutable targetLoc) {
-        Regions targetRegion = Regions.GetRegionForTeleport(targetLoc);
         locationLock.writeLock().lock();
         try {
-            MovementManager.translocate(this, targetLoc, targetRegion);
+            MovementManager.translocate(this, targetLoc);
             MovementManager.sendRWSSMsg(this);
         } catch (Exception e) {
             Logger.error(e);

src/engine/objects/AbstractIntelligenceAgent.java

@@ -32,7 +32,7 @@ public abstract class AbstractIntelligenceAgent extends AbstractCharacter {
     protected Vector3fImmutable lastBindLoc;
     public boolean assist = false;
     public Enum.AIAgentType agentType = Enum.AIAgentType.MOBILE;
-    public boolean isPlayerGuard = false;
+
     public AbstractCharacter guardCaptain;
     public EnumBitSet<Enum.MonsterType> notEnemy = EnumBitSet.noneOf(Enum.MonsterType.class);
     public EnumBitSet<Enum.MonsterType> enemy = EnumBitSet.noneOf(Enum.MonsterType.class);
@@ -130,7 +130,7 @@ public abstract class AbstractIntelligenceAgent extends AbstractCharacter {
         ArrayList<Zone> allIn = ZoneManager.getAllZonesIn(this.getLoc());
 
         for (Zone zone : allIn)
-            if (zone.getSafeZone() == (byte) 1)
+            if (zone.peace_zone == (byte) 1)
                 return true;
 
         return false;
@@ -163,7 +163,9 @@ public abstract class AbstractIntelligenceAgent extends AbstractCharacter {
                 this.setCombatTarget(null);
             }
 
-            //clear owner
+            // clear owner and set not alive
+
+            this.isAlive.set(false);
 
             PlayerCharacter owner = (PlayerCharacter) this.guardCaptain;
 
@@ -181,7 +183,7 @@ public abstract class AbstractIntelligenceAgent extends AbstractCharacter {
                     owner.setPet(null);
 
                 if (this.getObjectType().equals(GameObjectType.Mob))
-                    ((Mob) this).guardCaptain = null;
+                    this.guardCaptain = null;
             }
 
 

src/engine/objects/AbstractWorldObject.java

@@ -13,7 +13,7 @@ import engine.Enum.DispatchChannel;
 import engine.Enum.EffectSourceType;
 import engine.Enum.GameObjectType;
 import engine.Enum.GridObjectType;
-import engine.InterestManagement.HeightMap;
+import engine.InterestManagement.Terrain;
 import engine.InterestManagement.WorldGrid;
 import engine.job.AbstractScheduleJob;
 import engine.job.JobContainer;
@@ -502,7 +502,13 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
                 return;
             this.lastLoc = new Vector3fImmutable(this.loc);
             this.loc = loc;
-            this.loc = this.loc.setY(HeightMap.getWorldHeight(this) + this.getAltitude());
+
+            if(this instanceof AbstractCharacter && this.region != null){
+                this.loc = this.loc.setY(this.region.lerpY(this) + this.getAltitude());
+            } else{
+                this.loc = this.loc.setY(Terrain.getWorldHeight(this.getLoc()) + this.getAltitude());
+            }
+
 
             //lets not add mob to world grid if he is currently despawned.
             if (this.getObjectType().equals(GameObjectType.Mob) && ((Mob) this).despawned)
@@ -610,9 +616,6 @@ public abstract class AbstractWorldObject extends AbstractGameObject {
         this.movingUp = movingUp;
     }
 
-    public void setRegion(Regions region) {
-        this.region = region;
-    }
 
     //used for interestmanager loading and unloading objects to client.
     // if not in grid, unload from player.

src/engine/objects/Bane.java

@@ -13,7 +13,6 @@ import engine.Enum;
 import engine.Enum.ProtectionState;
 import engine.Enum.SiegePhase;
 import engine.Enum.SiegeResult;
-import engine.InterestManagement.HeightMap;
 import engine.InterestManagement.WorldGrid;
 import engine.db.archive.BaneRecord;
 import engine.db.archive.DataWarehouse;
@@ -135,7 +134,7 @@ public final class Bane {
 
         // Cannot place banestone underwater;
 
-        if (HeightMap.isLocUnderwater(player.getLoc())) {
+        if (ZoneManager.isLocUnderwater(player.getLoc())) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 6, ""); // Cannot place underwater
             return false;
         }
@@ -163,8 +162,8 @@ public final class Bane {
 
         // Cannot place assets on a dead tree
 
-        if ((cityZone.isPlayerCity()) &&
+        if ((cityZone.guild_zone) &&
-                (City.getCity(cityZone.getPlayerCityUUID()).getTOL().getRank() == -1)) {
+                (City.getCity(cityZone.playerCityUUID).getTOL().getRank() == -1)) {
             PlaceAssetMsg.sendPlaceAssetError(origin, 1, "Cannot bane a dead tree!");
             return false;
         }

src/engine/objects/Building.java

@@ -11,8 +11,8 @@ package engine.objects;
 
 import engine.Enum;
 import engine.Enum.*;
-import engine.InterestManagement.HeightMap;
 import engine.InterestManagement.RealmMap;
+import engine.InterestManagement.Terrain;
 import engine.InterestManagement.WorldGrid;
 import engine.db.archive.CityRecord;
 import engine.db.archive.DataWarehouse;
@@ -206,7 +206,7 @@ public class Building extends AbstractWorldObject {
                     // Altitude of this building is derived from the heightmap engine.
 
                     Vector3fImmutable tempLoc = new Vector3fImmutable(this.statLat + this.parentZone.absX, 0, this.statLon + this.parentZone.absZ);
-                    tempLoc = new Vector3fImmutable(tempLoc.x, HeightMap.getWorldHeight(tempLoc), tempLoc.z);
+                    tempLoc = new Vector3fImmutable(tempLoc.x, Terrain.getWorldHeight(tempLoc), tempLoc.z);
                     this.setLoc(tempLoc);
                 }
             }
@@ -446,24 +446,24 @@ public class Building extends AbstractWorldObject {
         if (this.getBlueprint() != null && this.getBlueprint().isSiegeEquip() && this.protectionState.equals(ProtectionState.PROTECTED)) {
             if (this.getGuild() != null) {
                 if (this.getGuild().getOwnedCity() != null) {
-                    if (this.getLoc().isInsideCircle(this.getGuild().getOwnedCity().getLoc(), CityBoundsType.ZONE.extents))
+                    if (this.getLoc().isInsideCircle(this.getGuild().getOwnedCity().getLoc(), CityBoundsType.ZONE.halfExtents))
                         return this.getGuild().getOwnedCity();
                 } else {
                     Bane bane = Bane.getBaneByAttackerGuild(this.getGuild());
 
                     if (bane != null) {
                         if (bane.getCity() != null) {
-                            if (this.getLoc().isInsideCircle(bane.getCity().getLoc(), CityBoundsType.ZONE.extents))
+                            if (this.getLoc().isInsideCircle(bane.getCity().getLoc(), CityBoundsType.ZONE.halfExtents))
                                 return bane.getCity();
                         }
                     }
                 }
             }
         }
-        if (this.parentZone.isPlayerCity() == false)
+        if (this.parentZone.guild_zone == false)
             return null;
 
-        return City.getCity(this.parentZone.getPlayerCityUUID());
+        return City.getCity(this.parentZone.playerCityUUID);
 
     }
 
@@ -537,6 +537,18 @@ public class Building extends AbstractWorldObject {
         if (value < 0)
             Mine.SendMineAttackMessage(this);
 
+        City playerCity = ZoneManager.getCityAtLocation(this.loc);
+        if(playerCity != null){
+            if(this.getGuild().getNation().equals(playerCity.getTOL().getGuild().getNation())){
+                //friendly building has been attacked, add attacker to city outlaw list
+                if(!playerCity.cityOutlaws.contains(attacker.getObjectUUID()) && attacker.getObjectType().equals(GameObjectType.PlayerCharacter))
+                    playerCity.cityOutlaws.add(attacker.getObjectUUID());
+                    for(Mob guard : playerCity.getParent().zoneMobSet)
+                        if(guard.combatTarget == null)
+                            guard.setCombatTarget(attacker);
+            }
+        }
+
         return newHealth - oldHealth;
 
 
@@ -1390,7 +1402,7 @@ public class Building extends AbstractWorldObject {
         // Buildings on an npc citygrid are never vulnerable
 
         if (this.getCity() != null) {
-            if (this.getCity().getParent().isNPCCity() == true)
+            if (this.getCity().getParent().isNPCCity == true)
                 return false;
         }
 

src/engine/objects/CharacterSkill.java

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

src/engine/objects/City.java

@@ -11,7 +11,6 @@ package engine.objects;
 
 import engine.Enum;
 import engine.Enum.*;
-import engine.InterestManagement.HeightMap;
 import engine.InterestManagement.RealmMap;
 import engine.InterestManagement.WorldGrid;
 import engine.db.archive.CityRecord;
@@ -66,9 +65,6 @@ public class City extends AbstractWorldObject {
     private int realmID;
     private int radiusType;
     private float bindRadius;
-    private float statLat;
-    private float statAlt;
-    private float statLon;
     private float bindX;
     private float bindZ;
     private byte isNpc;  //aka Safehold
@@ -77,7 +73,7 @@ public class City extends AbstractWorldObject {
     private boolean forceRename = false;
     private boolean noTeleport = false; //used by npc cities
     private boolean noRepledge = false; //used by npc cities
-    private boolean isOpen = false;
+    private final boolean isOpen = false;
     private int treeOfLifeID;
     private Vector3fImmutable location = Vector3fImmutable.ZERO;
 
@@ -113,10 +109,7 @@ public class City extends AbstractWorldObject {
             if (establishedTimeStamp != null)
                 this.established = java.time.LocalDateTime.ofInstant(establishedTimeStamp.toInstant(), ZoneId.systemDefault());
 
-            this.location = new Vector3fImmutable(rs.getFloat("xCoord"), rs.getFloat("yCoord"), rs.getFloat("zCoord"));
+            this.location = Vector3fImmutable.ZERO;
-            this.statLat = rs.getFloat("xCoord");
-            this.statAlt = rs.getFloat("yCoord");
-            this.statLon = rs.getFloat("zCoord");
 
             java.sql.Timestamp realmTaxTimeStamp = rs.getTimestamp("realmTaxDate");
 
@@ -159,11 +152,6 @@ public class City extends AbstractWorldObject {
                     this.motto = guild.getMotto();
             }
 
-
-            //Disabled till i finish.
-            // this.reverseKOS  = rs.getInt("kos") == 1;
-
-
             Zone zone = ZoneManager.getZoneByUUID(rs.getInt("parent"));
 
             if (zone != null)
@@ -171,18 +159,12 @@ public class City extends AbstractWorldObject {
 
             //npc cities without heightmaps except swampstone are specials.
 
-
             this.realmID = rs.getInt("realmID");
 
         } catch (Exception e) {
             Logger.error(e);
         }
 
-        // *** Refactor: Is this working?  Intended to supress
-        //                login server errors from attempting to
-        //                 load cities/realms along with players
-
-
     }
 
     /*
@@ -208,7 +190,6 @@ public class City extends AbstractWorldObject {
             Logger.error("NULL TOL FOR " + city.cityName);
         }
 
-
         // Assign city owner
 
         if (city.getTOL() != null)
@@ -226,7 +207,8 @@ public class City extends AbstractWorldObject {
 
         rulingNation = rulingGuild.getNation();
 
-        // Begin Serialzing soverign guild data
+        // Begin Serializing sovereign guild data
+
         writer.putInt(city.getObjectType().ordinal());
         writer.putInt(city.getObjectUUID());
         writer.putString(city.cityName);
@@ -281,7 +263,6 @@ public class City extends AbstractWorldObject {
             writer.putInt(rulingNation.getObjectUUID());
         }
 
-
         // Serialize nation name
 
         if (rulingNation.isEmptyGuild())
@@ -303,16 +284,8 @@ public class City extends AbstractWorldObject {
         else
             writer.putString(Guild.GetGL(rulingNation).getFirstName() + ' ' + Guild.GetGL(rulingNation).getLastName());
 
-
         writer.putLocalDateTime(city.established);
 
-//		writer.put((byte) city.established.getDayOfMonth());
-//		writer.put((byte) city.established.minusMonths(1).getMonth().getValue());
-//		writer.putInt((int) years);
-//		writer.put((byte) hours);
-//		writer.put((byte) minutes);
-//		writer.put((byte) seconds);
-
         writer.putFloat(city.location.x);
         writer.putFloat(city.location.y);
         writer.putFloat(city.location.z);
@@ -351,6 +324,7 @@ public class City extends AbstractWorldObject {
         ConcurrentHashMap<Integer, AbstractGameObject> worldCities = DbManager.getMap(Enum.GameObjectType.City);
 
         //add npc cities
+
         for (AbstractGameObject ago : worldCities.values()) {
 
             if (ago.getObjectType().equals(GameObjectType.City)) {
@@ -359,7 +333,7 @@ public class City extends AbstractWorldObject {
                 if (city.noTeleport)
                     continue;
 
-                if (city.parentZone != null && city.parentZone.isPlayerCity()) {
+                if (city.parentZone != null && city.parentZone.guild_zone) {
 
                     if (pc.getAccount().status.equals(AccountStatus.ADMIN)) {
                         cities.add(city);
@@ -367,6 +341,7 @@ public class City extends AbstractWorldObject {
                         //list Player cities
 
                         //open city, just list
+
                         if (city.open && city.getTOL() != null && city.getTOL().getRank() > 4) {
 
                             if (!BuildingManager.IsPlayerHostile(city.getTOL(), pc))
@@ -376,7 +351,9 @@ public class City extends AbstractWorldObject {
 
 
                 } else if (city.isNpc == 1) {
+
                     //list NPC cities
+
                     Guild g = city.getGuild();
                     if (g == null) {
                         if (city.isNpc == 1)
@@ -386,13 +363,9 @@ public class City extends AbstractWorldObject {
                             } else if (pc.getLevel() > 9)
                                 cities.add(city);
 
-                    } else if (pc.getLevel() >= g.getTeleportMin() && pc.getLevel() <= g.getTeleportMax()) {
+                    } else if (pc.getLevel() >= g.getTeleportMin() && pc.getLevel() <= g.getTeleportMax())
-
-
                         cities.add(city);
                 }
-                }
-
 
             }
         }
@@ -400,30 +373,37 @@ public class City extends AbstractWorldObject {
         return cities;
     }
 
-    public static ArrayList<City> getCitiesToRepledgeTo(PlayerCharacter pc) {
+    public static ArrayList<City> getCitiesToRepledgeTo(PlayerCharacter playerCharacter) {
+
         ArrayList<City> cities = new ArrayList<>();
-        if (pc == null)
+
+        if (playerCharacter == null)
             return cities;
-        Guild pcG = pc.getGuild();
+
+        Guild pcG = playerCharacter.getGuild();
 
         ConcurrentHashMap<Integer, AbstractGameObject> worldCities = DbManager.getMap(Enum.GameObjectType.City);
 
         //add npc cities
+
         for (AbstractGameObject ago : worldCities.values()) {
             if (ago.getObjectType().equals(GameObjectType.City)) {
+
                 City city = (City) ago;
+
                 if (city.noRepledge)
                     continue;
 
-                if (city.parentZone != null && city.parentZone.isPlayerCity()) {
+                if (city.parentZone != null && city.parentZone.guild_zone) {
 
                     //list Player cities
                     //open city, just list
-                    if (pc.getAccount().status.equals(AccountStatus.ADMIN)) {
+
+                    if (playerCharacter.getAccount().status.equals(AccountStatus.ADMIN)) {
                         cities.add(city);
                     } else if (city.open && city.getTOL() != null && city.getTOL().getRank() > 4) {
 
-                        if (!BuildingManager.IsPlayerHostile(city.getTOL(), pc))
+                        if (!BuildingManager.IsPlayerHostile(city.getTOL(), playerCharacter))
                             cities.add(city); //verify nation or guild is same
                     } else if (Guild.sameNationExcludeErrant(city.getGuild(), pcG))
                         cities.add(city);
@@ -431,15 +411,16 @@ public class City extends AbstractWorldObject {
                 } else if (city.isNpc == 1) {
                     //list NPC cities
 
-                    Guild g = city.getGuild();
+                    Guild guild = city.getGuild();
-                    if (g == null) {
+
+                    if (guild == null) {
                         if (city.isNpc == 1)
                             if (city.isNoobIsle == 1) {
-                                if (pc.getLevel() < 21)
+                                if (playerCharacter.getLevel() < 21)
                                     cities.add(city);
-                            } else if (pc.getLevel() > 9)
+                            } else if (playerCharacter.getLevel() > 9)
                                 cities.add(city);
-                    } else if (pc.getLevel() >= g.getRepledgeMin() && pc.getLevel() <= g.getRepledgeMax()) {
+                    } else if (playerCharacter.getLevel() >= guild.getRepledgeMin() && playerCharacter.getLevel() <= guild.getRepledgeMax()) {
 
                         cities.add(city);
                     }
@@ -455,6 +436,7 @@ public class City extends AbstractWorldObject {
             return null;
 
         City city = (City) DbManager.getFromCache(Enum.GameObjectType.City, cityId);
+
         if (city != null)
             return city;
 
@@ -471,8 +453,10 @@ public class City extends AbstractWorldObject {
     }
 
     public boolean renameCity(String cityName) {
+
         if (!DbManager.CityQueries.renameCity(this, cityName))
             return false;
+
         if (!DbManager.CityQueries.updateforceRename(this, false))
             return false;
 
@@ -482,17 +466,22 @@ public class City extends AbstractWorldObject {
     }
 
     public boolean updateTOL(Building tol) {
+
         if (tol == null)
             return false;
+
         if (!DbManager.CityQueries.updateTOL(this, tol.getObjectUUID()))
             return false;
+
         this.treeOfLifeID = tol.getObjectUUID();
         return true;
     }
 
     public boolean renameCityForNewPlant(String cityName) {
+
         if (!DbManager.CityQueries.renameCity(this, cityName))
             return false;
+
         if (!DbManager.CityQueries.updateforceRename(this, true))
             return false;
 
@@ -515,19 +504,11 @@ public class City extends AbstractWorldObject {
     }
 
     public Building getTOL() {
+
         if (this.treeOfLifeID == 0)
             return null;
 
         return BuildingManager.getBuildingFromCache(this.treeOfLifeID);
-
-    }
-
-    public int getIsNoobIsle() {
-        return isNoobIsle;
-    }
-
-    public int getPopulation() {
-        return population;
     }
 
     /**
@@ -557,14 +538,6 @@ public class City extends AbstractWorldObject {
             Logger.error("Error when writing to database for cityUUID: " + this.getObjectUUID());
     }
 
-    public float getLatitude() {
-        return this.location.x;
-    }
-
-    public float getLongitude() {
-        return this.location.z;
-    }
-
     public float getAltitude() {
         return this.location.y;
     }
@@ -574,34 +547,10 @@ public class City extends AbstractWorldObject {
         return this.location;
     }
 
-    public byte getIsNpcOwned() {
-        return isNpc;
-    }
-
-    public byte getIsSafeHold() {
-        return this.isSafeHold;
-    }
-
     public boolean isSafeHold() {
         return (this.isSafeHold == (byte) 1);
     }
 
-    public byte getIsCapital() {
-        return isCapital;
-    }
-
-    public void setIsCapital(boolean state) {
-        this.isCapital = (state) ? (byte) 1 : (byte) 0;
-    }
-
-    public int getRadiusType() {
-        return this.radiusType;
-    }
-
-    public float getBindRadius() {
-        return this.bindRadius;
-    }
-
     public int getRank() {
         return (this.getTOL() == null) ? 0 : this.getTOL().getRank();
     }
@@ -624,7 +573,7 @@ public class City extends AbstractWorldObject {
 
 
             this.parentZone = zone;
-            this.location = new Vector3fImmutable(zone.absX + statLat, zone.absY + statAlt, zone.absZ + statLon);
+            this.location = new Vector3fImmutable(zone.absX, zone.absY, zone.absZ);
             this.bindLoc = new Vector3fImmutable(this.location.x + this.bindX,
                     this.location.y,
                     this.location.z + this.bindZ);
@@ -633,28 +582,15 @@ public class City extends AbstractWorldObject {
 
             Bounds cityBounds = Bounds.borrow();
             cityBounds.setBounds(new Vector2f(this.location.x + 64, this.location.z + 64), // location x and z are offset by 64 from the center of the city.
-                    new Vector2f(Enum.CityBoundsType.GRID.extents, Enum.CityBoundsType.GRID.extents),
+                    new Vector2f(Enum.CityBoundsType.GRID.halfExtents, Enum.CityBoundsType.GRID.halfExtents),
                     0.0f);
             this.setBounds(cityBounds);
 
-            if (zone.getHeightMap() == null && this.isNpc == 1 && this.getObjectUUID() != 1213) {
-                HeightMap.GenerateCustomHeightMap(zone);
-                Logger.info(zone.getName() + " created custom heightmap");
-            }
         } catch (Exception e) {
             Logger.error(e);
         }
     }
 
-    public boolean isCityZone(Zone zone) {
-
-        if (zone == null || this.parentZone == null)
-            return false;
-
-        return zone.getObjectUUID() == this.parentZone.getObjectUUID();
-
-    }
-
     public AbstractCharacter getOwner() {
 
         if (this.getTOL() == null)
@@ -676,13 +612,13 @@ public class City extends AbstractWorldObject {
         if (this.getTOL() == null)
             return null;
 
-
         if (this.isNpc == 1) {
 
             if (this.getTOL().getOwner() == null)
                 return null;
             return this.getTOL().getOwner().getGuild();
         } else {
+
             if (this.getTOL().getOwner() == null)
                 return null;
             return this.getTOL().getOwner().getGuild();
@@ -690,13 +626,16 @@ public class City extends AbstractWorldObject {
     }
 
     public boolean openCity(boolean open) {
+
         if (!DbManager.CityQueries.updateOpenCity(this, open))
             return false;
+
         this.open = open;
         return true;
     }
 
     public Vector3fImmutable getBindLoc() {
+
         Vector3fImmutable treeLoc = null;
 
         if (this.getTOL() != null && this.getTOL().getRank() == 8)
@@ -706,7 +645,9 @@ public class City extends AbstractWorldObject {
             return treeLoc;
 
         if (this.radiusType == 1 && this.bindRadius > 0f) {
+
             //square radius
+
             float x = this.bindLoc.getX();
             float z = this.bindLoc.getZ();
             float offset = ((ThreadLocalRandom.current().nextFloat() * 2) - 1) * this.bindRadius;
@@ -827,7 +768,6 @@ public class City extends AbstractWorldObject {
         try {
             this.getTOL().addEffectBit((1 << 16));
             this.getBane().getStone().addEffectBit((1 << 19));
-            ;
         } catch (Exception e) {
             Logger.info("Failed ao add bane effects on city." + e.getMessage());
         }
@@ -846,12 +786,13 @@ public class City extends AbstractWorldObject {
         // Any players currently in the zone will not be processed by the heartbeat
         // if it's not the first effect toggled so we do it here manually
 
-        currentPlayers = WorldGrid.getObjectsInRangePartial(this.location, this.parentZone.getBounds().getHalfExtents().x * 1.2f, MBServerStatics.MASK_PLAYER);
+        currentPlayers = WorldGrid.getObjectsInRangePartial(this.location, this.parentZone.bounds.getHalfExtents().x * 1.2f, MBServerStatics.MASK_PLAYER);
 
         for (AbstractWorldObject playerObject : currentPlayers) {
 
             if (playerObject == null)
                 continue;
+
             if (!this.isLocationWithinSiegeBounds(playerObject.getLoc()))
                 continue;
 
@@ -868,7 +809,6 @@ public class City extends AbstractWorldObject {
 
         // Remove the city effect from the ago's internal collection
 
-        if (this.getEffects().containsKey(Integer.toString(effectBase.getUUID())))
         this.getEffects().remove(Integer.toString(effectBase.getUUID()));
 
         // Any players currently in the zone will not be processed by the heartbeat
@@ -878,6 +818,7 @@ public class City extends AbstractWorldObject {
         for (Integer playerID : this._playerMemory) {
 
             player = PlayerCharacter.getFromCache(playerID);
+
             if (player == null)
                 continue;
 
@@ -893,8 +834,10 @@ public class City extends AbstractWorldObject {
     }
 
     public Warehouse getWarehouse() {
+
         if (this.warehouseBuildingID == 0)
             return null;
+
         return Warehouse.warehouseByBuildingUUID.get(this.warehouseBuildingID);
     }
 
@@ -921,12 +864,12 @@ public class City extends AbstractWorldObject {
 
     public boolean isLocationWithinSiegeBounds(Vector3fImmutable insideLoc) {
 
-        return insideLoc.isInsideCircle(this.getLoc(), CityBoundsType.ZONE.extents);
+        return insideLoc.isInsideCircle(this.getLoc(), CityBoundsType.ZONE.halfExtents);
 
     }
 
     public boolean isLocationOnCityZone(Vector3fImmutable insideLoc) {
-        return Bounds.collide(insideLoc, this.parentZone.getBounds());
+        return Bounds.collide(insideLoc, this.parentZone.bounds);
     }
 
     private void applyAllCityEffects(PlayerCharacter player) {
@@ -986,7 +929,7 @@ public class City extends AbstractWorldObject {
 
         // Gather current list of players within the zone bounds
 
-        currentPlayers = WorldGrid.getObjectsInRangePartial(this.location, CityBoundsType.ZONE.extents, MBServerStatics.MASK_PLAYER);
+        currentPlayers = WorldGrid.getObjectsInRangePartial(this.location, CityBoundsType.ZONE.halfExtents, MBServerStatics.MASK_PLAYER);
         currentMemory = new HashSet<>();
 
         for (AbstractWorldObject playerObject : currentPlayers) {
@@ -1066,7 +1009,6 @@ public class City extends AbstractWorldObject {
 
         _playerMemory.removeAll(toRemove);
         for (Integer removalUUID : toRemove) {
-            if (this.cityOutlaws.contains(removalUUID))
             this.cityOutlaws.remove(removalUUID);
         }
     }
@@ -1083,7 +1025,7 @@ public class City extends AbstractWorldObject {
 
         Thread destroyCityThread = new Thread(new DestroyCityThread(this));
 
-        destroyCityThread.setName("deestroyCity:" + this.getName());
+        destroyCityThread.setName("destroyCity:" + this.getName());
         destroyCityThread.start();
     }
 
@@ -1168,6 +1110,7 @@ public class City extends AbstractWorldObject {
 
             // All protection contracts are void upon transfer of a city
             //Dont forget to not Flip protection on Banestones and siege Equipment... Noob.
+
             if (cityBuilding.getBlueprint() != null && !cityBuilding.getBlueprint().isSiegeEquip()
                     && cityBuilding.getBlueprint().getBuildingGroup() != BuildingGroup.BANESTONE)
                 cityBuilding.setProtectionState(ProtectionState.NONE);
@@ -1199,7 +1142,6 @@ public class City extends AbstractWorldObject {
         Zone cityZone;
         sourceGuild = sourcePlayer.getGuild();
 
-
         if (sourceGuild == null)
             return false;
 
@@ -1255,14 +1197,6 @@ public class City extends AbstractWorldObject {
         this.forceRename = forceRename;
     }
 
-    public boolean isReverseKOS() {
-        return reverseKOS;
-    }
-
-    public void setReverseKOS(boolean reverseKOS) {
-        this.reverseKOS = reverseKOS;
-    }
-
     public String getHash() {
         return hash;
     }
@@ -1290,26 +1224,6 @@ public class City extends AbstractWorldObject {
 
     }
 
-    //TODO use this for taxing later.
-//	public boolean isAfterTaxPeriod(LocalDateTime dateTime,PlayerCharacter player){
-//		if (dateTime.isBefore(realmTaxDate)){
-//			String wait = "";
-//			float hours = 1000*60*60;
-//			float seconds = 1000;
-//			float hoursUntil = realmTaxDate.minus(dateTime.get).getMillis() /hours;
-//			int secondsUntil = (int) (realmTaxDate.minus(dateTime.getMillis()).getMillis() /seconds);
-//			if (hoursUntil < 1)
-//				wait = "You must wait " + secondsUntil + " seconds before taxing this city again!";
-//			else
-//				wait = "You must wait " + hoursUntil + " hours before taxing this city again!";
-//			ErrorPopupMsg.sendErrorMsg(player, wait);
-//			return false;
-//		}
-//
-//		return true;
-//	}
-
-
     public synchronized boolean TaxWarehouse(TaxResourcesMsg msg, PlayerCharacter player) {
 
         // Member variable declaration
@@ -1322,12 +1236,12 @@ public class City extends AbstractWorldObject {
         }
 
         City city = building.getCity();
+
         if (city == null) {
             ErrorPopupMsg.sendErrorMsg(player, "This building does not belong to a city.");
             return true;
         }
 
-
         if (playerGuild == null || playerGuild.isEmptyGuild()) {
             ErrorPopupMsg.sendErrorMsg(player, "You must belong to a guild to do that!");
             return true;
@@ -1352,6 +1266,7 @@ public class City extends AbstractWorldObject {
             ErrorPopupMsg.sendErrorMsg(player, "Cannot find realm for your city!");
             return true;
         }
+
         Realm targetRealm = RealmMap.getRealmForCity(city);
 
         if (targetRealm == null) {
@@ -1380,31 +1295,32 @@ public class City extends AbstractWorldObject {
             return true;
         }
 
-
         if (this.realmTaxDate.isAfter(LocalDateTime.now()))
             return true;
+
         if (msg.getResources().size() == 0)
             return true;
 
         if (city.getWarehouse() == null)
             return true;
+
         Warehouse ruledWarehouse = playerGuild.getOwnedCity().getWarehouse();
+
         if (ruledWarehouse == null)
             return true;
 
-
         ItemBase.getItemHashIDMap();
 
         ArrayList<Integer> resources = new ArrayList<>();
 
         float taxPercent = msg.getTaxPercent();
+
         if (taxPercent > 20)
             taxPercent = .20f;
 
         for (int resourceHash : msg.getResources().keySet()) {
             if (ItemBase.getItemHashIDMap().get(resourceHash) != null)
                 resources.add(ItemBase.getItemHashIDMap().get(resourceHash));
-
         }
 
         for (Integer itemBaseID : resources) {
@@ -1422,6 +1338,7 @@ public class City extends AbstractWorldObject {
             ErrorPopupMsg.sendErrorMsg(player, "Failed to Update next Tax Date due to internal Error. City was not charged taxes this time.");
             return false;
         }
+
         try {
             city.getWarehouse().transferResources(player, msg, resources, taxPercent, ruledWarehouse);
         } catch (Exception e) {
@@ -1439,6 +1356,5 @@ public class City extends AbstractWorldObject {
         dispatch = Dispatch.borrow(player, msg);
         DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
         return true;
-
     }
 }

src/engine/objects/ItemBase.java

@@ -914,4 +914,21 @@ public class ItemBase {
     public void setAutoID(boolean autoID) {
         this.autoID = autoID;
     }
+
+    public boolean isArmor(){
+
+        if(this.isHeavyArmor())
+            return true;
+
+        if(this.isMediumArmor())
+            return true;
+
+        if(this.isLightArmor())
+            return true;
+
+        if(this.isClothArmor())
+            return true;
+
+    return false;
+    }
 }

src/engine/objects/ItemFactory.java

@@ -104,7 +104,7 @@ public class ItemFactory {
         if (zone == null)
             return null;
 
-        City city = City.getCity(zone.getPlayerCityUUID());
+        City city = City.getCity(zone.playerCityUUID);
 
         if (city == null)
             return null;
@@ -796,7 +796,7 @@ public class ItemFactory {
         if (zone == null)
             return null;
 
-        City city = City.getCity(zone.getPlayerCityUUID());
+        City city = City.getCity(zone.playerCityUUID);
 
         if (city == null)
             return null;

src/engine/objects/Mine.java

@@ -64,7 +64,7 @@ public class Mine extends AbstractGameObject {
         this.flags = rs.getInt("flags");
         int parent = rs.getInt("parent");
         this.parentZone = ZoneManager.getZoneByUUID(parent);
-        this.zoneName = this.parentZone.getParent().getName();
+        this.zoneName = this.parentZone.parent.zoneName;
 
         this.owningGuild = Guild.getGuild(ownerUID);
         Guild nation = null;
@@ -129,7 +129,7 @@ public class Mine extends AbstractGameObject {
 
         mine.getTimestamps().put("MineAttack", System.currentTimeMillis() + MBServerStatics.ONE_MINUTE);
 
-        ChatManager.chatNationInfo(mine.getGuild().getNation(), mine.getName() + " in " + mine.getParentZone().getParent().getName() + " is Under attack!");
+        ChatManager.chatNationInfo(mine.getGuild().getNation(), mine.getName() + " in " + mine.getParentZone().parent.zoneName + " is Under attack!");
     }
 
     public static void loadAllMines() {

src/engine/objects/Mob.java

@@ -25,15 +25,14 @@ import engine.net.Dispatch;
 import engine.net.DispatchMessage;
 import engine.net.client.msg.PetMsg;
 import engine.net.client.msg.PlaceAssetMsg;
-import engine.powers.MobPowerEntry;
 import engine.server.MBServerStatics;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.EnumSet;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
@@ -51,7 +50,6 @@ public class Mob extends AbstractIntelligenceAgent {
     public ReentrantReadWriteLock minionLock = new ReentrantReadWriteLock();
     public boolean despawned = false;
     public Vector3fImmutable destination = Vector3fImmutable.ZERO;
-    public LinkedHashMap<Integer, Integer> mobPowers = new LinkedHashMap<>();
     public MobBase mobBase;
     public int spawnTime;
     public Zone parentZone;
@@ -65,15 +63,13 @@ public class Mob extends AbstractIntelligenceAgent {
     public float spawnRadius;
     //used by static mobs
     public int parentZoneUUID;
-    protected int dbID; //the database ID
-
-    private int currentID;
-
     //TODO implement feared object system
     public AbstractWorldObject fearedObject = null;
+    protected int dbID; //the database ID
+    private int currentID;
     private long lastAttackTime = 0;
     private int lastMobPowerToken = 0;
-    private HashMap<Integer, MobEquipment> equip = null;
+    public HashMap<Integer, MobEquipment> equip = null;
     private DeferredPowerJob weaponPower;
     private DateTime upgradeDateTime = null;
     private boolean lootSync = false;
@@ -105,6 +101,7 @@ public class Mob extends AbstractIntelligenceAgent {
             this.dbID = rs.getInt(1);
             this.loadID = rs.getInt("mob_mobbaseID");
             this.gridObjectType = GridObjectType.DYNAMIC;
+            this.agentType = AIAgentType.MOBILE;
 
             this.spawnRadius = rs.getFloat("mob_spawnRadius");
             this.spawnTime = rs.getInt("mob_spawnTime");
@@ -153,7 +150,6 @@ public class Mob extends AbstractIntelligenceAgent {
 
             this.currentID = this.dbID;
 
-            this.agentType = AIAgentType.MOBILE;
         } catch (Exception e) {
             Logger.error(e + " " + this.dbID);
         }
@@ -183,7 +179,7 @@ public class Mob extends AbstractIntelligenceAgent {
         } else if (tid == 100962 || tid == 100965) { //Spydraxxx the Mighty, Denigo Tantric
             writer.putInt(2);
             serializeRune(mob, writer, 5, GameObjectType.NPCClassRuneTwo.ordinal(), 252621); //guard rune
-        } else if (mob.contract != null || mob.isPlayerGuard) {
+        } else if (mob.contract != null || mob.isPlayerGuard()) {
             writer.putInt(3);
             serializeRune(mob, writer, 3, GameObjectType.NPCClassRuneTwo.ordinal(), MobBase.GetClassType(mob.getMobBaseID())); //warrior class
             serializeRune(mob, writer, 5, GameObjectType.NPCClassRuneThree.ordinal(), 252621); //guard rune
@@ -316,13 +312,13 @@ public class Mob extends AbstractIntelligenceAgent {
             writer.put((byte) 1);
 
 
-            if ((PlayerCharacter) mob.guardCaptain != null) {
+            if (mob.guardCaptain != null) {
 
 
-                writer.putInt(((PlayerCharacter) mob.guardCaptain).getObjectType().ordinal());
+                writer.putInt(mob.guardCaptain.getObjectType().ordinal());
 
 
-                writer.putInt(((PlayerCharacter) mob.guardCaptain).getObjectUUID());
+                writer.putInt(mob.guardCaptain.getObjectUUID());
             } else {
                 writer.putInt(0); //ownerType
                 writer.putInt(0); //ownerID
@@ -340,7 +336,7 @@ public class Mob extends AbstractIntelligenceAgent {
         writer.putInt(0);
         writer.putInt(0);
 
-        if (!mob.isAlive() && !mob.isPet() && !mob.isNecroPet() && !mob.behaviourType.equals(MobBehaviourType.SiegeEngine) && !mob.isPlayerGuard) {
+        if (!mob.isAlive() && !mob.isPet() && !mob.isNecroPet() && !mob.behaviourType.equals(MobBehaviourType.SiegeEngine) && !mob.isPlayerGuard()) {
             writer.putInt(0);
             writer.putInt(0);
         }
@@ -401,10 +397,13 @@ public class Mob extends AbstractIntelligenceAgent {
         writer.putInt(mob.currentID);
     }
 
-    public static Mob createMob(int loadID, Vector3fImmutable spawn, Guild guild, Zone parent, Building building, Contract contract, String pirateName, int level) {
+    public static Mob createMob(int loadID, Vector3fImmutable spawn, Guild guild, Zone parent, Building building, Contract contract, String pirateName, int level, AIAgentType mobType) {
 
         Mob mobile = new Mob();
         mobile.dbID = MBServerStatics.NO_DB_ROW_ASSIGNED_YET;
+        //mobile.agentType = AIAgentType.MOBILE; this method is only called to make guard captains and wall archers
+        mobile.agentType = mobType;
+        mobile.behaviourType = MobBehaviourType.None;
         mobile.loadID = loadID;
         mobile.level = (short) level;
 
@@ -428,18 +427,8 @@ public class Mob extends AbstractIntelligenceAgent {
         else
             mobile.contractUUID = contract.getContractID();
 
-        Mob mob;
 
-        mobile.agentType = AIAgentType.GUARD;
+        return mobile;
-        try {
-            mob = DbManager.MobQueries.PERSIST(mobile);
-
-        } catch (Exception e) {
-            Logger.error("SQLException:" + e.getMessage());
-            mob = null;
-        }
-
-        return mob;
     }
 
     public static synchronized Mob createGuardMinion(Mob guardCaptain, short level, String minionName) {
@@ -463,8 +452,7 @@ public class Mob extends AbstractIntelligenceAgent {
         minionMobile.guardCaptain = guardCaptain;
         minionMobile.spawnTime = (int) (-2.500 * guardCaptain.building.getRank() + 22.5) * 60;
         minionMobile.behaviourType = Enum.MobBehaviourType.GuardMinion;
-        minionMobile.agentType = AIAgentType.GUARD;
+        minionMobile.agentType = AIAgentType.GUARDMINION;
-        minionMobile.isPlayerGuard = true;
         minionMobile.guardedCity = guardCaptain.guardedCity;
         minionMobile.patrolPoints = guardCaptain.building.patrolPoints;
 
@@ -499,8 +487,7 @@ public class Mob extends AbstractIntelligenceAgent {
         minionMobile.setLoc(minionMobile.bindLoc);
         minionMobile.despawn();
 
-        int slot = guardCaptain.siegeMinionMap.size() + 1;
+        guardCaptain.minions.add(minionMobile.getObjectUUID());
-        guardCaptain.siegeMinionMap.put(minionMobile, slot);
 
         return minionMobile;
     }
@@ -530,8 +517,7 @@ public class Mob extends AbstractIntelligenceAgent {
         siegeMinion.setLoc(siegeMinion.bindLoc);
         siegeMinion.despawn();
 
-        int slot = artyCaptain.siegeMinionMap.size() + 1;
+        artyCaptain.minions.add(siegeMinion.getObjectUUID());
-        artyCaptain.siegeMinionMap.put(siegeMinion, slot);
 
         return siegeMinion;
     }
@@ -566,20 +552,22 @@ public class Mob extends AbstractIntelligenceAgent {
 
         return petMinion;
     }
+
     public static Mob getMob(int id) {
 
         if (id == 0)
             return null;
 
         Mob mob = (Mob) DbManager.getFromCache(GameObjectType.Mob, id);
+
         if (mob != null)
             return mob;
+
         return DbManager.MobQueries.GET_MOB(id);
     }
 
     public static Mob getFromCache(int id) {
 
-
         return (Mob) DbManager.getFromCache(GameObjectType.Mob, id);
     }
 
@@ -636,7 +624,6 @@ public class Mob extends AbstractIntelligenceAgent {
         mob.upgradeDateTime = upgradeDateTime;
     }
 
-
     /*
      * Getters
      */
@@ -662,10 +649,6 @@ public class Mob extends AbstractIntelligenceAgent {
         return this.spawnRadius;
     }
 
-    public void setSpawnTime(int value) {
-        this.spawnTime = value;
-    }
-
     public String getSpawnTimeAsString() {
         if (this.spawnTime == 0)
             return MBServerStatics.DEFAULT_SPAWN_TIME_MS / 1000 + " seconds (Default)";
@@ -680,11 +663,7 @@ public class Mob extends AbstractIntelligenceAgent {
     }
 
     public int getMobBaseID() {
-
-        if (this.mobBase != null)
         return this.mobBase.getObjectUUID();
-
-        return 0;
     }
 
     public Vector3fImmutable getTrueBindLoc() {
@@ -708,7 +687,7 @@ public class Mob extends AbstractIntelligenceAgent {
     public Vector3fImmutable getBindLoc() {
 
         if (this.isPet() && !this.behaviourType.equals(MobBehaviourType.SiegeEngine))
-            return (PlayerCharacter) this.guardCaptain != null ? ((PlayerCharacter) this.guardCaptain).getLoc() : this.getLoc();
+            return this.guardCaptain != null ? this.guardCaptain.getLoc() : this.getLoc();
         else
             return this.bindLoc;
     }
@@ -737,8 +716,6 @@ public class Mob extends AbstractIntelligenceAgent {
             conVal *= (1 + this.bonuses.getFloatPercentAll(ModType.Attr, SourceType.Constitution));
             intVal *= (1 + this.bonuses.getFloatPercentAll(ModType.Attr, SourceType.Intelligence));
             spiVal *= (1 + this.bonuses.getFloatPercentAll(ModType.Attr, SourceType.Spirit));
-        } else {
-            // apply dex penalty for armor
         }
 
         // Set current stats
@@ -757,7 +734,7 @@ public class Mob extends AbstractIntelligenceAgent {
             // get rune and effect bonuses
             bonus *= (1 + this.bonuses.getFloatPercentAll(ModType.Speed, SourceType.None));
 
-        if (this.isPlayerGuard)
+        if (this.isPlayerGuard())
             switch (this.mobBase.getLoadID()) {
                 case 2111:
                     if (this.isWalk())
@@ -825,7 +802,7 @@ public class Mob extends AbstractIntelligenceAgent {
                 Group g = GroupManager.getGroup((PlayerCharacter) attacker);
 
                 // Give XP, now handled inside the Experience Object
-                if (!this.isPet() && !this.isNecroPet() && !(this.agentType.equals(AIAgentType.PET)) && !this.isPlayerGuard)
+                if (!this.isPet() && !this.isNecroPet() && !(this.agentType.equals(AIAgentType.PET)) && !this.isPlayerGuard())
                     Experience.doExperience((PlayerCharacter) attacker, this, g);
             } else if (attacker.getObjectType().equals(GameObjectType.Mob)) {
                 Mob mobAttacker = (Mob) attacker;
@@ -836,7 +813,7 @@ public class Mob extends AbstractIntelligenceAgent {
                     PlayerCharacter owner = (PlayerCharacter) mobAttacker.guardCaptain;
 
                     if (owner != null)
-                        if (!this.isPet() && !this.isNecroPet() && !(this.agentType.equals(AIAgentType.PET)) && !this.isPlayerGuard) {
+                        if (!this.isPet() && !this.isNecroPet() && !(this.agentType.equals(AIAgentType.PET)) && !this.isPlayerGuard()) {
                             Group g = GroupManager.getGroup(owner);
 
                             // Give XP, now handled inside the Experience Object
@@ -864,13 +841,11 @@ public class Mob extends AbstractIntelligenceAgent {
 
         if (newLoc.equals(this.getEndLoc())) {
             this.stopMovement(newLoc);
-            this.region = AbstractWorldObject.GetRegionByWorldObject(this);
             return;
             //Next upda
         }
 
         setLoc(newLoc);
-        this.region = AbstractWorldObject.GetRegionByWorldObject(this);
         //Next update will be end Loc, lets stop him here.
 
     }
@@ -922,7 +897,7 @@ public class Mob extends AbstractIntelligenceAgent {
 
                 this.setCombatTarget(null);
                 this.hasLoot = false;
-                ZoneManager.getSeaFloor().zoneMobSet.remove(this);
+                ZoneManager.seaFloor.zoneMobSet.remove(this);
 
                 try {
                     this.clearEffects();
@@ -950,7 +925,7 @@ public class Mob extends AbstractIntelligenceAgent {
 
                 playerAgroMap.clear();
 
-                if (!this.isPlayerGuard && this.equip != null)
+                if (!this.isPlayerGuard() && this.equip != null)
                     LootManager.GenerateEquipmentDrop(this);
 
             }
@@ -987,18 +962,15 @@ public class Mob extends AbstractIntelligenceAgent {
         this.setLoc(this.lastBindLoc);
         this.stopMovement(this.lastBindLoc);
 
-        NPCManager.applyRuneSetEffects(this);
+        NPCManager.applyMobbaseEffects(this);
 
         this.recalculateStats();
         this.setHealth(this.healthMax);
 
         if (this.building == null && this.guardCaptain != null && ((Mob) this.guardCaptain).behaviourType.equals(MobBehaviourType.GuardCaptain))
             this.building = this.guardCaptain.building;
-        else if (this.building != null)
-            this.region = BuildingManager.GetRegion(this.building, bindLoc.x, bindLoc.y, bindLoc.z);
 
-        if (!this.behaviourType.equals(MobBehaviourType.SiegeEngine) && !this.isPlayerGuard && contract == null)
+        this.loadInventory();
-            loadInventory();
 
         this.updateLocation();
     }
@@ -1036,7 +1008,9 @@ public class Mob extends AbstractIntelligenceAgent {
         this.charItemManager.clearInventory();
         this.charItemManager.clearEquip();
 
-        if (isPlayerGuard)
+        // Only generate loot for mobiles
+
+        if (!this.agentType.equals(AIAgentType.MOBILE))
             return;
 
         LootManager.GenerateMobLoot(this);
@@ -1052,12 +1026,13 @@ public class Mob extends AbstractIntelligenceAgent {
     }
 
     public void recalculateStats() {
-
+        if(this.isPlayerGuard()){
-        try {
+            NPCManager.setMaxHealthForGuard(this);
-            calculateModifiedStats();
+            NPCManager.setAttackRatingForGuard(this);
-        } catch (Exception e) {
+            NPCManager.setDefenseForGuard(this);
-            Logger.error(e.getMessage());
+            NPCManager.setDamageAndSpeedForGuard(this);
-        }
+            NPCManager.applyGuardStanceModifiers(this);
+        }else {
 
             try {
                 calculateAtrDefenseDamage();
@@ -1069,7 +1044,14 @@ public class Mob extends AbstractIntelligenceAgent {
             } catch (Exception e) {
                 Logger.error(e.getMessage());
             }
-
+        }
+        try {
+            calculateModifiedStats();
+        } catch (Exception e) {
+            Logger.error(e.getMessage());
+        }
+        if(this.isSiege())
+            this.healthMax = 10000;
         Resists.calculateResists(this);
     }
 
@@ -1138,14 +1120,34 @@ public class Mob extends AbstractIntelligenceAgent {
             this.defenseRating = 0;
             return;
         }
+        this.atrHandOne = (short) this.mobBase.getAttackRating();
+        this.minDamageHandOne = (short) this.mobBase.getDamageMin();
+        this.maxDamageHandOne = (short) this.mobBase.getDamageMax();
+        this.rangeHandOne = 6.5f;
+        this.speedHandOne = 20;
+
+        this.atrHandTwo = (short) this.mobBase.getAttackRating();
+        this.minDamageHandTwo = (short) this.mobBase.getDamageMin();
+        this.maxDamageHandTwo = (short) this.mobBase.getDamageMax();
+        this.rangeHandTwo = 6.5f;
+        this.speedHandTwo = 20;
+
+        if(this.equip.get(MBServerStatics.SLOT_MAINHAND) != null){
+            //has mainhand weapon to calculate
+            calculateAtrDamageForWeapon(this.equip.get(MBServerStatics.SLOT_MAINHAND), true);
+        }
+        if(this.equip.get(MBServerStatics.SLOT_OFFHAND) != null && !this.equip.get(MBServerStatics.SLOT_OFFHAND).getItemBase().isShield()){
+            //has offhand weapon to calculate
+            calculateAtrDamageForWeapon(this.equip.get(MBServerStatics.SLOT_OFFHAND), false);
+        }
 
         try {
             calculateAtrDamageForWeapon(this.equip.get(MBServerStatics.SLOT_MAINHAND), true);
         } catch (Exception e) {
 
             this.atrHandOne = (short) this.mobBase.getAttackRating();
-            this.minDamageHandOne = (short) this.mobBase.getMinDmg();
+            this.minDamageHandOne = (short) this.mobBase.getDamageMin();
-            this.maxDamageHandOne = (short) this.mobBase.getMaxDmg();
+            this.maxDamageHandOne = (short) this.mobBase.getDamageMax();
             this.rangeHandOne = 6.5f;
             this.speedHandOne = 20;
             Logger.info("Mobbase ID " + this.getMobBaseID() + " returned an error. setting to default ATR and Damage." + e.getMessage());
@@ -1157,8 +1159,8 @@ public class Mob extends AbstractIntelligenceAgent {
         } catch (Exception e) {
 
             this.atrHandTwo = (short) this.mobBase.getAttackRating();
-            this.minDamageHandTwo = (short) this.mobBase.getMinDmg();
+            this.minDamageHandTwo = (short) this.mobBase.getDamageMin();
-            this.maxDamageHandTwo = (short) this.mobBase.getMaxDmg();
+            this.maxDamageHandTwo = (short) this.mobBase.getDamageMax();
             this.rangeHandTwo = 6.5f;
             this.speedHandTwo = 20;
             Logger.info("Mobbase ID " + this.getMobBaseID() + " returned an error. setting to default ATR and Damage." + e.getMessage());
@@ -1202,7 +1204,7 @@ public class Mob extends AbstractIntelligenceAgent {
             this.defenseRating = (short) (defense + 0.5f);
         } catch (Exception e) {
             Logger.info("Mobbase ID " + this.getMobBaseID() + " returned an error. Setting to Default Defense." + e.getMessage());
-            this.defenseRating = (short) this.mobBase.getDefense();
+            this.defenseRating = (short) this.mobBase.getDefenseRating();
         }
         // calculate defense for equipment
     }
@@ -1353,8 +1355,8 @@ public class Mob extends AbstractIntelligenceAgent {
                 mastDam = masteryPercentage;
 
             // TODO Correct these
-            min = this.mobBase.getMinDmg();
+            min = this.mobBase.getDamageMin();
-            max = this.mobBase.getMaxDmg();
+            max = this.mobBase.getDamageMax();
         } else {
 
             if (mainHand)
@@ -1529,49 +1531,33 @@ public class Mob extends AbstractIntelligenceAgent {
     @Override
     public void runAfterLoad() {
 
-        this.charItemManager = new CharacterItemManager(this);
+        this.setObjectTypeMask(MBServerStatics.MASK_MOB | this.getTypeMasks());
 
         if (ConfigManager.serverType.equals(ServerType.LOGINSERVER))
             return;
 
-        this.mobBase = MobBase.getMobBase(loadID);
+        this.charItemManager = new CharacterItemManager(this);
 
-        this.setObjectTypeMask(MBServerStatics.MASK_MOB | this.getTypeMasks());
+        this.mobBase = MobBase.getMobBase(loadID);
 
         this.building = BuildingManager.getBuilding(this.buildingUUID);
 
-        if (this.contractUUID == 0)
+        // Configure AI related values
-            this.contract = null;
-        else
-            this.contract = DbManager.ContractQueries.GET_CONTRACT(this.contractUUID);
 
-        // Setup mobile AI and equipset for contract
+        switch (this.behaviourType) {
-
+            case GuardCaptain:
-        if (this.contract != null) {
+                this.agentType = AIAgentType.GUARDCAPTAIN;
-
+                this.spawnTime = 600;
-            this.equipmentSetID = this.contract.getEquipmentSet();
-
-            // Load AI for guard captains
-
-            if (NPC.ISGuardCaptain(contract.getContractID()) || this.contract.getContractID() == 910) {  // Guard Dog
-                this.behaviourType = MobBehaviourType.GuardCaptain;
-                this.spawnTime = 60 * 15;
-                this.isPlayerGuard = true;
                 this.guardedCity = ZoneManager.getCityAtLocation(this.building.getLoc());
-            }
+                break;
-
+            case GuardWallArcher:
-            // Load AI for wall archers
+                this.agentType = AIAgentType.GUARDWALLARCHER;
-
-            if (NPC.ISWallArcher(this.contract)) {
-                this.gridObjectType = GridObjectType.DYNAMIC;
-                this.behaviourType = MobBehaviourType.GuardWallArcher;
-                this.isPlayerGuard = true;
                 this.spawnTime = 450;
                 this.guardedCity = ZoneManager.getCityAtLocation(this.building.getLoc());
-            }
+                break;
         }
 
-        // Default to the mobbase for AI if nothing is hte mob field to override.
+        // Default to the mobbase for AI if nothing is in mob field to override.
 
         if (this.behaviourType == null || this.behaviourType.equals(MobBehaviourType.None))
             this.behaviourType = this.getMobBase().fsm;
@@ -1579,6 +1565,18 @@ public class Mob extends AbstractIntelligenceAgent {
         if (this.behaviourType == null)
             this.behaviourType = MobBehaviourType.None;
 
+        if (this.contractUUID == 0)
+            this.contract = null;
+        else
+            this.contract = DbManager.ContractQueries.GET_CONTRACT(this.contractUUID);
+
+        // Setup equipset for contract
+
+        if (this.contract != null)
+            this.equipmentSetID = this.contract.getEquipmentSet();
+
+        // Mobiles default to the building guild.
+
         if (this.building != null)
             this.guild = this.building.getGuild();
         else
@@ -1604,7 +1602,7 @@ public class Mob extends AbstractIntelligenceAgent {
         // Don't override level for guard minions or pets
 
         if (this.contract == null)
-            if (!this.agentType.equals(AIAgentType.GUARD) && !this.agentType.equals(AIAgentType.PET))
+            if (!this.agentType.equals(AIAgentType.GUARDMINION) && !this.agentType.equals(AIAgentType.PET))
                 this.level = (short) this.mobBase.getLevel();
 
         //set bonuses
@@ -1614,11 +1612,11 @@ public class Mob extends AbstractIntelligenceAgent {
         //TODO set these correctly later
         this.rangeHandOne = this.mobBase.getAttackRange();
         this.rangeHandTwo = -1;
-        this.minDamageHandOne = (int)this.mobBase.getMinDmg();
+        this.minDamageHandOne = (int) this.mobBase.getDamageMin();
-        this.maxDamageHandOne = (int)this.mobBase.getMaxDmg();
+        this.maxDamageHandOne = (int) this.mobBase.getDamageMax();
         this.minDamageHandTwo = 0;
         this.maxDamageHandTwo = 0;
-        this.atrHandOne = this.mobBase.getAtr();
+        this.atrHandOne = this.mobBase.getAttackRating();
         this.defenseRating = (short) this.mobBase.getDefenseRating();
         this.isActive = true;
 
@@ -1651,7 +1649,7 @@ public class Mob extends AbstractIntelligenceAgent {
 
         // Setup location for this Mobile
 
-        this.loc = new Vector3fImmutable(bindLoc);
+        this.setLoc(bindLoc);
         this.endLoc = new Vector3fImmutable(bindLoc);
 
         // Initialize inventory
@@ -1664,18 +1662,6 @@ public class Mob extends AbstractIntelligenceAgent {
         else
             this.equip = new HashMap<>();
 
-        // Powers from mobbase
-
-        if (PowersManager.AllMobPowers.containsKey(this.getMobBaseID()))
-            for (MobPowerEntry mobPowerEntry : PowersManager.AllMobPowers.get(this.getMobBaseID()))
-                mobPowers.put(mobPowerEntry.token, mobPowerEntry.rank);
-
-        // Powers from contract
-
-        if (this.contract != null && PowersManager.AllMobPowers.containsKey(this.contract.getContractID()))
-            for (MobPowerEntry mobPowerEntry : PowersManager.AllMobPowers.get(this.contract.getContractID()))
-                mobPowers.put(mobPowerEntry.token, mobPowerEntry.rank);
-
         if (this.equip == null) {
             Logger.error("Null equipset returned for uuid " + currentID);
             this.equip = new HashMap<>(0);
@@ -1691,10 +1677,11 @@ public class Mob extends AbstractIntelligenceAgent {
             if (this.getMobBase().enemy.size() > 0)
                 this.enemy.addAll(this.getMobBase().enemy);
         }
-
+        NPCManager.applyMobbaseEffects(this);
-        try {
+        NPCManager.applyEquipmentResists(this);
-            NPCManager.applyRuneSetEffects(this);
+        NPCManager.applyMobbaseSkill(this);
-            recalculateStats();
+        NPCManager.applyRuneSkills(this,this.getMobBaseID());
+        this.recalculateStats();
         this.setHealth(this.healthMax);
 
         // Set bounds for this mobile
@@ -1705,15 +1692,10 @@ public class Mob extends AbstractIntelligenceAgent {
 
         //assign 5 random patrol points for regular mobs
 
-            if (this.agentType.equals(AIAgentType.MOBILE)) {
+        if (this.agentType.equals(AIAgentType.MOBILE))
-
             NPCManager.AssignPatrolPoints(this);
-            }
 
         this.deathTime = 0;
-        } catch (Exception e) {
-            Logger.error(e.getMessage());
-        }
     }
 
     @Override
@@ -1721,8 +1703,8 @@ public class Mob extends AbstractIntelligenceAgent {
         return new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
     }
 
-    public boolean canSee(PlayerCharacter target) {
+    public boolean canSee(AbstractCharacter target) {
-        return this.mobBase.getSeeInvis() >= target.getHidden();
+        return this.mobBase.getSeeInvis() >= target.hidden;
     }
 
     public int getBuildingID() {
@@ -1750,23 +1732,17 @@ public class Mob extends AbstractIntelligenceAgent {
         if (!ac.getObjectType().equals(GameObjectType.PlayerCharacter))
             return;
 
-        PlayerCharacter player = (PlayerCharacter) ac;
-
         if (this.getCombatTarget() == null) {
             this.setCombatTarget(ac);
-            return;
         }
-
-        if (player.getObjectUUID() == this.getCombatTarget().getObjectUUID())
-            return;
-
     }
 
     public void setRank(int newRank) {
 
         DbManager.MobQueries.SET_PROPERTY(this, "mob_level", newRank);
         this.level = (short) newRank;
-
+        this.recalculateStats();
+        this.setHealth(this.healthMax);
     }
 
     public boolean isRanking() {
@@ -1798,10 +1774,6 @@ public class Mob extends AbstractIntelligenceAgent {
         this.weaponPower = weaponPower;
     }
 
-    public ConcurrentHashMap<Mob, Integer> getSiegeMinionMap() {
-        return siegeMinionMap;
-    }
-
     public DateTime getUpgradeDateTime() {
 
         lock.readLock().lock();
@@ -1822,7 +1794,8 @@ public class Mob extends AbstractIntelligenceAgent {
     }
 
     public boolean isPlayerGuard() {
-        return isPlayerGuard;
+
+        return EnumSet.of(AIAgentType.GUARDCAPTAIN, AIAgentType.GUARDMINION, AIAgentType.GUARDWALLARCHER).contains(this.agentType);
     }
 
     public int getLastMobPowerToken() {
@@ -1902,5 +1875,4 @@ public class Mob extends AbstractIntelligenceAgent {
             lock.writeLock().unlock();
         }
     }
-
 }

src/engine/objects/MobBase.java

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

src/engine/objects/MobBaseStats.java

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

src/engine/objects/NPC.java

@@ -640,28 +640,31 @@ public class NPC extends AbstractCharacter {
 
     public void removeMinions() {
 
-        for (Mob toRemove : this.siegeMinionMap.keySet()) {
+
+        for (Integer minionUUID : this.minions) {
+
+            Mob minionMob = Mob.getMob(minionUUID);
 
             try {
-                toRemove.clearEffects();
+                minionMob.clearEffects();
             } catch (Exception e) {
                 Logger.error(e.getMessage());
             }
 
-            if (toRemove.getParentZone() != null)
+            if (minionMob.getParentZone() != null)
-                toRemove.getParentZone().zoneMobSet.remove(toRemove);
+                minionMob.getParentZone().zoneMobSet.remove(minionMob);
 
-            WorldGrid.RemoveWorldObject(toRemove);
+            WorldGrid.RemoveWorldObject(minionMob);
-            DbManager.removeFromCache(toRemove);
+            DbManager.removeFromCache(minionMob);
 
 
-            PlayerCharacter petOwner = (PlayerCharacter) toRemove.guardCaptain;
+            PlayerCharacter petOwner = (PlayerCharacter) minionMob.guardCaptain;
 
             if (petOwner != null) {
 
                 petOwner.setPet(null);
 
-                toRemove.guardCaptain = null;
+                minionMob.guardCaptain = null;
 
                 PetMsg petMsg = new PetMsg(5, null);
                 Dispatch dispatch = Dispatch.borrow(petOwner, petMsg);
@@ -669,6 +672,7 @@ public class NPC extends AbstractCharacter {
 
             }
         }
+
     }
 
     @Override
@@ -861,7 +865,7 @@ public class NPC extends AbstractCharacter {
 
         this.bindLoc = new Vector3fImmutable(this.statLat, this.statAlt, this.statLon);
         this.bindLoc = this.parentZone.getLoc().add(this.bindLoc);
-        this.loc = new Vector3fImmutable(bindLoc);
+        this.setLoc(bindLoc);
 
         // Handle NPCs within buildings
 
@@ -890,7 +894,7 @@ public class NPC extends AbstractCharacter {
             this.stamina.set(this.staminaMax);
         }
 
-        if (this.parentZone.isPlayerCity())
+        if (this.parentZone.guild_zone)
             if (NPC.GetNPCProfits(this) == null)
                 NPCProfits.CreateProfits(this);
 
@@ -968,6 +972,10 @@ public class NPC extends AbstractCharacter {
             Bounds npcBounds = Bounds.borrow();
             npcBounds.setBounds(this.getLoc());
 
+            //apply NPC rune effects
+            NPCManager.applyRunesForNPC(this);
+            this.resists.setImmuneToAll(true);
+
         } catch (Exception e) {
             Logger.error(e.getMessage());
         }
@@ -1184,7 +1192,7 @@ public class NPC extends AbstractCharacter {
             if (serverZone == null)
                 return null;
 
-            city = City.GetCityFromCache(serverZone.getPlayerCityUUID());
+            city = City.GetCityFromCache(serverZone.playerCityUUID);
 
             if (city == null) {
 

src/engine/objects/PlayerCharacter.java

@@ -11,9 +11,9 @@ package engine.objects;
 
 import engine.Enum;
 import engine.Enum.*;
-import engine.InterestManagement.HeightMap;
 import engine.InterestManagement.InterestManager;
 import engine.InterestManagement.RealmMap;
+import engine.InterestManagement.Terrain;
 import engine.InterestManagement.WorldGrid;
 import engine.db.archive.CharacterRecord;
 import engine.db.archive.DataWarehouse;
@@ -117,10 +117,8 @@ public class PlayerCharacter extends AbstractCharacter {
     public float landingAltitude = 0;
     public int bindBuilding = 0;
     public FriendStatus friendStatus = FriendStatus.Available;
-    protected ArrayList<CharacterRune> runes;
     private BaseClass baseClass;
     private PromotionClass promotionClass;
-    private long channelMute = 0; // none muted.
     private ConcurrentHashMap<Integer, String> ignoredPlayerIDs = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
     private boolean lfGroup = false;
     private boolean lfGuild = false;
@@ -135,7 +133,6 @@ public class PlayerCharacter extends AbstractCharacter {
     private Vector3fImmutable lastStaticLoc = new Vector3fImmutable(0.0f, 0.0f, 0.0f);
     private GameObjectType lastTargetType;
     private int lastTargetID;
-    private int hidden = 0; // current rank of hide/sneak/invis
     private int seeInvis = 0; // current rank of see invis
     private float speedMod;
     private boolean teleportMode = false; // Teleport on MoveToPoint
@@ -1510,16 +1507,16 @@ public class PlayerCharacter extends AbstractCharacter {
                 return true;
             Zone zone = ZoneManager.findSmallestZone(breather.getLoc());
 
-            if (zone.getSeaLevel() != 0) {
+            if (zone.seaLevel != 0) {
 
                 float localAltitude = breather.getLoc().y;
 
 
-                if (localAltitude + breather.characterHeight < zone.getSeaLevel() - 2)
+                if (localAltitude + breather.characterHeight < zone.seaLevel - 2)
                     return false;
 
                 if (breather.isMoving()) {
-                    if (localAltitude + breather.characterHeight < zone.getSeaLevel())
+                    if (localAltitude + breather.characterHeight < zone.seaLevel)
                         return false;
                 }
             } else {
@@ -1550,12 +1547,12 @@ public class PlayerCharacter extends AbstractCharacter {
 
             Zone zone = ZoneManager.findSmallestZone(enterer.getLoc());
 
-            if (zone.getSeaLevel() != 0) {
+            if (zone.seaLevel != 0) {
 
                 float localAltitude = enterer.getLoc().y + enterer.characterHeight;
 
 
-                if (localAltitude < zone.getSeaLevel())
+                if (localAltitude < zone.seaLevel)
                     return true;
             } else {
                 if (enterer.getLoc().y + enterer.characterHeight < 0)
@@ -1582,12 +1579,12 @@ public class PlayerCharacter extends AbstractCharacter {
                 leaveWater = 1f;
 
 
-            if (zone.getSeaLevel() != 0) {
+            if (zone.seaLevel != 0) {
 
                 float localAltitude = leaver.getLoc().y;
 
 
-                if (localAltitude + leaveWater < zone.getSeaLevel())
+                if (localAltitude + leaveWater < zone.seaLevel)
                     return false;
             } else {
                 if (leaver.getLoc().y + leaveWater < 0)
@@ -1706,7 +1703,7 @@ public class PlayerCharacter extends AbstractCharacter {
         Zone zone = ZoneManager.findSmallestZone(this.getLoc());
 
         if (zone != null) {
-            return zone.getSafeZone() == (byte) 1;
+            return zone.peace_zone == (byte) 1;
         }
 
         return false;
@@ -1800,7 +1797,7 @@ public class PlayerCharacter extends AbstractCharacter {
 
             //DeathShroud
 
-            if (zone.getSafeZone() == 0)
+            if (zone.peace_zone == 0)
                 PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false);
 
             //enable this to give players deathshroud if mobs kill player.
@@ -1846,7 +1843,7 @@ public class PlayerCharacter extends AbstractCharacter {
 
         //DeathShroud
 
-        if (zone.getSafeZone() == 0)
+        if (zone.peace_zone == 0)
             PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false);
 
         if (doPVPEXP) {
@@ -1901,7 +1898,7 @@ public class PlayerCharacter extends AbstractCharacter {
         killCleanup();
         Zone zone = ZoneManager.findSmallestZone(this.getLoc());
 
-        if (zone.getSafeZone() == 0)
+        if (zone.peace_zone == 0)
             PowersManager.applyPower(this, this, Vector3fImmutable.ZERO, 1672601862, 40, false);
 
         // Send death message if needed
@@ -2774,10 +2771,6 @@ public class PlayerCharacter extends AbstractCharacter {
         this.lastStaticLoc = value;
     }
 
-    public int getHidden() {
-        return this.hidden;
-    }
-
     public void setHidden(int value) {
         this.hidden = value;
     }
@@ -4746,10 +4739,10 @@ public class PlayerCharacter extends AbstractCharacter {
 
             Zone zone = ZoneManager.findSmallestZone(this.getLoc());
 
-            if (zone.getSeaLevel() != 0) {
+            if (zone.seaLevel != 0) {
 
                 float localAltitude = this.getLoc().y + this.centerHeight;
-                if (localAltitude < zone.getSeaLevel())
+                if (localAltitude < zone.seaLevel)
                     return true;
             } else {
                 if (this.getLoc().y + this.centerHeight < 0)
@@ -4767,13 +4760,13 @@ public class PlayerCharacter extends AbstractCharacter {
         // If char is flying they aren't quite swimming
         try {
 
-            float localAltitude = HeightMap.getWorldHeight(currentLoc);
+            float localAltitude = Terrain.getWorldHeight(currentLoc);
 
             Zone zone = ZoneManager.findSmallestZone(currentLoc);
 
-            if (zone.getSeaLevel() != 0) {
+            if (zone.seaLevel != 0) {
 
-                if (localAltitude < zone.getSeaLevel())
+                if (localAltitude < zone.seaLevel)
                     return true;
             } else {
                 if (localAltitude < 0)
@@ -4839,7 +4832,7 @@ public class PlayerCharacter extends AbstractCharacter {
             } else
                 this.altitude = this.getDesiredAltitude();
 
-            this.loc = this.loc.setY(HeightMap.getWorldHeight(this) + this.getAltitude());
+            this.loc = this.loc.setY(Terrain.getWorldHeight(this.getLoc()) + this.getAltitude());
 
             this.setTakeOffTime(0);
             MovementManager.finishChangeAltitude(this, this.getDesiredAltitude());
@@ -4847,7 +4840,7 @@ public class PlayerCharacter extends AbstractCharacter {
             return;
         }
 
-        this.loc = this.loc.setY(HeightMap.getWorldHeight(this) + this.getAltitude());
+        this.loc = this.loc.setY(Terrain.getWorldHeight(this.getLoc()) + this.getAltitude());
     }
 
     public boolean hasBoon() {
@@ -4893,12 +4886,10 @@ public class PlayerCharacter extends AbstractCharacter {
         if (this.isAlive() == false || this.getBonuses().getBool(ModType.Stunned, SourceType.None) || this.getBonuses().getBool(ModType.CannotMove, SourceType.None)) {
             //Target is stunned or rooted. Don't move
             this.stopMovement(newLoc);
-            this.region = AbstractWorldObject.GetRegionByWorldObject(this);
             return;
         }
         if (newLoc.equals(this.getEndLoc())) {
             this.stopMovement(newLoc);
-            this.region = AbstractWorldObject.GetRegionByWorldObject(this);
             if (this.getDebug(1))
                 ChatManager.chatSystemInfo(this,
                         "Arrived at End location. " + this.getEndLoc());
@@ -4907,7 +4898,6 @@ public class PlayerCharacter extends AbstractCharacter {
         }
 
         setLoc(newLoc);
-        this.region = AbstractWorldObject.GetRegionByWorldObject(this);
 
         if (this.getDebug(1))
             ChatManager.chatSystemInfo(this,
@@ -5358,7 +5348,7 @@ public class PlayerCharacter extends AbstractCharacter {
         moveToMsg.setStartCoord(this.getLoc());
         moveToMsg.setEndCoord(endLoc);
         moveToMsg.setInBuilding(-1);
-        moveToMsg.setUnknown01(-1);
+        moveToMsg.setInBuildingFloor(-1);
         moveToMsg.setSourceType(GameObjectType.PlayerCharacter.ordinal());
         moveToMsg.setSourceID(this.getObjectUUID());
 
@@ -5441,14 +5431,6 @@ public class PlayerCharacter extends AbstractCharacter {
         return characterHeight;
     }
 
-    public void setCharacterHeight(float characterHeight) {
-        this.characterHeight = characterHeight;
-    }
-
-    public void setCenterHeight(float centerHeight) {
-        this.centerHeight = centerHeight;
-    }
-
     public boolean isEnteredWorld() {
         return enteredWorld;
     }
@@ -5457,40 +5439,10 @@ public class PlayerCharacter extends AbstractCharacter {
         this.enteredWorld = enteredWorld;
     }
 
-    public long getChannelMute() {
-        return channelMute;
-    }
-
-    public void setChannelMute(long channelMute) {
-        this.channelMute = channelMute;
-    }
-
     public boolean isLastSwimming() {
         return lastSwimming;
     }
 
-    public boolean isTeleporting() {
-        return isTeleporting;
-    }
-
-    public void setTeleporting(boolean isTeleporting) {
-        this.isTeleporting = isTeleporting;
-    }
-
-    @Override
-    public final void teleport(final Vector3fImmutable targetLoc) {
-
-        Regions targetRegion = Regions.GetRegionForTeleport(targetLoc);
-        locationLock.writeLock().lock();
-
-        try {
-            MovementManager.translocate(this, targetLoc, targetRegion);
-        } catch (Exception e) {
-            Logger.error(e);
-        } finally {
-            locationLock.writeLock().unlock();
-        }
-    }
 
     public ReadWriteLock getTeleportLock() {
         return teleportLock;

src/engine/objects/Portal.java

@@ -3,6 +3,7 @@ package engine.objects;
 import engine.Enum;
 import engine.Enum.PortalType;
 import engine.InterestManagement.WorldGrid;
+import engine.gameManager.BuildingManager;
 import engine.gameManager.ConfigManager;
 import engine.job.JobScheduler;
 import engine.jobs.CloseGateJob;
@@ -104,7 +105,7 @@ public class Portal {
         if (player.getTimeStamp("lastMoveGate") < this.lastActive)
             return;
 
-        player.teleport(targetGate.getLoc());
+        player.teleport(targetGate.getLoc().add(0,6,0));//offset height of runegate
         player.setSafeMode();
 
     }

src/engine/objects/Realm.java

@@ -175,22 +175,6 @@ public class Realm {
         return (this.rulingCityUUID != 0);
     }
 
-    public float getMapR() {
-        return this.mapR;
-    }
-
-    public float getMapG() {
-        return this.mapG;
-    }
-
-    public float getMapB() {
-        return this.mapB;
-    }
-
-    public float getMapA() {
-        return this.mapA;
-    }
-
     public boolean getCanBeClaimed() {
         return this.canBeClaimed;
     }
@@ -211,37 +195,6 @@ public class Realm {
         return City.getCity(this.rulingCityUUID);
     }
 
-    public float getMapY1() {
-        return this.mapY1;
-    }
-
-    public float getMapX1() {
-        return this.mapX1;
-    }
-
-    public float getMapY2() {
-        return this.mapY2;
-    }
-
-    public float getMapX2() {
-        return this.mapX2;
-    }
-
-    public int getStretchX() {
-        return this.stretchX;
-    }
-
-    public int getStretchY() {
-        return this.stretchY;
-    }
-
-    public int getlocX() {
-        return this.locX;
-    }
-
-    public int getlocY() {
-        return this.locY;
-    }
 
     // Call this after changing ownership before you serialize a realm
 
@@ -370,13 +323,6 @@ public class Realm {
         return charterType;
     }
 
-    /**
-     * @param charterType the charterType to set
-     */
-    public void setCharterType(int charterType) {
-        this.charterType = charterType;
-    }
-
     public void abandonRealm() {
 
         // Push event to warehouse
@@ -417,32 +363,4 @@ public class Realm {
         return hash;
     }
 
-    public void setHash() {
-
-        this.hash = DataWarehouse.hasher.encrypt(this.realmID);
-
-        // Write hash to player character table
-
-        DataWarehouse.writeHash(Enum.DataRecordType.REALM, this.realmID);
-    }
-
-	/* *** Keeping around in case needed for server wipe or some other emergency
-
-    public static void backfillRealms() {
-
-        // Backfill realm records
-
-        for (Realm realm : _realms.values()) {
-
-            realm.setHash();
-
-            if ( (realm.isRuled() == true) &&
-                    (DataWarehouse.recordExists(Enum.DataRecordType.REALM, realm.getRealmID()) == false)) {
-                RealmRecord realmRecord = RealmRecord.borrow(realm, Enum.RecordEventType.CAPTURE);
-                DataWarehouse.pushToWarehouse(realmRecord);
-            }
-
-        }
-    }
-	 */
 }

src/engine/objects/Runegate.java

@@ -108,7 +108,7 @@ public class Runegate {
 
         writer.putInt(gateBuilding.getObjectType().ordinal());
         writer.putInt(gateBuilding.getObjectUUID());
-        writer.putString(gateBuilding.getParentZone().getName());
+        writer.putString(gateBuilding.getParentZone().zoneName);
         writer.putFloat(gateBuilding.getLoc().getLat());
         writer.putFloat(gateBuilding.getLoc().getAlt());
         writer.putFloat(gateBuilding.getLoc().getLong());

src/engine/objects/Warehouse.java

@@ -1272,7 +1272,7 @@ public class Warehouse extends AbstractWorldObject {
                 return;
             }
 
-            City city = City.getCity(cityZone.getPlayerCityUUID());
+            City city = City.getCity(cityZone.playerCityUUID);
 
             if (city == null) {
                 Logger.error("Failed to load City for Warehouse with UUID " + this.getObjectUUID());

src/engine/objects/Zone.java

@@ -10,7 +10,7 @@
 package engine.objects;
 
 import engine.Enum;
-import engine.InterestManagement.HeightMap;
+import engine.InterestManagement.Terrain;
 import engine.db.archive.DataWarehouse;
 import engine.gameManager.DbManager;
 import engine.gameManager.ZoneManager;
@@ -33,64 +33,99 @@ public class Zone extends AbstractGameObject {
     public final Set<Building> zoneBuildingSet = Collections.newSetFromMap(new ConcurrentHashMap<>());
     public final Set<NPC> zoneNPCSet = Collections.newSetFromMap(new ConcurrentHashMap<>());
     public final Set<Mob> zoneMobSet = Collections.newSetFromMap(new ConcurrentHashMap<>());
-    private final int playerCityID;
+    public final int playerCityUUID;
-    private final String zoneName;
+    public final String zoneName;
-    private final float xCoord;
+    public final float xOffset;
-    private final float zCoord;
+    public final float zOffset;
-    private final float yCoord;
+    public final float yOffset;
-    private final int loadNum;
+    public final int template;
-    private final byte safeZone;
+    public final byte peace_zone;
-    private final String Icon1;
+    public final String icon1;
-    private final String Icon2;
+    public final String icon2;
-    private final String Icon3;
+    public final String icon3;
     public float absX = 0.0f;
     public float absY = 0.0f;
     public float absZ = 0.0f;
-    public int minLvl;
+    public int min_level;
-    public int maxLvl;
+    public int max_level;
     public boolean hasBeenHotzone = false;
-    private ArrayList<Zone> nodes = null;
+    public ArrayList<Zone> nodes = null;
-    private int parentZoneID;
+    public int parentZoneID;
-    private Zone parent = null;
+    public Zone parent = null;
-    private Bounds bounds;
+    public Bounds bounds;
-    private boolean isNPCCity = false;
+    public boolean isNPCCity = false;
-    private boolean isPlayerCity = false;
+    public boolean guild_zone;
-    private String hash;
+    public String hash;
-    private float worldAltitude = 0;
+    public float global_height = 0;
-    private float seaLevel = 0;
+    public float seaLevel = 0f;
-    //public static ArrayList<Mob> respawnQue = new ArrayList<>();
+    public float sea_level_offset = 0;
     public static final Set<Mob> respawnQue = Collections.newSetFromMap(new ConcurrentHashMap<>());
     public static long lastRespawn = 0;
+    public float major_radius;
+    public float minor_radius;
+    public float min_blend;
+    public float max_blend;
+    public String sea_level_type;
+    public float sea_level;
+    public String terrain_type;
+    public float terrain_max_y;
+    public int terrain_image;
+
+    public Terrain terrain = null;
+
     /**
      * ResultSet Constructor
      */
     public Zone(ResultSet rs) throws SQLException {
-        super(rs);
-        this.parentZoneID = rs.getInt("parent");
-        this.playerCityID = rs.getInt("isPlayerCity");
-        this.isPlayerCity = this.playerCityID != 0;
-        this.zoneName = rs.getString("Name");
-        this.xCoord = rs.getFloat("XCoord");
-        this.zCoord = rs.getFloat("ZCoord");
-        this.yCoord = rs.getFloat("YOffset");
-        this.loadNum = rs.getInt("LoadNum");
-        this.safeZone = rs.getByte("SafeZone");
-        this.Icon1 = rs.getString("Icon1");
-        this.Icon2 = rs.getString("Icon2");
-        this.Icon3 = rs.getString("Icon3");
-        this.hash = rs.getString("hash");
 
-        this.minLvl = rs.getInt("minLvl");
+        super(rs);
-        this.maxLvl = rs.getInt("maxLvl");
+
+            this.parentZoneID = rs.getInt("parent");
+            this.playerCityUUID = rs.getInt("playerCityUUID");
+            this.guild_zone = this.playerCityUUID != 0;
+            this.zoneName = rs.getString("zone_name");
+            this.xOffset = rs.getFloat("xOffset");
+            this.zOffset = rs.getFloat("zOffset");
+            this.yOffset = rs.getFloat("yOffset");
+            this.template = rs.getInt("template");
+            this.peace_zone = rs.getByte("peace_zone");
+            this.icon1 = rs.getString("icon1");
+            this.icon2 = rs.getString("icon2");
+            this.icon3 = rs.getString("icon3");
+            this.min_level = rs.getInt("min_level");
+            this.max_level = rs.getInt("max_level");
+            this.major_radius = rs.getFloat("major_radius");
+            this.minor_radius = rs.getFloat("minor_radius");
+            this.min_blend = rs.getFloat("min_blend");
+            this.max_blend = rs.getFloat("max_blend");
+            this.sea_level_type = rs.getString("sea_level_type");
+            this.sea_level_offset = rs.getFloat("sea_level");
+            this.terrain_type = rs.getString("terrain_type");
+            this.terrain_max_y = rs.getFloat("terrain_max_y");
+            this.terrain_image = rs.getInt("terrain_image");
+
+            if (this.guild_zone) {
+                this.max_blend = 128;
+                this.min_blend = 128;
+                this.terrain_max_y = 5;
+                this.major_radius = (int) Enum.CityBoundsType.ZONE.halfExtents;
+                this.minor_radius = (int) Enum.CityBoundsType.ZONE.halfExtents;
+                this.terrain_type = "PLANAR";
+            }
+
+            if (this.terrain_type.equals("NONE"))
+                this.terrain = null;
+            else
+                this.terrain = new Terrain(this);
 
             //this needs to be here specifically for new zones created after server boot (e.g. player city zones)
-        Zone parentZone = ZoneManager.getZoneByUUID(parentZoneID);
 
+            Zone parentZone = ZoneManager.getZoneByUUID(parentZoneID);
             this.setParent(parentZone);
 
-        if (this.minLvl == 0 && parentZone != null) {
+            if (this.min_level == 0 && parentZone != null) {
-            this.minLvl = parentZone.minLvl;
+                this.min_level = parentZone.min_level;
-            this.maxLvl = parentZone.maxLvl;
+                this.max_level = parentZone.max_level;
             }
 
             if (parentZone != null)
@@ -101,33 +136,32 @@ public class Zone extends AbstractGameObject {
         if (hash == null)
             setHash();
 
-
     }
 
     public static void serializeForClientMsg(Zone zone, ByteBufferWriter writer) {
 
-        if (zone.loadNum == 0 && zone.playerCityID == 0)
+        if (zone.template == 0 && zone.playerCityUUID == 0)
             Logger.warn("Warning! WorldServerMap with ID " + zone.getObjectUUID() + " has a loadnum of 0 (player city) and no city linked. This will probably crash the client!");
 
         // Player City Terraform values serialized here.
 
-        if (zone.playerCityID > 0) {
+        if (zone.playerCityUUID > 0) {
             writer.put((byte) 1); // Player City - True
-            writer.putFloat(Enum.CityBoundsType.ZONE.extents);
+            writer.putFloat(Enum.CityBoundsType.ZONE.halfExtents);
-            writer.putFloat(Enum.CityBoundsType.ZONE.extents);
+            writer.putFloat(Enum.CityBoundsType.ZONE.halfExtents);
         } else
             writer.put((byte) 0); // Player City - False
 
-        writer.putFloat(zone.xCoord);
+        writer.putFloat(zone.xOffset);
-        writer.putFloat(zone.zCoord);
+        writer.putFloat(zone.zOffset);
-        writer.putFloat(zone.yCoord);
+        writer.putFloat(zone.yOffset);
 
         writer.putInt(0);
         writer.putInt(0);
-        writer.putInt(zone.loadNum);
+        writer.putInt(zone.template);
 
-        if (zone.playerCityID > 0) {
+        if (zone.playerCityUUID > 0) {
-            City k = City.getCity(zone.playerCityID);
+            City k = City.getCity(zone.playerCityUUID);
 
             if (k != null) {
                 writer.putInt(k.getObjectType().ordinal());
@@ -140,16 +174,16 @@ public class Zone extends AbstractGameObject {
         }
         writer.putInt(zone.nodes.size());
 
-        City city = City.getCity(zone.playerCityID);
+        City city = City.getCity(zone.playerCityUUID);
 
         if (city != null)
             writer.putString(city.getCityName());
         else
             writer.putString(zone.zoneName);
-        writer.put(zone.safeZone);
+        writer.put(zone.peace_zone);
-        writer.putString(zone.Icon1);
+        writer.putString(zone.icon1);
-        writer.putString(zone.Icon2);
+        writer.putString(zone.icon2);
-        writer.putString(zone.Icon3);
+        writer.putString(zone.icon3);
         writer.put((byte) 0); // Pad
 
         for (Zone child : zone.nodes) {
@@ -163,108 +197,11 @@ public class Zone extends AbstractGameObject {
      */
     public void setBounds() {
 
-        float halfExtentX;
-        float halfExtentY;
-
         // Set initial bounds object
 
         this.bounds = Bounds.borrow();
+        this.bounds.setBounds(new Vector2f(this.absX, this.absZ), new Vector2f(this.major_radius, this.minor_radius), 0.0f);
 
-        // Player cities are assigned default value
-
-        if (this.loadNum == 0) {
-            bounds.setBounds(new Vector2f(this.absX, this.absZ), new Vector2f(Enum.CityBoundsType.ZONE.extents, Enum.CityBoundsType.ZONE.extents), 0.0f);
-            return;
-        }
-
-        Vector2f zoneSize = ZoneManager._zone_size_data.get(this.loadNum);
-
-        // Default to player zone size on error? Maybe log this
-
-        if (zoneSize != null)
-            this.bounds.setBounds(new Vector2f(this.absX, this.absZ), zoneSize, 0.0f);
-        else
-            bounds.setBounds(new Vector2f(this.absX, this.absZ), new Vector2f(Enum.CityBoundsType.ZONE.extents, Enum.CityBoundsType.ZONE.extents), 0.0f);
-
-    }
-
-    public int getPlayerCityUUID() {
-        return this.playerCityID;
-    }
-
-    public String getName() {
-        return zoneName;
-    }
-
-    public float getXCoord() {
-        return xCoord;
-    }
-
-    public float getYCoord() {
-        return yCoord;
-    }
-
-    public float getZCoord() {
-        return zCoord;
-    }
-
-    public int getLoadNum() {
-        return loadNum;
-    }
-
-    public byte getSafeZone() {
-        return safeZone;
-    }
-
-    public String getIcon1() {
-        return Icon1;
-    }
-
-    public void generateWorldAltitude() {
-
-        if (ZoneManager.getSeaFloor().getObjectUUID() == this.getObjectUUID()) {
-            this.worldAltitude = MBServerStatics.SEA_FLOOR_ALTITUDE;
-            return;
-        }
-
-        Zone parentZone = this.parent;
-
-        Zone currentZone = this;
-        float altitude = this.absY;
-
-        //seafloor only zone with null parent;
-
-        while (parentZone != ZoneManager.getSeaFloor()) {
-
-            if (parentZone.getHeightMap() != null) {
-
-                Vector2f zoneLoc = ZoneManager.worldToZoneSpace(currentZone.getLoc(), parentZone);
-                altitude += parentZone.getHeightMap().getInterpolatedTerrainHeight(zoneLoc);
-
-            }
-            currentZone = parentZone;
-            parentZone = parentZone.parent;
-
-        }
-
-        this.worldAltitude = altitude;
-
-        if (ZoneManager.getSeaFloor().equals(this))
-            this.seaLevel = 0;
-        else if
-        (this.getHeightMap() != null && this.getHeightMap().getSeaLevel() == 0) {
-            this.seaLevel = this.parent.seaLevel;
-
-        } else if (this.getHeightMap() != null) {
-            this.seaLevel = this.worldAltitude + this.getHeightMap().getSeaLevel();
-        } else {
-            this.seaLevel = this.parent.seaLevel;
-        }
-
-    }
-
-    public Zone getParent() {
-        return this.parent;
     }
 
     public void setParent(final Zone value) {
@@ -272,68 +209,65 @@ public class Zone extends AbstractGameObject {
         this.parent = value;
         this.parentZoneID = (this.parent != null) ? this.parent.getObjectUUID() : 0;
 
-        if (this.parent != null) {
+        // Seafloor
-            this.absX = this.xCoord + parent.absX;
-            this.absY = this.yCoord + parent.absY;
-            this.absZ = this.zCoord + parent.absZ;
 
-            if (this.minLvl == 0 || this.maxLvl == 0) {
+        if (this.parent == null) {
-                this.minLvl = this.parent.minLvl;
+            this.absX = this.xOffset;
-                this.maxLvl = this.parent.maxLvl;
-            }
-        } else {  //only the Sea Floor zone does not have a parent
-            this.absX = this.xCoord;
             this.absY = MBServerStatics.SEA_FLOOR_ALTITUDE;
-            this.absZ = this.zCoord;
+            this.global_height = MBServerStatics.SEA_FLOOR_ALTITUDE;
-        }
+            this.absZ = this.zOffset;
-
+            this.seaLevel = 0;
-        // Zone AABB is set here as it's coordinate space is world requiring a parent.
             this.setBounds();
-
+            return;
-        if (this.getHeightMap() != null && this.getHeightMap().getSeaLevel() != 0)
-            this.seaLevel = this.getHeightMap().getSeaLevel();
-
         }
 
-    public float getAbsX() {
+        this.absX = this.xOffset + parent.absX;
-        return this.absX;
+        this.absY = this.yOffset + parent.absY;
+        this.absZ = this.zOffset + parent.absZ;
+
+        if (this.min_level == 0 || this.max_level == 0) {
+            this.min_level = this.parent.min_level;
+            this.max_level = this.parent.max_level;
         }
 
-    public float getAbsY() {
+        this.setBounds();
-        return this.absY;
+        this.global_height = ZoneManager.calculateGlobalZoneHeight(this);
+        setSeaLevel();
     }
 
-    public float getAbsZ() {
+    private void setSeaLevel() {
-        return this.absZ;
+
+        int world_sea_level = 0;
+
+        if (this.parent == null) {
+            this.sea_level = world_sea_level;
+            return;
+        }
+
+        switch (this.sea_level_type) {
+            case "WORLD":
+                this.sea_level = world_sea_level + this.sea_level_offset;
+                break;
+            case "PARENT":
+                this.sea_level = this.parent.sea_level + this.sea_level_offset;
+                break;
+            case "SELF":
+                this.sea_level = this.global_height + this.sea_level_offset;
+                break;
+        }
     }
 
     public boolean isMacroZone() {
 
         // Macro zones have icons.
 
-        if (this.isPlayerCity == true)
+        if (this.guild_zone == true)
             return false;
 
         if (this.parent == null)
             return false;
 
-        return !this.getIcon1().equals("");
+        return !icon1.equals("");
-    }
-
-    public boolean isNPCCity() {
-        return this.isNPCCity;
-    }
-
-    public void setNPCCity(boolean value) {
-        this.isNPCCity = value;
-    }
-
-    public boolean isPlayerCity() {
-        return this.isPlayerCity;
-    }
-
-    public void setPlayerCity(boolean value) {
-        this.isPlayerCity = value;
     }
 
     public Vector3fImmutable getLoc() {
@@ -345,16 +279,15 @@ public class Zone extends AbstractGameObject {
     }
 
     public ArrayList<Zone> getNodes() {
+
         if (this.nodes == null) {
             this.nodes = DbManager.ZoneQueries.GET_MAP_NODES(super.getObjectUUID());
 
             //Add reverse lookup for child->parent
             if (this.nodes != null)
-                for (Zone zone : this.nodes) {
+                for (Zone zone : this.nodes)
                     zone.setParent(this);
         }
-        }
-
         return nodes;
     }
 
@@ -373,7 +306,7 @@ public class Zone extends AbstractGameObject {
 
     public boolean isContinent() {
 
-        if (this.equals(ZoneManager.getSeaFloor()))
+        if (this.equals(ZoneManager.seaFloor))
             return false;
 
         if (this.getNodes().isEmpty())
@@ -382,21 +315,9 @@ public class Zone extends AbstractGameObject {
         if (this.getNodes().get(0).isMacroZone())
             return true;
 
-        return this.getParent().equals(ZoneManager.getSeaFloor());
+        return this.parent.equals(ZoneManager.seaFloor);
 
     }
-
-    /**
-     * @return the bounds
-     */
-    public Bounds getBounds() {
-        return bounds;
-    }
-
-    public String getHash() {
-        return hash;
-    }
-
     public void setHash() {
 
         this.hash = DataWarehouse.hasher.encrypt(this.getObjectUUID());
@@ -406,22 +327,4 @@ public class Zone extends AbstractGameObject {
         DataWarehouse.writeHash(Enum.DataRecordType.ZONE, this.getObjectUUID());
     }
 
-    // Return heightmap for this Zone.
-
-    public HeightMap getHeightMap() {
-
-        if (this.isPlayerCity)
-            return HeightMap.PlayerCityHeightMap;
-
-        return HeightMap.heightmapByLoadNum.get(this.loadNum);
-    }
-
-    public float getSeaLevel() {
-        return seaLevel;
-    }
-
-    public float getWorldAltitude() {
-        return worldAltitude;
-    }
-
 }

src/engine/powers/MobPowerEntry.java

@@ -1,17 +0,0 @@
-package engine.powers;
-
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
-public class MobPowerEntry {
-
-    public int token;
-    public int rank;
-
-
-    public MobPowerEntry(ResultSet rs) throws SQLException {
-        this.token = rs.getInt("token");
-        this.rank = rs.getInt("rank");
-    }
-
-}

src/engine/powers/RunePowerEntry.java

@@ -0,0 +1,29 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+package engine.powers;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class RunePowerEntry {
+
+    public String name;
+    public int token;
+    public String power_type;
+    public int rank;
+
+
+    public RunePowerEntry(ResultSet rs) throws SQLException {
+        this.name = rs.getString("name");
+        this.token = rs.getInt("token");
+        this.power_type = rs.getString("power_type");
+        this.rank = rs.getInt("rank");
+    }
+
+}

src/engine/powers/RuneSkillAdjustEntry.java

@@ -0,0 +1,31 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+package engine.powers;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class RuneSkillAdjustEntry {
+
+    public String name;
+    public int token;
+    public String skill_type;
+    public int rank;
+    public int level;
+
+
+    public RuneSkillAdjustEntry(ResultSet rs) throws SQLException {
+        this.name = rs.getString("name");
+        this.token = rs.getInt("token");
+        this.skill_type = rs.getString("skill_type");
+        this.rank = rs.getInt("rank");
+        this.level = rs.getInt("level");
+    }
+
+}

src/engine/powers/poweractions/CreateMobPowerAction.java

@@ -56,7 +56,7 @@ public class CreateMobPowerAction extends AbstractPowerAction {
 
         PlayerCharacter owner = (PlayerCharacter) source;
         Mob currentPet = owner.getPet();
-        Zone seaFloor = ZoneManager.getSeaFloor();
+        Zone seaFloor = ZoneManager.seaFloor;
         Guild guild = Guild.getErrantGuild();
         ClientConnection origin = owner.getClientConnection();