Adjusted the distance check for players in player's path, effectively making the collision area of players larger. This can be changed in Bounds PlayerCollisionPoint method by increasing or decreasing the minDistance var.

This reverts commit 1c31070fc8.

.gitignore

@@ -24,3 +24,8 @@
 hs_err_pid*
 replay_pid*
 
+*.idea/
+Server.iml
+*.gitignore
+prestonbane.iml
+qodana.yaml

src/discord/Database.java

@@ -9,8 +9,8 @@
 
 package discord;
 
+import engine.Enum;
 import engine.gameManager.ConfigManager;
-import engine.mbEnums;
 import org.pmw.tinylog.Logger;
 
 import java.sql.*;
@@ -70,7 +70,7 @@ public class Database {
         }
     }
 
-    public boolean updateAccountStatus(String discordAccountID, mbEnums.AccountStatus accountStatus) {
+    public boolean updateAccountStatus(String discordAccountID, Enum.AccountStatus accountStatus) {
 
         try (Connection connection = DriverManager.getConnection(sqlURI, ConfigManager.MB_DATABASE_USER.getValue(),
                 ConfigManager.MB_DATABASE_PASS.getValue());
@@ -131,7 +131,7 @@ public class Database {
                 discordAccount = new DiscordAccount();
                 discordAccount.discordAccount = rs.getString("discordAccount");
                 discordAccount.gameAccountName = rs.getString("acct_uname");
-                discordAccount.status = mbEnums.AccountStatus.valueOf(rs.getString("status"));
+                discordAccount.status = Enum.AccountStatus.valueOf(rs.getString("status"));
                 discordAccount.isDiscordAdmin = rs.getByte("discordAdmin");                // Registration date cannot be null
 
                 Timestamp registrationDate = rs.getTimestamp("registrationDate");
@@ -328,7 +328,7 @@ public class Database {
                 discordAccount = new DiscordAccount();
                 discordAccount.discordAccount = rs.getString("discordAccount");
                 discordAccount.gameAccountName = rs.getString("acct_uname");
-                discordAccount.status = mbEnums.AccountStatus.valueOf(rs.getString("status"));
+                discordAccount.status = Enum.AccountStatus.valueOf(rs.getString("status"));
 
                 // Registration date cannot be null
 

src/discord/DiscordAccount.java

@@ -8,14 +8,14 @@
 
 package discord;
 
-import engine.mbEnums;
+import engine.Enum;
 
 import java.time.LocalDateTime;
 
 public class DiscordAccount {
     public String discordAccount;
     public String gameAccountName;
-    public mbEnums.AccountStatus status;
+    public Enum.AccountStatus status;
     public LocalDateTime registrationDate;
     public LocalDateTime lastUpdateRequest;
     public byte isDiscordAdmin;

src/discord/handlers/AccountInfoRequest.java

@@ -11,7 +11,7 @@ package discord.handlers;
 import discord.Database;
 import discord.DiscordAccount;
 import discord.MagicBot;
-import engine.mbEnums;
+import engine.Enum;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 
 import java.util.List;
@@ -21,7 +21,7 @@ public class AccountInfoRequest {
     public static void handleRequest(MessageReceivedEvent event) {
 
         String discordAccountID = event.getAuthor().getId();
-        mbEnums.AccountStatus accountStatus;
+        Enum.AccountStatus accountStatus;
 
         if (Database.online == false) {
 

src/discord/handlers/BanToggleHandler.java

@@ -11,7 +11,7 @@ package discord.handlers;
 import discord.DiscordAccount;
 import discord.MagicBot;
 import discord.RobotSpeak;
-import engine.mbEnums;
+import engine.Enum;
 import net.dv8tion.jda.api.entities.User;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.pmw.tinylog.Logger;
@@ -23,7 +23,7 @@ public class BanToggleHandler {
     public static void handleRequest(MessageReceivedEvent event, String[] args) {
 
         String discordAccountID;
-        mbEnums.AccountStatus accountStatus;
+        Enum.AccountStatus accountStatus;
 
         // Early exit if database unavailable or is not an admin
 
@@ -55,10 +55,10 @@ public class BanToggleHandler {
 
         // toggle ban status
 
-        if (discordAccounts.get(0).status.equals(mbEnums.AccountStatus.BANNED))
-            accountStatus = mbEnums.AccountStatus.ACTIVE;
+        if (discordAccounts.get(0).status.equals(Enum.AccountStatus.BANNED))
+            accountStatus = Enum.AccountStatus.ACTIVE;
         else
-            accountStatus = mbEnums.AccountStatus.BANNED;
+            accountStatus = Enum.AccountStatus.BANNED;
 
         // We have a valid discord ID at this point.  Banstick?
 
@@ -82,7 +82,7 @@ public class BanToggleHandler {
 
         // If we're toggling status to active we're done here.
 
-        if (accountStatus.equals(mbEnums.AccountStatus.ACTIVE))
+        if (accountStatus.equals(Enum.AccountStatus.ACTIVE))
             return;
 
         // Set users role to noob

src/discord/handlers/PasswordChangeHandler.java

@@ -11,7 +11,7 @@ package discord.handlers;
 import discord.Database;
 import discord.DiscordAccount;
 import discord.MagicBot;
-import engine.mbEnums;
+import engine.Enum;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import org.pmw.tinylog.Logger;
 
@@ -53,7 +53,7 @@ public class PasswordChangeHandler {
 
         // Banned or suspended user's get no love.
 
-        if (discordAccount.status.equals(mbEnums.AccountStatus.BANNED)) {
+        if (discordAccount.status.equals(Enum.AccountStatus.BANNED)) {
             MagicBot.sendResponse(event,
                     "Sorry but that is too much work. \n" +
                             "Your account detailings cannot for to log into game!");

src/engine/InterestManagement/HeightMap.java

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

src/engine/InterestManagement/InterestManager.java

@@ -8,16 +8,16 @@
 
 package engine.InterestManagement;
 
-import engine.gameManager.DispatchManager;
+import engine.Enum;
+import engine.Enum.DispatchChannel;
+import engine.Enum.GameObjectType;
 import engine.gameManager.GroupManager;
 import engine.gameManager.SessionManager;
 import engine.job.JobScheduler;
 import engine.jobs.RefreshGroupJob;
-import engine.mbEnums;
-import engine.mbEnums.DispatchChannel;
-import engine.mbEnums.GameObjectType;
 import engine.net.AbstractNetMsg;
 import engine.net.Dispatch;
+import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.LoadCharacterMsg;
 import engine.net.client.msg.LoadStructureMsg;
@@ -88,7 +88,7 @@ public enum InterestManager implements Runnable {
             if (send) {
 
                 Dispatch dispatch = Dispatch.borrow(player, msg);
-                DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
+                DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
             }
         }
     }
@@ -140,7 +140,7 @@ public enum InterestManager implements Runnable {
 
             else {
                 if (pc != null)
-                    if (pcc.getSeeInvis() < pc.hidden)
+                    if (pcc.getSeeInvis() < pc.getHidden())
                         continue;
 
                 if (!cc.sendMsg(uom)) {
@@ -270,7 +270,7 @@ public enum InterestManager implements Runnable {
             }
 
             Dispatch dispatch = Dispatch.borrow(player, uom);
-            DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
+            DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
         }
 
         loadedStaticObjects.removeAll(toRemove);
@@ -292,7 +292,7 @@ public enum InterestManager implements Runnable {
                 lcm = new LoadCharacterMsg(corpse, PlayerCharacter.hideNonAscii());
 
                 Dispatch dispatch = Dispatch.borrow(player, lcm);
-                DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
+                DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
 
             } else if (awo.getObjectType().equals(GameObjectType.NPC)) {
                 NPC npc = (NPC) awo;
@@ -304,13 +304,13 @@ public enum InterestManager implements Runnable {
 
         if (lsm.getStructureList().size() > 0) {
             Dispatch dispatch = Dispatch.borrow(player, lsm);
-            DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
+            DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
         }
 
         for (LoadCharacterMsg lc : lcmList) {
 
             Dispatch dispatch = Dispatch.borrow(player, lc);
-            DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
+            DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
         }
 
         loadedStaticObjects.addAll(toLoad);
@@ -340,7 +340,7 @@ public enum InterestManager implements Runnable {
                     if (loadedPlayer.getObjectUUID() == player.getObjectUUID())
                         continue;
 
-                    if (player.getSeeInvis() < loadedPlayer.hidden)
+                    if (player.getSeeInvis() < loadedPlayer.getHidden())
                         continue;
 
                     if (loadedPlayer.safemodeInvis())
@@ -372,7 +372,7 @@ public enum InterestManager implements Runnable {
 
             if (playerLoadedObject.getObjectType().equals(GameObjectType.PlayerCharacter)) {
                 PlayerCharacter loadedPlayer = (PlayerCharacter) playerLoadedObject;
-                if (player.getSeeInvis() < loadedPlayer.hidden)
+                if (player.getSeeInvis() < loadedPlayer.getHidden())
                     toRemove.add(playerLoadedObject);
                 else if (loadedPlayer.safemodeInvis())
                     toRemove.add(playerLoadedObject);
@@ -414,7 +414,7 @@ public enum InterestManager implements Runnable {
 
             if (!uom.getObjectList().isEmpty()) {
                 Dispatch dispatch = Dispatch.borrow(player, uom);
-                DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
+                DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
             }
         }
 
@@ -437,7 +437,7 @@ public enum InterestManager implements Runnable {
 
                     // dont load if invis
 
-                    if (player.getSeeInvis() < awopc.hidden)
+                    if (player.getSeeInvis() < awopc.getHidden())
                         continue;
 
                     lcm = new LoadCharacterMsg(awopc, PlayerCharacter.hideNonAscii());
@@ -467,7 +467,7 @@ public enum InterestManager implements Runnable {
                     if (awonpc.despawned == true)
                         continue;
 
-                    awonpc.playerAgroMap.put(player.getObjectUUID(), 0f);
+                    awonpc.playerAgroMap.put(player.getObjectUUID(), false);
                     ((Mob) awonpc).setCombatTarget(null);
                     lcm = new LoadCharacterMsg(awonpc, PlayerCharacter.hideNonAscii());
 
@@ -480,9 +480,9 @@ public enum InterestManager implements Runnable {
                     if (!awonpc.isAlive())
                         continue;
 
-                    awonpc.playerAgroMap.put(player.getObjectUUID(), 0f);
+                    awonpc.playerAgroMap.put(player.getObjectUUID(), false);
 
-                    if ((awonpc.agentType.equals(mbEnums.AIAgentType.MOBILE)))
+                    if ((awonpc.agentType.equals(Enum.AIAgentType.MOBILE)))
                         ((Mob) awonpc).setCombatTarget(null);
 
                     lcm = new LoadCharacterMsg(awonpc, PlayerCharacter.hideNonAscii());
@@ -492,7 +492,7 @@ public enum InterestManager implements Runnable {
 
                 if (lcm != null) {
                     Dispatch dispatch = Dispatch.borrow(player, lcm);
-                    DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
+                    DispatchMessage.dispatchMsgDispatch(dispatch, DispatchChannel.PRIMARY);
                 }
 
 

src/engine/InterestManagement/RealmMap.java

@@ -8,10 +8,14 @@
 
 package engine.InterestManagement;
 
-import engine.gameManager.DispatchManager;
+/* This class is the main interface for Magicbane's
+ *  Interest management facilities.
+ */
+
+import engine.Enum;
 import engine.math.Vector3fImmutable;
-import engine.mbEnums;
 import engine.net.Dispatch;
+import engine.net.DispatchMessage;
 import engine.net.client.msg.TerritoryChangeMessage;
 import engine.objects.City;
 import engine.objects.PlayerCharacter;
@@ -27,18 +31,11 @@ import static engine.objects.Realm.getRealm;
 
 public enum RealmMap {
 
-    // MB Dev Notes:
-    // This class loads and caches realm maps used by each
-    // map set for its realm overlay.  The RealmMap loaded is
-    // controlled by config entry MB_WORLD_REALMMAP
-    //
-    // Unlike a Heightmap this is a just color lookup; identical to
-    // the old image maps used in 90s web technology.
-    //
-    // Realm Map images are stored on disk in /mb.data/realmmaps/
-
     REALM_MAP;
 
+    // Spatial hashmap.  Used for determining which Realm
+    // a player is currently located within.
+
     private static final HashMap<Color, Integer> _rgbToIDMap = new HashMap<>();
     public static int[][] _realmImageMap;
 
@@ -68,7 +65,7 @@ public enum RealmMap {
 
     public static Realm getRealmForCity(City city) {
         Realm outRealm = null;
-        outRealm = city.realm;
+        outRealm = city.getRealm();
         return outRealm;
     }
 
@@ -91,17 +88,17 @@ public enum RealmMap {
                     if (city != null) {
                         TerritoryChangeMessage tcm = new TerritoryChangeMessage((PlayerCharacter) realm.getRulingCity().getOwner(), realm);
                         Dispatch dispatch = Dispatch.borrow(player, tcm);
-                        DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
+                        DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.PRIMARY);
                     } else {
                         TerritoryChangeMessage tcm = new TerritoryChangeMessage(null, realm);
                         Dispatch dispatch = Dispatch.borrow(player, tcm);
-                        DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
+                        DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.PRIMARY);
                     }
 
                 } else {
                     TerritoryChangeMessage tcm = new TerritoryChangeMessage(null, realm);
                     Dispatch dispatch = Dispatch.borrow(player, tcm);
-                    DispatchManager.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
+                    DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.PRIMARY);
                 }
             }
 

src/engine/InterestManagement/Terrain.java

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

src/engine/InterestManagement/WorldGrid.java

@@ -8,11 +8,11 @@
 
 package engine.InterestManagement;
 
-import engine.gameManager.DispatchManager;
+import engine.Enum.GridObjectType;
 import engine.math.FastMath;
 import engine.math.Vector3f;
 import engine.math.Vector3fImmutable;
-import engine.mbEnums.GridObjectType;
+import engine.net.DispatchMessage;
 import engine.net.client.ClientConnection;
 import engine.net.client.msg.LoadCharacterMsg;
 import engine.net.client.msg.LoadStructureMsg;
@@ -201,7 +201,7 @@ public class WorldGrid {
 
         UnloadObjectsMsg uom = new UnloadObjectsMsg();
         uom.addObject(awo);
-        DispatchManager.sendToAllInRange(awo, uom);
+        DispatchMessage.sendToAllInRange(awo, uom);
     }
 
     public static void loadObject(AbstractWorldObject awo) {
@@ -213,15 +213,15 @@ public class WorldGrid {
             case Building:
                 lsm = new LoadStructureMsg();
                 lsm.addObject((Building) awo);
-                DispatchManager.sendToAllInRange(awo, lsm);
+                DispatchMessage.sendToAllInRange(awo, lsm);
                 break;
             case NPC:
                 lcm = new LoadCharacterMsg((NPC) awo, false);
-                DispatchManager.sendToAllInRange(awo, lcm);
+                DispatchMessage.sendToAllInRange(awo, lcm);
                 break;
             case Mob:
                 lcm = new LoadCharacterMsg((Mob) awo, false);
-                DispatchManager.sendToAllInRange(awo, lcm);
+                DispatchMessage.sendToAllInRange(awo, lcm);
                 break;
             default:
                 // *** Refactor: Log error?
@@ -239,19 +239,19 @@ public class WorldGrid {
             case Building:
                 lsm = new LoadStructureMsg();
                 lsm.addObject((Building) awo);
-                DispatchManager.sendToAllInRange(awo, lsm);
+                DispatchMessage.sendToAllInRange(awo, lsm);
                 break;
             case NPC:
                 lcm = new LoadCharacterMsg((NPC) awo, false);
-                DispatchManager.sendToAllInRange(awo, lcm);
+                DispatchMessage.sendToAllInRange(awo, lcm);
                 break;
             case Mob:
                 lcm = new LoadCharacterMsg((Mob) awo, false);
-                DispatchManager.sendToAllInRange(awo, lcm);
+                DispatchMessage.sendToAllInRange(awo, lcm);
                 break;
             case PlayerCharacter:
                 lcm = new LoadCharacterMsg((PlayerCharacter) awo, false);
-                DispatchManager.sendToAllInRange(awo, lcm);
+                DispatchMessage.sendToAllInRange(awo, lcm);
                 break;
             default:
                 // *** Refactor: Log error?
@@ -263,7 +263,7 @@ public class WorldGrid {
                                     ClientConnection origin) {
         UnloadObjectsMsg uom = new UnloadObjectsMsg();
         uom.addObject(awo);
-        DispatchManager.sendToAllInRange(awo, uom);
+        DispatchMessage.sendToAllInRange(awo, uom);
     }
 
     public static void addObject(AbstractWorldObject awo, PlayerCharacter pc) {

src/engine/db/archive/BaneRecord.java

@@ -9,8 +9,8 @@
 
 package engine.db.archive;
 
+import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.Bane;
 import engine.objects.City;
 import engine.workthreads.WarehousePushThread;
@@ -21,7 +21,7 @@ import java.sql.*;
 import java.time.LocalDateTime;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import static engine.mbEnums.RecordEventType;
+import static engine.Enum.RecordEventType;
 
 public class BaneRecord extends DataRecord {
 
@@ -38,7 +38,7 @@ public class BaneRecord extends DataRecord {
     private DateTime baneDropTime;
 
     private BaneRecord(Bane bane) {
-        this.recordType = mbEnums.DataRecordType.BANE;
+        this.recordType = Enum.DataRecordType.BANE;
         this.eventType = RecordEventType.PENDING;
     }
 
@@ -51,7 +51,7 @@ public class BaneRecord extends DataRecord {
             baneRecord = new BaneRecord(bane);
             baneRecord.eventType = eventType;
         } else {
-            baneRecord.recordType = mbEnums.DataRecordType.BANE;
+            baneRecord.recordType = Enum.DataRecordType.BANE;
             baneRecord.eventType = eventType;
 
         }

src/engine/db/archive/CharacterRecord.java

@@ -9,8 +9,8 @@
 
 package engine.db.archive;
 
+import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.Guild;
 import engine.objects.PlayerCharacter;
 import engine.workthreads.WarehousePushThread;
@@ -33,7 +33,7 @@ public class CharacterRecord extends DataRecord {
     private PlayerCharacter player;
 
     private CharacterRecord(PlayerCharacter player) {
-        this.recordType = mbEnums.DataRecordType.CHARACTER;
+        this.recordType = Enum.DataRecordType.CHARACTER;
         this.player = player;
     }
 
@@ -45,7 +45,7 @@ public class CharacterRecord extends DataRecord {
         if (characterRecord == null) {
             characterRecord = new CharacterRecord(player);
         } else {
-            characterRecord.recordType = mbEnums.DataRecordType.CHARACTER;
+            characterRecord.recordType = Enum.DataRecordType.CHARACTER;
             characterRecord.player = player;
 
         }

src/engine/db/archive/CityRecord.java

@@ -9,8 +9,8 @@
 
 package engine.db.archive;
 
+import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.City;
 import engine.workthreads.WarehousePushThread;
 
@@ -20,7 +20,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 public class CityRecord extends DataRecord {
 
     private static final LinkedBlockingQueue<CityRecord> recordPool = new LinkedBlockingQueue<>();
-    private mbEnums.RecordEventType eventType;
+    private Enum.RecordEventType eventType;
     private City city;
     private String cityHash;
     private String cityGuildHash;
@@ -32,13 +32,13 @@ public class CityRecord extends DataRecord {
     private java.time.LocalDateTime establishedDatetime;
 
     private CityRecord(City city) {
-        this.recordType = mbEnums.DataRecordType.CITY;
+        this.recordType = Enum.DataRecordType.CITY;
         this.city = city;
-        this.eventType = mbEnums.RecordEventType.CREATE;
+        this.eventType = Enum.RecordEventType.CREATE;
 
     }
 
-    public static CityRecord borrow(City city, mbEnums.RecordEventType eventType) {
+    public static CityRecord borrow(City city, Enum.RecordEventType eventType) {
         CityRecord cityRecord;
 
         cityRecord = recordPool.poll();
@@ -47,7 +47,7 @@ public class CityRecord extends DataRecord {
             cityRecord = new CityRecord(city);
             cityRecord.eventType = eventType;
         } else {
-            cityRecord.recordType = mbEnums.DataRecordType.CITY;
+            cityRecord.recordType = Enum.DataRecordType.CITY;
             cityRecord.eventType = eventType;
             cityRecord.city = city;
 
@@ -67,9 +67,9 @@ public class CityRecord extends DataRecord {
         cityRecord.locX = cityRecord.city.getTOL().getLoc().x;
         cityRecord.locY = -cityRecord.city.getTOL().getLoc().z; // flip sign on 'y' coordinate
 
-        cityRecord.zoneHash = cityRecord.city.getParent().hash;
+        cityRecord.zoneHash = cityRecord.city.getParent().getHash();
 
-        if (cityRecord.eventType.equals(mbEnums.RecordEventType.CREATE))
+        if (cityRecord.eventType.equals(Enum.RecordEventType.CREATE))
             cityRecord.establishedDatetime = cityRecord.city.established;
         else
             cityRecord.establishedDatetime = java.time.LocalDateTime.now();

src/engine/db/archive/DataRecord.java

@@ -9,11 +9,11 @@
 
 package engine.db.archive;
 
-import engine.mbEnums;
+import engine.Enum;
 
 class DataRecord {
 
-    public mbEnums.DataRecordType recordType;
+    public Enum.DataRecordType recordType;
 
     DataRecord() {
 

src/engine/db/archive/DataWarehouse.java

@@ -22,7 +22,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import static engine.mbEnums.DataRecordType;
+import static engine.Enum.DataRecordType;
 
 public class DataWarehouse implements Runnable {
 

src/engine/db/archive/GuildRecord.java

@@ -9,9 +9,9 @@
 
 package engine.db.archive;
 
+import engine.Enum;
+import engine.Enum.RecordEventType;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
-import engine.mbEnums.RecordEventType;
 import engine.objects.Guild;
 import engine.workthreads.WarehousePushThread;
 
@@ -30,7 +30,7 @@ public class GuildRecord extends DataRecord {
     public static HashMap<Integer, GuildRecord> GuildRecordCache = null;
     public String guildHash;
     public int guildID;
-    private mbEnums.RecordEventType eventType;
+    private Enum.RecordEventType eventType;
     private Guild guild;
     private String guildName;
     private String charterName;
@@ -44,9 +44,9 @@ public class GuildRecord extends DataRecord {
     private java.time.LocalDateTime eventDatetime;
 
     private GuildRecord(Guild guild) {
-        this.recordType = mbEnums.DataRecordType.GUILD;
+        this.recordType = Enum.DataRecordType.GUILD;
         this.guild = guild;
-        this.eventType = mbEnums.RecordEventType.CREATE;
+        this.eventType = Enum.RecordEventType.CREATE;
     }
 
 
@@ -71,7 +71,7 @@ public class GuildRecord extends DataRecord {
     }
 
 
-    public static GuildRecord borrow(Guild guild, mbEnums.RecordEventType eventType) {
+    public static GuildRecord borrow(Guild guild, Enum.RecordEventType eventType) {
         GuildRecord guildRecord;
         //add
         guildRecord = recordPool.poll();
@@ -81,7 +81,7 @@ public class GuildRecord extends DataRecord {
             guildRecord.eventType = eventType;
         } else {
             guildRecord.guild = guild;
-            guildRecord.recordType = mbEnums.DataRecordType.GUILD;
+            guildRecord.recordType = Enum.DataRecordType.GUILD;
             guildRecord.eventType = eventType;
 
         }
@@ -89,8 +89,7 @@ public class GuildRecord extends DataRecord {
         guildRecord.guildHash = guildRecord.guild.getHash();
         guildRecord.guildID = guildRecord.guild.getObjectUUID();
         guildRecord.guildName = guildRecord.guild.getName();
-        mbEnums.GuildCharterType guildCharterType = guild.charter;
-        guildRecord.charterName = guildCharterType.name;
+        guildRecord.charterName = Enum.GuildType.getGuildTypeFromInt(guildRecord.guild.getCharter()).getCharterName();
 
         guildRecord.GLHash = DataWarehouse.hasher.encrypt(guildRecord.guild.getGuildLeaderUUID());
 

src/engine/db/archive/MineRecord.java

@@ -9,8 +9,8 @@
 
 package engine.db.archive;
 
+import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.AbstractCharacter;
 import engine.objects.Mine;
 import engine.objects.PlayerCharacter;
@@ -23,7 +23,7 @@ import java.util.concurrent.LinkedBlockingQueue;
 public class MineRecord extends DataRecord {
 
     private static final LinkedBlockingQueue<MineRecord> recordPool = new LinkedBlockingQueue<>();
-    private mbEnums.RecordEventType eventType;
+    private Enum.RecordEventType eventType;
     private String zoneHash;
     private String charHash;
     private String mineGuildHash;
@@ -33,12 +33,12 @@ public class MineRecord extends DataRecord {
     private float locY;
 
     private MineRecord() {
-        this.recordType = mbEnums.DataRecordType.MINE;
-        this.eventType = mbEnums.RecordEventType.CAPTURE;
+        this.recordType = Enum.DataRecordType.MINE;
+        this.eventType = Enum.RecordEventType.CAPTURE;
 
     }
 
-    public static MineRecord borrow(Mine mine, AbstractCharacter character, mbEnums.RecordEventType eventType) {
+    public static MineRecord borrow(Mine mine, AbstractCharacter character, Enum.RecordEventType eventType) {
 
         MineRecord mineRecord;
         mineRecord = recordPool.poll();
@@ -48,13 +48,13 @@ public class MineRecord extends DataRecord {
             mineRecord = new MineRecord();
             mineRecord.eventType = eventType;
         } else {
-            mineRecord.recordType = mbEnums.DataRecordType.MINE;
+            mineRecord.recordType = Enum.DataRecordType.MINE;
             mineRecord.eventType = eventType;
         }
 
-        mineRecord.zoneHash = mine.getParentZone().hash;
+        mineRecord.zoneHash = mine.getParentZone().getHash();
 
-        if (character.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter)) {
+        if (character.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
             player = (PlayerCharacter) character;
             mineRecord.charHash = player.getHash();
         } else

src/engine/db/archive/PvpRecord.java

@@ -23,8 +23,8 @@ import java.time.LocalDateTime;
 import java.util.LinkedList;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import static engine.mbEnums.DataRecordType;
-import static engine.mbEnums.PvpHistoryType;
+import static engine.Enum.DataRecordType;
+import static engine.Enum.PvpHistoryType;
 
 public class PvpRecord extends DataRecord {
 
@@ -281,7 +281,7 @@ public class PvpRecord extends DataRecord {
         outStatement.setInt(8, this.victim.getLevel());
 
         outStatement.setString(9, DataWarehouse.hasher.encrypt(zone.getObjectUUID()));
-        outStatement.setString(10, zone.zoneName);
+        outStatement.setString(10, zone.getName());
         outStatement.setFloat(11, this.location.getX());
         outStatement.setFloat(12, -this.location.getZ()); // flip sign on 'y' coordinate
         outStatement.setBoolean(13, this.pvpExp);

src/engine/db/archive/RealmRecord.java

@@ -9,8 +9,8 @@
 
 package engine.db.archive;
 
+import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.Realm;
 import engine.workthreads.WarehousePushThread;
 
@@ -23,20 +23,20 @@ public class RealmRecord extends DataRecord {
     private static final LinkedBlockingQueue<RealmRecord> recordPool = new LinkedBlockingQueue<>();
 
     private Realm realm;
-    private mbEnums.RecordEventType eventType;
+    private Enum.RecordEventType eventType;
     private String cityHash;
     private String guildHash;
     private String charterType;
     private LocalDateTime eventDateTime;
 
     private RealmRecord(Realm realm) {
-        this.recordType = mbEnums.DataRecordType.REALM;
+        this.recordType = Enum.DataRecordType.REALM;
         this.realm = realm;
-        this.eventType = mbEnums.RecordEventType.CAPTURE;
+        this.eventType = Enum.RecordEventType.CAPTURE;
 
     }
 
-    public static RealmRecord borrow(Realm realm, mbEnums.RecordEventType eventType) {
+    public static RealmRecord borrow(Realm realm, Enum.RecordEventType eventType) {
         RealmRecord realmRecord;
 
         realmRecord = recordPool.poll();
@@ -45,7 +45,7 @@ public class RealmRecord extends DataRecord {
             realmRecord = new RealmRecord(realm);
             realmRecord.eventType = eventType;
         } else {
-            realmRecord.recordType = mbEnums.DataRecordType.REALM;
+            realmRecord.recordType = Enum.DataRecordType.REALM;
             realmRecord.eventType = eventType;
             realmRecord.realm = realm;
 
@@ -53,9 +53,9 @@ public class RealmRecord extends DataRecord {
 
         realmRecord.cityHash = realm.getRulingCity().getHash();
         realmRecord.guildHash = realm.getRulingCity().getGuild().getHash();
-        realmRecord.charterType = mbEnums.CharterType.getCharterTypeByID(realmRecord.realm.getCharterType()).name();
+        realmRecord.charterType = Enum.CharterType.getCharterTypeByID(realmRecord.realm.getCharterType()).name();
 
-        if (realmRecord.eventType.equals(mbEnums.RecordEventType.CAPTURE))
+        if (realmRecord.eventType.equals(Enum.RecordEventType.CAPTURE))
             realmRecord.eventDateTime = realm.ruledSince;
         else
             realmRecord.eventDateTime = LocalDateTime.now();

src/engine/db/handlers/dbAccountHandler.java

@@ -9,10 +9,10 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
+import engine.Enum.GameObjectType;
 import engine.gameManager.ConfigManager;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
-import engine.mbEnums.GameObjectType;
 import engine.objects.Account;
 import engine.objects.PlayerCharacter;
 import org.pmw.tinylog.Logger;
@@ -27,7 +27,7 @@ public class dbAccountHandler extends dbHandlerBase {
 
     public dbAccountHandler() {
         this.localClass = Account.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public Account GET_ACCOUNT(int accountID) {
@@ -204,7 +204,7 @@ public class dbAccountHandler extends dbHandlerBase {
         if (account != null) {
             account.runAfterLoad();
 
-            if (ConfigManager.serverType.equals(mbEnums.ServerType.LOGINSERVER))
+            if (ConfigManager.serverType.equals(Enum.ServerType.LOGINSERVER))
                 Account.AccountsMap.put(uname, account.getObjectUUID());
 
         }

src/engine/db/handlers/dbBaseClassHandler.java

@@ -9,9 +9,9 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
+import engine.Enum.GameObjectType;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
-import engine.mbEnums.GameObjectType;
 import engine.objects.BaseClass;
 import org.pmw.tinylog.Logger;
 
@@ -25,7 +25,7 @@ public class dbBaseClassHandler extends dbHandlerBase {
 
     public dbBaseClassHandler() {
         this.localClass = BaseClass.class;
-        this.localObjectType = mbEnums.GameObjectType.BaseClass;
+        this.localObjectType = Enum.GameObjectType.BaseClass;
     }
 
     public BaseClass GET_BASE_CLASS(final int id) {

src/engine/db/handlers/dbBoonHandler.java

@@ -0,0 +1,51 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.db.handlers;
+
+import engine.gameManager.DbManager;
+import engine.objects.Boon;
+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;
+
+public class dbBoonHandler extends dbHandlerBase {
+
+    public dbBoonHandler() {
+    }
+
+
+    public ArrayList<Boon> GET_BOON_AMOUNTS_FOR_ITEMBASE(int itemBaseUUID) {
+
+        ArrayList<Boon> boons = new ArrayList<>();
+        Boon thisBoon;
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_item_boons`  WHERE `itemBaseID` = ?")) {
+
+            preparedStatement.setInt(1, itemBaseUUID);
+
+            ResultSet rs = preparedStatement.executeQuery();
+
+            while (rs.next()) {
+                thisBoon = new Boon(rs);
+                boons.add(thisBoon);
+            }
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+
+        return boons;
+    }
+}

src/engine/db/handlers/dbBuildingHandler.java

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

src/engine/db/handlers/dbBuildingLocationHandler.java

@@ -10,7 +10,6 @@
 package engine.db.handlers;
 
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.BuildingLocation;
 import org.pmw.tinylog.Logger;
 
@@ -24,7 +23,7 @@ public class dbBuildingLocationHandler extends dbHandlerBase {
 
     public dbBuildingLocationHandler() {
         this.localClass = BuildingLocation.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public ArrayList<BuildingLocation> LOAD_BUILDING_LOCATIONS() {

src/engine/db/handlers/dbCSSessionHandler.java

@@ -10,7 +10,6 @@
 package engine.db.handlers;
 
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.Account;
 import engine.objects.PlayerCharacter;
 import engine.session.CSSession;
@@ -27,7 +26,7 @@ public class dbCSSessionHandler extends dbHandlerBase {
 
     public dbCSSessionHandler() {
         this.localClass = CSSession.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public boolean ADD_CSSESSION(String secKey, Account acc, InetAddress inet, String machineID) {

src/engine/db/handlers/dbCharacterPowerHandler.java

@@ -9,8 +9,8 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.CharacterPower;
 import engine.objects.PlayerCharacter;
 import engine.server.MBServerStatics;
@@ -23,7 +23,7 @@ public class dbCharacterPowerHandler extends dbHandlerBase {
 
     public dbCharacterPowerHandler() {
         this.localClass = CharacterPower.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public CharacterPower ADD_CHARACTER_POWER(CharacterPower toAdd) {
@@ -74,7 +74,7 @@ public class dbCharacterPowerHandler extends dbHandlerBase {
 
     public CharacterPower GET_CHARACTER_POWER(int objectUUID) {
 
-        CharacterPower characterPower = (CharacterPower) DbManager.getFromCache(mbEnums.GameObjectType.CharacterPower, objectUUID);
+        CharacterPower characterPower = (CharacterPower) DbManager.getFromCache(Enum.GameObjectType.CharacterPower, objectUUID);
 
         if (characterPower != null)
             return characterPower;

src/engine/db/handlers/dbCharacterRuneHandler.java

@@ -9,8 +9,8 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.CharacterRune;
 import org.pmw.tinylog.Logger;
 
@@ -21,7 +21,7 @@ public class dbCharacterRuneHandler extends dbHandlerBase {
 
     public dbCharacterRuneHandler() {
         this.localClass = CharacterRune.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public CharacterRune ADD_CHARACTER_RUNE(final CharacterRune toAdd) {
@@ -49,7 +49,7 @@ public class dbCharacterRuneHandler extends dbHandlerBase {
 
     public CharacterRune GET_CHARACTER_RUNE(int runeID) {
 
-        CharacterRune characterRune = (CharacterRune) DbManager.getFromCache(mbEnums.GameObjectType.CharacterRune, runeID);
+        CharacterRune characterRune = (CharacterRune) DbManager.getFromCache(Enum.GameObjectType.CharacterRune, runeID);
 
         if (characterRune != null)
             return characterRune;

src/engine/db/handlers/dbCharacterSkillHandler.java

@@ -9,8 +9,8 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.AbstractCharacter;
 import engine.objects.CharacterSkill;
 import engine.objects.PlayerCharacter;
@@ -24,7 +24,7 @@ public class dbCharacterSkillHandler extends dbHandlerBase {
 
     public dbCharacterSkillHandler() {
         this.localClass = CharacterSkill.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public CharacterSkill ADD_SKILL(CharacterSkill toAdd) {
@@ -72,7 +72,7 @@ public class dbCharacterSkillHandler extends dbHandlerBase {
 
     public CharacterSkill GET_SKILL(final int objectUUID) {
 
-        CharacterSkill characterSkill = (CharacterSkill) DbManager.getFromCache(mbEnums.GameObjectType.CharacterSkill, objectUUID);
+        CharacterSkill characterSkill = (CharacterSkill) DbManager.getFromCache(Enum.GameObjectType.CharacterSkill, objectUUID);
 
         if (characterSkill != null)
             return characterSkill;
@@ -95,7 +95,7 @@ public class dbCharacterSkillHandler extends dbHandlerBase {
 
         ConcurrentHashMap<String, CharacterSkill> characterSkills = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
 
-        if (ac == null || (!(ac.getObjectType().equals(mbEnums.GameObjectType.PlayerCharacter))))
+        if (ac == null || (!(ac.getObjectType().equals(Enum.GameObjectType.PlayerCharacter))))
             return characterSkills;
 
         PlayerCharacter playerCharacter = (PlayerCharacter) ac;

src/engine/db/handlers/dbCityHandler.java

@@ -9,8 +9,8 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.AbstractGameObject;
 import engine.objects.Building;
 import engine.objects.City;
@@ -25,7 +25,7 @@ public class dbCityHandler extends dbHandlerBase {
 
     public dbCityHandler() {
         this.localClass = City.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public static void addObject(ArrayList<AbstractGameObject> list, ResultSet rs) throws SQLException {
@@ -34,42 +34,40 @@ public class dbCityHandler extends dbHandlerBase {
             case "zone":
                 Zone zone = new Zone(rs);
                 DbManager.addToCache(zone);
-                zone.runAfterLoad();
                 list.add(zone);
                 break;
             case "building":
                 Building building = new Building(rs);
                 DbManager.addToCache(building);
-                building.runAfterLoad();
                 list.add(building);
                 break;
             case "city":
                 City city = new City(rs);
                 DbManager.addToCache(city);
-                city.runAfterLoad();
                 list.add(city);
                 break;
         }
     }
 
-    public ArrayList<AbstractGameObject> CREATE_CITY(int ownerID, int parentZoneID, float xCoord, float yCoord, float zCoord, float rotation, float W, String name, LocalDateTime established) {
+    public ArrayList<AbstractGameObject> CREATE_CITY(int ownerID, int parentZoneID, int realmID, float xCoord, float yCoord, float zCoord, float rotation, float W, String name, LocalDateTime established) {
 
         LocalDateTime upgradeTime = LocalDateTime.now().plusHours(2);
         ArrayList<AbstractGameObject> objectList = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("CALL `city_CREATE`(?, ?, ?, ?, ?, ?, ?, ?,?,?)")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("CALL `city_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?,?,?)")) {
 
             preparedStatement.setLong(1, ownerID); //objectUUID of owning player
             preparedStatement.setLong(2, parentZoneID); //objectUUID of parent (continent) zone
-            preparedStatement.setFloat(3, xCoord); //xOffset from parentZone center
-            preparedStatement.setFloat(4, yCoord); //yOffset from parentZone center
-            preparedStatement.setFloat(5, zCoord); //zOffset from parentZone center
-            preparedStatement.setString(6, name); //city name
-            preparedStatement.setTimestamp(7, Timestamp.valueOf(established));
-            preparedStatement.setFloat(8, rotation);
-            preparedStatement.setFloat(9, W);
-            preparedStatement.setTimestamp(10, Timestamp.valueOf(upgradeTime));
+            preparedStatement.setLong(3, realmID); //objectUUID of realm city belongs in
+            preparedStatement.setFloat(4, xCoord); //xOffset from parentZone center
+            preparedStatement.setFloat(5, yCoord); //yOffset from parentZone center
+            preparedStatement.setFloat(6, zCoord); //zOffset from parentZone center
+            preparedStatement.setString(7, name); //city name
+            preparedStatement.setTimestamp(8, Timestamp.valueOf(established));
+            preparedStatement.setFloat(9, rotation);
+            preparedStatement.setFloat(10, W);
+            preparedStatement.setTimestamp(11, Timestamp.valueOf(upgradeTime));
 
             boolean work = preparedStatement.execute();
 
@@ -98,12 +96,14 @@ public class dbCityHandler extends dbHandlerBase {
         return objectList;
     }
 
-    public ArrayList<City> GET_ALL_CITIES() {
+    public ArrayList<City> GET_CITIES_BY_ZONE(final int objectUUID) {
 
         ArrayList<City> cityList = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_city`.*, `object`.`parent` FROM `obj_city` INNER JOIN `object` ON `object`.`UID` = `obj_city`.`UID` ORDER BY `object`.`UID` ASC;")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_city`.*, `object`.`parent` FROM `obj_city` INNER JOIN `object` ON `object`.`UID` = `obj_city`.`UID` WHERE `object`.`parent`=?;")) {
+
+            preparedStatement.setLong(1, objectUUID);
 
             ResultSet rs = preparedStatement.executeQuery();
             cityList = getObjectsFromRs(rs, 100);
@@ -117,7 +117,7 @@ public class dbCityHandler extends dbHandlerBase {
 
     public City GET_CITY(final int cityId) {
 
-        City city = (City) DbManager.getFromCache(mbEnums.GameObjectType.City, cityId);
+        City city = (City) DbManager.getFromCache(Enum.GameObjectType.City, cityId);
 
         if (city != null)
             return city;

src/engine/db/handlers/dbContractHandler.java

@@ -9,11 +9,11 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.gameManager.ItemManager;
-import engine.mbEnums;
 import engine.objects.Contract;
-import engine.objects.Item;
+import engine.objects.ItemBase;
+import engine.objects.MobEquipment;
 import org.pmw.tinylog.Logger;
 
 import java.sql.Connection;
@@ -25,12 +25,12 @@ public class dbContractHandler extends dbHandlerBase {
 
     public dbContractHandler() {
         this.localClass = Contract.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public Contract GET_CONTRACT(final int objectUUID) {
 
-        Contract contract = (Contract) DbManager.getFromCache(mbEnums.GameObjectType.Contract, objectUUID);
+        Contract contract = (Contract) DbManager.getFromCache(Enum.GameObjectType.Contract, objectUUID);
 
         if (contract != null)
             return contract;
@@ -63,12 +63,33 @@ public class dbContractHandler extends dbHandlerBase {
 
             while (rs.next()) {
 
-                int templateID = rs.getInt("templateID");
+                //handle item base
+                int itemBaseID = rs.getInt("itembaseID");
 
-                Item item = new Item(templateID);
-                item.objectUUID = ItemManager.lastNegativeID.decrementAndGet();
-                contract.getSellInventory().add(item);
+                ItemBase ib = ItemBase.getItemBase(itemBaseID);
 
+                if (ib != null) {
+
+                    MobEquipment me = new MobEquipment(ib, 0, 0);
+                    contract.getSellInventory().add(me);
+
+                    //handle magic effects
+                    String prefix = rs.getString("prefix");
+                    int pRank = rs.getInt("pRank");
+                    String suffix = rs.getString("suffix");
+                    int sRank = rs.getInt("sRank");
+
+                    if (prefix != null) {
+                        me.setPrefix(prefix, pRank);
+                        me.setIsID(true);
+                    }
+
+                    if (suffix != null) {
+                        me.setSuffix(suffix, sRank);
+                        me.setIsID(true);
+                    }
+
+                }
             }
         } catch (SQLException e) {
             Logger.error(e);
@@ -106,12 +127,12 @@ public class dbContractHandler extends dbHandlerBase {
         }
     }
 
-    public boolean updateAllowedBuildings(final Contract con) {
+    public boolean updateAllowedBuildings(final Contract con, final long slotbitvalue) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `static_npc_contract` SET `slotInBuildings`=? WHERE `contractID`=?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `static_npc_contract` SET `allowedBuildingTypeID`=? WHERE `contractID`=?")) {
 
-            preparedStatement.setString(1, mbEnums.asString(con.allowedBuildings));
+            preparedStatement.setLong(1, slotbitvalue);
             preparedStatement.setInt(2, con.getContractID());
 
             return (preparedStatement.executeUpdate() > 0);
@@ -126,7 +147,7 @@ public class dbContractHandler extends dbHandlerBase {
 
         try (Connection connection = DbManager.getConnection();
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `static_npc_contract` SET `contractID`=?, `name`=?, "
-                     + "`mobbaseID`=?, `classID`=?, vendorDialog=?, iconID=?, slotInBuildings=? WHERE `ID`=?")) {
+                     + "`mobbaseID`=?, `classID`=?, vendorDialog=?, iconID=?, allowedBuildingTypeID=? WHERE `ID`=?")) {
 
             preparedStatement.setInt(1, con.getContractID());
             preparedStatement.setString(2, con.getName());
@@ -135,7 +156,7 @@ public class dbContractHandler extends dbHandlerBase {
             preparedStatement.setInt(5, (con.getVendorDialog() != null) ? con.getVendorDialog().getObjectUUID() : 0);
             preparedStatement.setInt(6, con.getIconID());
             preparedStatement.setInt(8, con.getObjectUUID());
-            preparedStatement.setString(7, mbEnums.asString(con.allowedBuildings));
+            preparedStatement.setLong(7, con.getAllowedBuildings().toLong());
 
             return (preparedStatement.executeUpdate() > 0);
 

src/engine/db/handlers/dbEffectsBaseHandler.java

@@ -9,9 +9,9 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
 import engine.gameManager.DbManager;
 import engine.gameManager.PowersManager;
-import engine.mbEnums;
 import engine.powers.EffectsBase;
 import engine.powers.effectmodifiers.*;
 import org.pmw.tinylog.Logger;
@@ -63,7 +63,7 @@ public class dbEffectsBaseHandler extends dbHandlerBase {
 
                 IDString = rs.getString("IDString");
                 EffectsBase effectBase = PowersManager.getEffectByIDString(IDString);
-                mbEnums.ModType modifier = mbEnums.ModType.GetModType(rs.getString("modType"));
+                Enum.ModType modifier = Enum.ModType.GetModType(rs.getString("modType"));
 
                 //combine item prefix and suffix effect modifiers
 
@@ -86,7 +86,7 @@ public class dbEffectsBaseHandler extends dbHandlerBase {
 
     }
 
-    private static AbstractEffectModifier getCombinedModifiers(AbstractEffectModifier abstractEffectModifier, ResultSet rs, EffectsBase effectBase, mbEnums.ModType modifier) throws SQLException {
+    private static AbstractEffectModifier getCombinedModifiers(AbstractEffectModifier abstractEffectModifier, ResultSet rs, EffectsBase effectBase, Enum.ModType modifier) throws SQLException {
         switch (modifier) {
             case AdjustAboveDmgCap:
                 abstractEffectModifier = new AdjustAboveDmgCapEffectModifier(rs);

src/engine/db/handlers/dbEffectsResourceCostHandler.java

@@ -10,49 +10,38 @@
 package engine.db.handlers;
 
 import engine.gameManager.DbManager;
-import engine.gameManager.PowersManager;
-import engine.mbEnums;
 import engine.objects.EffectsResourceCosts;
-import org.json.JSONObject;
 import org.pmw.tinylog.Logger;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.HashMap;
+import java.util.ArrayList;
 
 public class dbEffectsResourceCostHandler extends dbHandlerBase {
 
     public dbEffectsResourceCostHandler() {
         this.localClass = EffectsResourceCosts.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
-    public void LOAD_ALL_COSTMAPS() {
+    public ArrayList<EffectsResourceCosts> GET_ALL_EFFECT_RESOURCES(String idString) {
+
+        ArrayList<EffectsResourceCosts> effectsResourceCosts = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_effect_costmaps`")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_power_effectcost`  WHERE `IDString` = ?")) {
+
+            preparedStatement.setString(1, idString);
 
             ResultSet rs = preparedStatement.executeQuery();
-
-            while (rs.next()) {
-                String effectID = rs.getString("effectID");
-                String costString = rs.getString("costmap");
-                JSONObject costJSON = new JSONObject(costString);
-                HashMap<mbEnums.ResourceType, Integer> costmap = new HashMap<>();
-
-                for (String key : costJSON.keySet()) {
-                    int value = costJSON.getInt(key);
-                    costmap.put(mbEnums.ResourceType.valueOf(key), value);
-                }
-
-                PowersManager._effect_costMaps.put(effectID, costmap);
-            }
+            effectsResourceCosts = getObjectsFromRs(rs, 1000);
 
         } catch (SQLException e) {
             Logger.error(e);
         }
-    }
 
+        return effectsResourceCosts;
+    }
 }

src/engine/db/handlers/dbGuildHandler.java

@@ -9,9 +9,9 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
+import engine.Enum.GuildHistoryType;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
-import engine.mbEnums.GuildHistoryType;
 import engine.objects.*;
 import engine.server.world.WorldServer;
 import org.joda.time.DateTime;
@@ -24,7 +24,7 @@ public class dbGuildHandler extends dbHandlerBase {
 
     public dbGuildHandler() {
         this.localClass = Guild.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public static ArrayList<PlayerCharacter> GET_GUILD_BANISHED(final int id) {
@@ -276,7 +276,7 @@ public class dbGuildHandler extends dbHandlerBase {
 
     public Guild GET_GUILD(int id) {
 
-        Guild guild = (Guild) DbManager.getFromCache(mbEnums.GameObjectType.Guild, id);
+        Guild guild = (Guild) DbManager.getFromCache(Enum.GameObjectType.Guild, id);
 
         if (guild != null)
             return guild;
@@ -427,7 +427,7 @@ public class dbGuildHandler extends dbHandlerBase {
             preparedStatement.setInt(6, guildTag.symbolColor);
             preparedStatement.setInt(7, guildTag.backgroundDesign);
             preparedStatement.setInt(8, guildTag.symbol);
-            preparedStatement.setInt(9, g.charter.templateID);
+            preparedStatement.setInt(9, g.getCharter());
             preparedStatement.setString(10, g.getLeadershipType());
             preparedStatement.setString(11, g.getMotto());
 
@@ -573,7 +573,7 @@ public class dbGuildHandler extends dbHandlerBase {
             preparedStatement.setInt(4, g.getGuildTag().symbolColor);
             preparedStatement.setInt(5, g.getGuildTag().backgroundDesign);
             preparedStatement.setInt(6, g.getGuildTag().symbol);
-            preparedStatement.setInt(7, g.charter.templateID);
+            preparedStatement.setInt(7, g.getCharter());
             preparedStatement.setString(8, g.getMOTD());
             preparedStatement.setString(9, g.getICMOTD());
             preparedStatement.setString(10, "");
@@ -695,4 +695,24 @@ public class dbGuildHandler extends dbHandlerBase {
         }
     }
 
+    //TODO uncomment this when finished with guild history warehouse integration
+//	public HashMap<Integer, GuildRecord> GET_WAREHOUSE_GUILD_HISTORY(){
+//		
+//		HashMap<Integer, GuildRecord> tempMap = new HashMap<>();
+//		prepareCallable("SELECT * FROM `warehouse_guildhistory` WHERE `eventType` = 'CREATE'");
+//		try {
+//			ResultSet rs = executeQuery();
+//			
+//			while (rs.next()) {
+//				GuildRecord guildRecord = new GuildRecord(rs);
+//				tempMap.put(guildRecord.guildID, guildRecord);
+//			}
+//		}catch (Exception e){
+//			Logger.error(e);
+//		}
+//		return tempMap;
+//		
+//	}
+
+
 }

src/engine/db/handlers/dbHandlerBase.java

@@ -9,10 +9,10 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
+import engine.Enum.GameObjectType;
 import engine.gameManager.ConfigManager;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
-import engine.mbEnums.GameObjectType;
 import engine.objects.AbstractGameObject;
 import engine.objects.AbstractWorldObject;
 import org.pmw.tinylog.Logger;
@@ -42,7 +42,7 @@ public abstract class dbHandlerBase {
         // Only call runAfterLoad() for objects instanced on the world server
 
         if ((abstractGameObject != null && abstractGameObject instanceof AbstractWorldObject) &&
-                (ConfigManager.serverType.equals(mbEnums.ServerType.WORLDSERVER) ||
+                (ConfigManager.serverType.equals(Enum.ServerType.WORLDSERVER) ||
                         (abstractGameObject.getObjectType() == GameObjectType.Guild)))
             ((AbstractWorldObject) abstractGameObject).runAfterLoad();
 

src/engine/db/handlers/dbHeightMapHandler.java

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

src/engine/db/handlers/dbItemBaseHandler.java

@@ -0,0 +1,138 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.db.handlers;
+
+import engine.gameManager.DbManager;
+import engine.objects.ItemBase;
+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;
+
+public class dbItemBaseHandler extends dbHandlerBase {
+
+    public dbItemBaseHandler() {
+
+    }
+
+    public void LOAD_BAKEDINSTATS(ItemBase itemBase) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_item_bakedinstat` WHERE `itemID` = ?")) {
+
+            preparedStatement.setInt(1, itemBase.getUUID());
+            ResultSet rs = preparedStatement.executeQuery();
+
+            while (rs.next()) {
+                if (rs.getBoolean("fromUse"))
+                    itemBase.getUsedStats().put(rs.getInt("token"), rs.getInt("numTrains"));
+                else
+                    itemBase.getBakedInStats().put(rs.getInt("token"), rs.getInt("numTrains"));
+            }
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+    }
+
+    public void LOAD_ANIMATIONS(ItemBase itemBase) {
+
+        ArrayList<Integer> tempList = new ArrayList<>();
+        ArrayList<Integer> tempListOff = new ArrayList<>();
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_itembase_animations` WHERE `itemBaseUUID` = ?")) {
+
+            preparedStatement.setInt(1, itemBase.getUUID());
+            ResultSet rs = preparedStatement.executeQuery();
+
+            while (rs.next()) {
+                int animation = rs.getInt("animation");
+                boolean rightHand = rs.getBoolean("rightHand");
+
+                if (rightHand)
+                    tempList.add(animation);
+                else
+                    tempListOff.add(animation);
+            }
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+
+        itemBase.setAnimations(tempList);
+        itemBase.setOffHandAnimations(tempListOff);
+    }
+
+    public void LOAD_ALL_ITEMBASES() {
+
+        ItemBase itemBase;
+        int recordsRead = 0;
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_itembase")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+
+            while (rs.next()) {
+                recordsRead++;
+                itemBase = new ItemBase(rs);
+                ItemBase.addToCache(itemBase);
+            }
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+
+        Logger.info("read: " + recordsRead + " cached: " + ItemBase.getUUIDCache().size());
+    }
+
+    public HashMap<Integer, ArrayList<Integer>> LOAD_RUNES_FOR_NPC_AND_MOBS() {
+
+        HashMap<Integer, ArrayList<Integer>> runeSets = new HashMap<>();
+        int runeSetID;
+        int runeBaseID;
+        int recordsRead = 0;
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_npc_runeSet")) {
+
+            ResultSet rs = preparedStatement.executeQuery();
+
+            while (rs.next()) {
+
+                recordsRead++;
+
+                runeSetID = rs.getInt("runeSet");
+                runeBaseID = rs.getInt("runeBase");
+
+                if (runeSets.get(runeSetID) == null) {
+                    ArrayList<Integer> runeList = new ArrayList<>();
+                    runeList.add(runeBaseID);
+                    runeSets.put(runeSetID, runeList);
+                } else {
+                    ArrayList<Integer> runeList = runeSets.get(runeSetID);
+                    runeList.add(runeSetID);
+                    runeSets.put(runeSetID, runeList);
+                }
+            }
+
+        } catch (SQLException e) {
+            Logger.error(e);
+            return runeSets;
+        }
+
+        Logger.info("read: " + recordsRead + " cached: " + runeSets.size());
+        return runeSets;
+    }
+
+}

src/engine/db/handlers/dbItemHandler.java

@@ -9,15 +9,12 @@
 
 package engine.db.handlers;
 
+import engine.Enum.ItemContainerType;
+import engine.Enum.ItemType;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
-import engine.mbEnums.ItemContainerType;
-import engine.mbEnums.ItemType;
 import engine.objects.AbstractCharacter;
 import engine.objects.CharacterItemManager;
 import engine.objects.Item;
-import engine.objects.ItemTemplate;
-import org.json.JSONObject;
 import org.pmw.tinylog.Logger;
 
 import java.sql.Connection;
@@ -25,7 +22,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 
 
@@ -33,7 +29,7 @@ public class dbItemHandler extends dbHandlerBase {
 
     public dbItemHandler() {
         this.localClass = Item.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     private static String formatTradeString(HashSet<Integer> list) {
@@ -56,56 +52,46 @@ public class dbItemHandler extends dbHandlerBase {
         return ret;
     }
 
-    public Item PERSIST(Item toAdd) {
+    public Item ADD_ITEM(Item toAdd) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("CALL `item_CREATE`(?, ?, ?, ?, ?, ?, ?, ?,?);")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("CALL `item_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?,?);")) {
 
-            preparedStatement.setInt(1, toAdd.ownerID);
-            preparedStatement.setInt(2, toAdd.templateID);
-            preparedStatement.setInt(3, (byte) toAdd.chargesRemaining);
-            preparedStatement.setInt(4, (short) toAdd.combat_health_current);
+            preparedStatement.setInt(1, toAdd.getOwnerID());
+            preparedStatement.setInt(2, toAdd.getItemBaseID());
+            preparedStatement.setInt(3, toAdd.getChargesRemaining());
+            preparedStatement.setInt(4, toAdd.getDurabilityCurrent());
+            preparedStatement.setInt(5, toAdd.getDurabilityMax());
 
             if (toAdd.getNumOfItems() < 1)
-                preparedStatement.setInt(5, 1);
+                preparedStatement.setInt(6, 1);
             else
-                preparedStatement.setInt(5, toAdd.getNumOfItems());
+                preparedStatement.setInt(6, toAdd.getNumOfItems());
 
             switch (toAdd.containerType) {
                 case INVENTORY:
-                    preparedStatement.setString(6, "inventory");
+                    preparedStatement.setString(7, "inventory");
                     break;
                 case EQUIPPED:
-                    preparedStatement.setString(6, "equip");
+                    preparedStatement.setString(7, "equip");
                     break;
                 case BANK:
-                    preparedStatement.setString(6, "bank");
+                    preparedStatement.setString(7, "bank");
                     break;
                 case VAULT:
-                    preparedStatement.setString(6, "vault");
+                    preparedStatement.setString(7, "vault");
                     break;
                 case FORGE:
-                    preparedStatement.setString(6, "forge");
+                    preparedStatement.setString(7, "forge");
                     break;
                 default:
-                    preparedStatement.setString(6, "none"); //Shouldn't be here
+                    preparedStatement.setString(7, "none"); //Shouldn't be here
                     break;
             }
 
-            if (toAdd.equipSlot.equals(mbEnums.EquipSlotType.NONE))
-                preparedStatement.setString(7, "");
-            else
-                preparedStatement.setString(7, toAdd.equipSlot.name());
-
-            String flagString = "";
-
-            for (mbEnums.ItemFlags itemflag : toAdd.flags)
-                flagString += itemflag.toString() + ";";
-
-            flagString = flagString.replaceAll(";$", "");
-
-            preparedStatement.setString(8, flagString);
-            preparedStatement.setString(9, toAdd.name);
+            preparedStatement.setByte(8, toAdd.getEquipSlot());
+            preparedStatement.setInt(9, toAdd.getFlags());
+            preparedStatement.setString(10, toAdd.getCustomName());
 
             ResultSet rs = preparedStatement.executeQuery();
 
@@ -162,7 +148,7 @@ public class dbItemHandler extends dbHandlerBase {
         ArrayList<Item> itemList;
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_item`.*, `object`.`parent`, `object`.`type` FROM `object` INNER JOIN `obj_item` ON `object`.`UID` = `obj_item`.`UID` WHERE `object`.`parent`=? && `obj_item`.`container`='equip';")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_item`.*, `object`.`parent`, `object`.`type` FROM `object` INNER JOIN `obj_item` ON `object`.`UID` = `obj_item`.`UID` WHERE `object`.`parent`=? && `obj_item`.`item_container`='equip';")) {
 
             preparedStatement.setLong(1, targetId);
             ResultSet rs = preparedStatement.executeQuery();
@@ -177,49 +163,6 @@ public class dbItemHandler extends dbHandlerBase {
         return itemList;
     }
 
-    public void LOAD_ITEM_TEMPLATES() {
-
-        HashMap<ItemType, Integer> templateTCountMap = new HashMap<>();
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_item_templates`;");
-             ResultSet rs = preparedStatement.executeQuery()) {
-
-            while (rs.next()) {
-                int templateID = rs.getInt("id");
-                JSONObject jsonObject = new JSONObject(rs.getString("template"));
-                ItemTemplate itemTemplate = new ItemTemplate(jsonObject);
-                itemTemplate.template_id = templateID;
-                ItemTemplate.templates.put(templateID, itemTemplate);
-
-                templateTCountMap.merge(itemTemplate.item_type, 1, Integer::sum);
-            }
-
-            Logger.info(templateTCountMap.toString());
-        } catch (Exception e) {
-            Logger.error(e);
-        }
-    }
-
-    public void LOAD_TEMPLATE_MODTABLES() {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_vendor_items`;");
-             ResultSet rs = preparedStatement.executeQuery()) {
-
-            while (rs.next()) {
-                int templateID = rs.getInt("templateID");
-                int modTable = rs.getInt("modTable");
-                ItemTemplate template = ItemTemplate.templates.get(templateID);
-                template.modTable = modTable;
-            }
-
-        } catch (Exception e) {
-            Logger.error(e);
-        }
-
-    }
-
     public Item GET_ITEM(final int itemUUID) {
 
         Item item;
@@ -299,7 +242,7 @@ public class dbItemHandler extends dbHandlerBase {
     public boolean MOVE_GOLD(final Item from, final Item to, final int amt) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `numberOfItems` = CASE WHEN `UID`=?  THEN ? WHEN `UID`=? THEN ? END WHERE `UID` IN (?, ?);")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_numberOfItems` = CASE WHEN `UID`=?  THEN ? WHEN `UID`=? THEN ? END WHERE `UID` IN (?, ?);")) {
 
             int newFromAmt = from.getNumOfItems() - amt;
             int newToAmt = to.getNumOfItems() + amt;
@@ -325,11 +268,11 @@ public class dbItemHandler extends dbHandlerBase {
 
         for (Item item : inventory) {
 
-            if (item.template.item_type.equals(ItemType.GOLD))
+            if (item.getItemBase().getType().equals(ItemType.GOLD))
                 continue;
 
             try (Connection connection = DbManager.getConnection();
-                 PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` LEFT JOIN `object` ON `object`.`UID` = `obj_item`.`UID` SET `object`.`parent`=NULL, `obj_item`.`container`='none' WHERE `object`.`UID`=?;")) {
+                 PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` LEFT JOIN `object` ON `object`.`UID` = `obj_item`.`UID` SET `object`.`parent`=NULL, `obj_item`.`item_container`='none' WHERE `object`.`UID`=?;")) {
 
                 preparedStatement.setLong(1, item.getObjectUUID());
                 worked = (preparedStatement.executeUpdate() > 0);
@@ -345,12 +288,12 @@ public class dbItemHandler extends dbHandlerBase {
         return worked;
     }
 
-    public HashSet<Integer> GET_VENDOR_CAN_ROLL_LIST(final int vendorID) {
+    public HashSet<Integer> GET_ITEMS_FOR_VENDOR(final int vendorID) {
 
         HashSet<Integer> itemSet = new HashSet<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT templateID FROM static_vendor_items WHERE vendorType = ?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT ID FROM static_itembase WHERE vendorType = ?")) {
 
             preparedStatement.setInt(1, vendorID);
 
@@ -368,8 +311,8 @@ public class dbItemHandler extends dbHandlerBase {
     }
 
     //Used to transfer a single item between owners or equip or vault or bank or inventory
-    public boolean UPDATE_OWNER(final Item item, int newOwnerID,
-                                ItemContainerType containerType, mbEnums.EquipSlotType slot) {
+    public boolean UPDATE_OWNER(final Item item, int newOwnerID, boolean ownerNPC, boolean ownerPlayer,
+                                boolean ownerAccount, ItemContainerType containerType, int slot) {
 
         boolean worked = false;
 
@@ -403,12 +346,7 @@ public class dbItemHandler extends dbHandlerBase {
                     preparedStatement.setString(3, "none"); //Shouldn't be here
                     break;
             }
-
-            if (slot.equals(mbEnums.EquipSlotType.NONE))
-                preparedStatement.setString(4, "");
-            else
-                preparedStatement.setString(4, slot.name());
-
+            preparedStatement.setInt(4, slot);
             ResultSet rs = preparedStatement.executeQuery();
 
             if (rs.next())
@@ -424,11 +362,11 @@ public class dbItemHandler extends dbHandlerBase {
     public boolean SET_DURABILITY(final Item item, int value) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `combat_health_current`=? WHERE `UID`=? AND `combat_health_current`=?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_durabilityCurrent`=? WHERE `UID`=? AND `item_durabilityCurrent`=?")) {
 
             preparedStatement.setInt(1, value);
             preparedStatement.setLong(2, item.getObjectUUID());
-            preparedStatement.setInt(3, (short) item.combat_health_current);
+            preparedStatement.setInt(3, item.getDurabilityCurrent());
 
             return (preparedStatement.executeUpdate() > 0);
 
@@ -441,7 +379,7 @@ public class dbItemHandler extends dbHandlerBase {
     public boolean UPDATE_FORGE_TO_INVENTORY(final Item item) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `container` = ? WHERE `UID` = ? AND `container` = 'forge';")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_container` = ? WHERE `UID` = ? AND `item_container` = 'forge';")) {
 
             preparedStatement.setString(1, "inventory");
             preparedStatement.setLong(2, item.getObjectUUID());
@@ -474,11 +412,11 @@ public class dbItemHandler extends dbHandlerBase {
      */
     public boolean UPDATE_GOLD(final Item item, int newValue, int oldValue) {
 
-        if (!item.template.item_type.equals(ItemType.GOLD))
+        if (!item.getItemBase().getType().equals(ItemType.GOLD))
             return false;
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `numberOfItems`=? WHERE `UID`=?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_numberOfItems`=? WHERE `UID`=?")) {
 
             preparedStatement.setInt(1, newValue);
             preparedStatement.setLong(2, item.getObjectUUID());
@@ -495,9 +433,9 @@ public class dbItemHandler extends dbHandlerBase {
     public boolean UPDATE_REMAINING_CHARGES(final Item item) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `chargesRemaining` = ? WHERE `UID` = ?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_chargesRemaining` = ? WHERE `UID` = ?")) {
 
-            preparedStatement.setInt(1, (byte) item.chargesRemaining);
+            preparedStatement.setInt(1, item.getChargesRemaining());
             preparedStatement.setLong(2, item.getObjectUUID());
 
             return (preparedStatement.executeUpdate() > 0);
@@ -515,7 +453,7 @@ public class dbItemHandler extends dbHandlerBase {
     public boolean ZERO_ITEM_STACK(Item item) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `numberOfItems`=0 WHERE `UID` = ?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_numberOfItems`=0 WHERE `UID` = ?")) {
 
             preparedStatement.setLong(1, item.getObjectUUID());
 
@@ -530,16 +468,9 @@ public class dbItemHandler extends dbHandlerBase {
     public boolean UPDATE_FLAGS(Item item) {
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `flags`=? WHERE `UID` = ?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_flags`=? WHERE `UID` = ?")) {
 
-            String flagString = "";
-
-            for (mbEnums.ItemFlags itemflag : item.flags)
-                flagString += itemflag.toString() + ";";
-
-            flagString = flagString.replaceAll(";$", "");
-
-            preparedStatement.setString(1, flagString);
+            preparedStatement.setInt(1, item.getFlags());
             preparedStatement.setLong(2, item.getObjectUUID());
 
             return (preparedStatement.executeUpdate() > 0);
@@ -552,13 +483,8 @@ public class dbItemHandler extends dbHandlerBase {
 
     public boolean UPDATE_VALUE(Item item, int value) {
 
-        // Write 0 if we will not modify the value from template
-
-        if (value == item.template.item_value)
-            value = 0;
-
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `value`=? WHERE `UID` = ?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `item_value`=? WHERE `UID` = ?")) {
 
             preparedStatement.setInt(1, value);
             preparedStatement.setLong(2, item.getObjectUUID());
@@ -570,25 +496,4 @@ public class dbItemHandler extends dbHandlerBase {
             return false;
         }
     }
-
-    public boolean UPDATE_EQUIP_SLOT(Item item) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_item` SET `equipSlot`=? WHERE `UID` = ?")) {
-
-            if (item.equipSlot.equals(mbEnums.EquipSlotType.NONE))
-                preparedStatement.setString(1, "");
-            else
-                preparedStatement.setString(1, item.equipSlot.name());
-
-            preparedStatement.setLong(2, item.getObjectUUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-            return false;
-        }
-    }
-
 }

src/engine/db/handlers/dbKitHandler.java

@@ -10,7 +10,6 @@
 package engine.db.handlers;
 
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.Kit;
 import org.pmw.tinylog.Logger;
 
@@ -24,7 +23,7 @@ public class dbKitHandler extends dbHandlerBase {
 
     public dbKitHandler() {
         this.localClass = Kit.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public ArrayList<Kit> GET_ALL_KITS() {

src/engine/db/handlers/dbMenuHandler.java

@@ -10,7 +10,6 @@
 package engine.db.handlers;
 
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.MenuOption;
 import org.pmw.tinylog.Logger;
 
@@ -24,7 +23,7 @@ public class dbMenuHandler extends dbHandlerBase {
 
     public dbMenuHandler() {
         this.localClass = MenuOption.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public ArrayList<MenuOption> GET_MENU_OPTIONS(final int id) {

src/engine/db/handlers/dbMineHandler.java

@@ -8,10 +8,11 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.Mine;
 import engine.objects.MineProduction;
+import engine.objects.Resource;
 import org.pmw.tinylog.Logger;
 
 import java.sql.Connection;
@@ -24,7 +25,7 @@ public class dbMineHandler extends dbHandlerBase {
 
     public dbMineHandler() {
         this.localClass = Mine.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public Mine GET_MINE(int id) {
@@ -32,7 +33,7 @@ public class dbMineHandler extends dbHandlerBase {
         if (id == 0)
             return null;
 
-        Mine mine = (Mine) DbManager.getFromCache(mbEnums.GameObjectType.Mine, id);
+        Mine mine = (Mine) DbManager.getFromCache(Enum.GameObjectType.Mine, id);
 
         if (mine != null)
             return mine;
@@ -83,7 +84,7 @@ public class dbMineHandler extends dbHandlerBase {
         return false;
     }
 
-    public boolean CHANGE_RESOURCE(Mine mine, mbEnums.ResourceType resource) {
+    public boolean CHANGE_RESOURCE(Mine mine, Resource resource) {
 
         try (Connection connection = DbManager.getConnection();
              PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_mine` SET `mine_resource`=? WHERE `UID`=?")) {

src/engine/db/handlers/dbMobBaseHandler.java

@@ -9,9 +9,8 @@
 
 package engine.db.handlers;
 
+import engine.Enum.GameObjectType;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
-import engine.mbEnums.GameObjectType;
 import engine.objects.MobBase;
 import engine.objects.MobBaseEffects;
 import engine.objects.MobBaseStats;
@@ -27,7 +26,7 @@ public class dbMobBaseHandler extends dbHandlerBase {
 
     public dbMobBaseHandler() {
         this.localClass = MobBase.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public MobBase GET_MOBBASE(int id) {

src/engine/db/handlers/dbMobHandler.java

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

src/engine/db/handlers/dbNPCHandler.java

@@ -9,12 +9,13 @@
 
 package engine.db.handlers;
 
+import engine.Enum.ProfitType;
 import engine.gameManager.DbManager;
 import engine.math.Vector3fImmutable;
-import engine.mbEnums;
-import engine.mbEnums.ProfitType;
 import engine.objects.NPC;
 import engine.objects.NPCProfits;
+import engine.objects.ProducedItem;
+import engine.objects.Zone;
 import org.joda.time.DateTime;
 import org.pmw.tinylog.Logger;
 
@@ -23,52 +24,12 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.HashMap;
 
 public class dbNPCHandler extends dbHandlerBase {
 
     public dbNPCHandler() {
         this.localClass = NPC.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
-    }
-
-    public static HashMap<Integer, ArrayList<Integer>> LOAD_RUNES_FOR_NPC_AND_MOBS() {
-
-        HashMap<Integer, ArrayList<Integer>> runeSets = new HashMap<>();
-        int runeSetID;
-        int runeBaseID;
-        int recordsRead = 0;
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_npc_runeSet")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-
-            while (rs.next()) {
-
-                recordsRead++;
-
-                runeSetID = rs.getInt("runeSet");
-                runeBaseID = rs.getInt("runeBase");
-
-                if (runeSets.get(runeSetID) == null) {
-                    ArrayList<Integer> runeList = new ArrayList<>();
-                    runeList.add(runeBaseID);
-                    runeSets.put(runeSetID, runeList);
-                } else {
-                    ArrayList<Integer> runeList = runeSets.get(runeSetID);
-                    runeList.add(runeSetID);
-                    runeSets.put(runeSetID, runeList);
-                }
-            }
-
-        } catch (SQLException e) {
-            Logger.error(e);
-            return runeSets;
-        }
-
-        Logger.info("read: " + recordsRead + " cached: " + runeSets.size());
-        return runeSets;
+        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public NPC PERSIST(NPC toAdd) {
@@ -133,12 +94,14 @@ public class dbNPCHandler extends dbHandlerBase {
         return row_count;
     }
 
-    public ArrayList<NPC> GET_ALL_NPCS() {
+    public ArrayList<NPC> GET_ALL_NPCS_FOR_ZONE(Zone zone) {
 
         ArrayList<NPC> npcList = new ArrayList<>();
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_npc`.*, `object`.`parent` FROM `object` INNER JOIN `obj_npc` ON `obj_npc`.`UID` = `object`.`UID` ORDER BY `object`.`UID` ASC;")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_npc`.*, `object`.`parent` FROM `object` INNER JOIN `obj_npc` ON `obj_npc`.`UID` = `object`.`UID` WHERE `object`.`parent` = ?;")) {
+
+            preparedStatement.setLong(1, zone.getObjectUUID());
 
             ResultSet rs = preparedStatement.executeQuery();
             npcList = getObjectsFromRs(rs, 1000);
@@ -310,22 +273,6 @@ public class dbNPCHandler extends dbHandlerBase {
         }
     }
 
-    public boolean UPDATE_RACE(NPC npc, int value) {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_npc` SET `npc_raceID`=? WHERE `UID`=?")) {
-
-            preparedStatement.setInt(1, value);
-            preparedStatement.setLong(2, npc.getObjectUUID());
-
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-            return false;
-        }
-    }
-
     public void LOAD_PIRATE_NAMES() {
 
         String pirateName;
@@ -361,6 +308,117 @@ public class dbNPCHandler extends dbHandlerBase {
                 + NPC._pirateNames.size() + " mobBases");
     }
 
+    public boolean ADD_TO_PRODUCTION_LIST(final long ID, final long npcUID, final long itemBaseID, DateTime dateTime, String prefix, String suffix, String name, boolean isRandom, int playerID) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_npc_production` (`ID`,`npcUID`, `itemBaseID`,`dateToUpgrade`, `isRandom`, `prefix`, `suffix`, `name`,`playerID`) VALUES (?,?,?,?,?,?,?,?,?)")) {
+
+            preparedStatement.setLong(1, ID);
+            preparedStatement.setLong(2, npcUID);
+            preparedStatement.setLong(3, itemBaseID);
+            preparedStatement.setTimestamp(4, new java.sql.Timestamp(dateTime.getMillis()));
+            preparedStatement.setBoolean(5, isRandom);
+            preparedStatement.setString(6, prefix);
+            preparedStatement.setString(7, suffix);
+            preparedStatement.setString(8, name);
+            preparedStatement.setInt(9, playerID);
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+            return false;
+        }
+    }
+
+    public boolean REMOVE_FROM_PRODUCTION_LIST(final long ID, final long npcUID) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_npc_production` WHERE `ID`=? AND `npcUID`=?;")) {
+
+            preparedStatement.setLong(1, ID);
+            preparedStatement.setLong(2, npcUID);
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+            return false;
+        }
+    }
+
+    public boolean UPDATE_ITEM_TO_INVENTORY(final long ID, final long npcUID) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `dyn_npc_production` SET `inForge`=? WHERE `ID`=? AND `npcUID`=?;")) {
+
+            preparedStatement.setByte(1, (byte) 0);
+            preparedStatement.setLong(2, ID);
+            preparedStatement.setLong(3, npcUID);
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+            return false;
+        }
+    }
+
+    public boolean UPDATE_ITEM_PRICE(final long ID, final long npcUID, int value) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `dyn_npc_production` SET `value`=? WHERE `ID`=? AND `npcUID`=?;")) {
+
+            preparedStatement.setInt(1, value);
+            preparedStatement.setLong(2, ID);
+            preparedStatement.setLong(3, npcUID);
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+            return false;
+        }
+    }
+
+    public boolean UPDATE_ITEM_ID(final long ID, final long npcUID, final long value) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `dyn_npc_production` SET `ID`=? WHERE `ID`=? AND `npcUID`=? LIMIT 1;")) {
+
+            preparedStatement.setLong(1, value);
+            preparedStatement.setLong(2, ID);
+            preparedStatement.setLong(3, npcUID);
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+            return false;
+        }
+    }
+
+    public void LOAD_ALL_ITEMS_TO_PRODUCE(NPC npc) {
+
+        if (npc == null)
+            return;
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_npc_production` WHERE `npcUID` = ?")) {
+
+            preparedStatement.setInt(1, npc.getObjectUUID());
+            ResultSet rs = preparedStatement.executeQuery();
+
+            while (rs.next()) {
+                ProducedItem producedItem = new ProducedItem(rs);
+                npc.forgedItems.add(producedItem);
+            }
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+    }
+
     public boolean UPDATE_PROFITS(NPC npc, ProfitType profitType, float value) {
 
         try (Connection connection = DbManager.getConnection();

src/engine/db/handlers/dbPetitionHandler.java

@@ -9,8 +9,8 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.Petition;
 import org.pmw.tinylog.Logger;
 
@@ -58,8 +58,8 @@ public class dbPetitionHandler extends dbHandlerBase {
                      " VALUES (?,?,?,?,?,?,?,?,?);")) {
 
             preparedStatement.setTimestamp(1, new java.sql.Timestamp(System.currentTimeMillis()));
-            preparedStatement.setString(2, mbEnums.PetitionType.values()[petition.primaryType].name());
-            preparedStatement.setString(3, mbEnums.PetitionSubType.values()[petition.subType].name());
+            preparedStatement.setString(2, Enum.PetitionType.values()[petition.primaryType].name());
+            preparedStatement.setString(3, Enum.PetitionSubType.values()[petition.subType].name());
             preparedStatement.setInt(4, petition.reportAccount.getObjectUUID());
             preparedStatement.setString(5, petition.reportAccount.getUname());
             preparedStatement.setInt(6, petition.reportPlayer.getObjectUUID());

src/engine/db/handlers/dbPlayerCharacterHandler.java

@@ -9,8 +9,8 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.AbstractWorldObject;
 import engine.objects.Heraldry;
 import engine.objects.PlayerCharacter;
@@ -29,7 +29,7 @@ public class dbPlayerCharacterHandler extends dbHandlerBase {
 
     public dbPlayerCharacterHandler() {
         this.localClass = PlayerCharacter.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public PlayerCharacter ADD_PLAYER_CHARACTER(final PlayerCharacter toAdd) {
@@ -45,8 +45,8 @@ public class dbPlayerCharacterHandler extends dbHandlerBase {
             preparedStatement.setLong(1, toAdd.getAccount().getObjectUUID());
             preparedStatement.setString(2, toAdd.getFirstName());
             preparedStatement.setString(3, toAdd.getLastName());
-            preparedStatement.setInt(4, toAdd.race.getRaceRuneID());
-            preparedStatement.setInt(5, toAdd.baseClass.getObjectUUID());
+            preparedStatement.setInt(4, toAdd.getRace().getRaceRuneID());
+            preparedStatement.setInt(5, toAdd.getBaseClass().getObjectUUID());
             preparedStatement.setInt(6, toAdd.getStrMod());
             preparedStatement.setInt(7, toAdd.getDexMod());
             preparedStatement.setInt(8, toAdd.getConMod());
@@ -176,7 +176,7 @@ public class dbPlayerCharacterHandler extends dbHandlerBase {
         if (objectUUID == 0)
             return null;
 
-        PlayerCharacter playerCharacter = (PlayerCharacter) DbManager.getFromCache(mbEnums.GameObjectType.PlayerCharacter, objectUUID);
+        PlayerCharacter playerCharacter = (PlayerCharacter) DbManager.getFromCache(Enum.GameObjectType.PlayerCharacter, objectUUID);
 
         if (playerCharacter != null)
             return playerCharacter;

src/engine/db/handlers/dbPowerHandler.java

@@ -9,57 +9,62 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
 import engine.gameManager.DbManager;
 import engine.gameManager.PowersManager;
-import engine.mbEnums;
 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 {
 
     public dbPowerHandler() {
         this.localClass = Mob.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public static void addAllSourceTypes() {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_power_sourcetype")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
+        PreparedStatementShared ps = null;
+        try {
+            ps = new PreparedStatementShared("SELECT * FROM static_power_sourcetype");
+            ResultSet rs = ps.executeQuery();
             String IDString, source;
-
             while (rs.next()) {
                 IDString = rs.getString("IDString");
                 int token = DbManager.hasher.SBStringHash(IDString);
 
+
                 source = rs.getString("source").replace("-", "").trim();
-                mbEnums.EffectSourceType effectSourceType = mbEnums.EffectSourceType.GetEffectSourceType(source);
+                Enum.EffectSourceType effectSourceType = Enum.EffectSourceType.GetEffectSourceType(source);
 
                 if (EffectsBase.effectSourceTypeMap.containsKey(token) == false)
                     EffectsBase.effectSourceTypeMap.put(token, new HashSet<>());
 
                 EffectsBase.effectSourceTypeMap.get(token).add(effectSourceType);
             }
+            rs.close();
         } catch (Exception e) {
             Logger.error(e);
+        } finally {
+            ps.release();
         }
     }
 
     public static void addAllAnimationOverrides() {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM static_power_animation_override")) {
-
-            ResultSet rs = preparedStatement.executeQuery();
-
+        PreparedStatementShared ps = null;
+        try {
+            ps = new PreparedStatementShared("SELECT * FROM static_power_animation_override");
+            ResultSet rs = ps.executeQuery();
             String IDString;
             int animation;
             while (rs.next()) {
@@ -73,10 +78,51 @@ public class dbPowerHandler extends dbHandlerBase {
                 PowersManager.AnimationOverrides.put(IDString, animation);
 
             }
+            rs.close();
         } catch (Exception e) {
             Logger.error(e);
+        } finally {
+            ps.release();
+        }
+    }
+
+    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/dbPromotionClassHandler.java

@@ -10,7 +10,6 @@
 package engine.db.handlers;
 
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.PromotionClass;
 import org.pmw.tinylog.Logger;
 
@@ -24,7 +23,7 @@ public class dbPromotionClassHandler extends dbHandlerBase {
 
     public dbPromotionClassHandler() {
         this.localClass = PromotionClass.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public ArrayList<Integer> GET_ALLOWED_RUNES(final PromotionClass pc) {

src/engine/db/handlers/dbRuneBaseAttributeHandler.java

@@ -10,7 +10,6 @@
 package engine.db.handlers;
 
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.RuneBaseAttribute;
 import org.pmw.tinylog.Logger;
 
@@ -24,7 +23,7 @@ public class dbRuneBaseAttributeHandler extends dbHandlerBase {
 
     public dbRuneBaseAttributeHandler() {
         this.localClass = RuneBaseAttribute.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public ArrayList<RuneBaseAttribute> GET_ATTRIBUTES_FOR_RUNEBASE() {

src/engine/db/handlers/dbRuneBaseEffectHandler.java

@@ -9,9 +9,8 @@
 
 package engine.db.handlers;
 
+import engine.Enum.GameObjectType;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
-import engine.mbEnums.GameObjectType;
 import engine.objects.AbstractGameObject;
 import engine.objects.RuneBaseEffect;
 import org.pmw.tinylog.Logger;
@@ -27,7 +26,7 @@ public class dbRuneBaseEffectHandler extends dbHandlerBase {
 
     public dbRuneBaseEffectHandler() {
         this.localClass = RuneBaseEffect.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public ArrayList<RuneBaseEffect> GET_EFFECTS_FOR_RUNEBASE(int id) {

src/engine/db/handlers/dbRuneBaseHandler.java

@@ -10,10 +10,7 @@
 package engine.db.handlers;
 
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.RuneBase;
-import engine.powers.RunePowerEntry;
-import engine.powers.RuneSkillAdjustEntry;
 import org.pmw.tinylog.Logger;
 
 import java.sql.Connection;
@@ -27,85 +24,7 @@ public class dbRuneBaseHandler extends dbHandlerBase {
 
     public dbRuneBaseHandler() {
         this.localClass = RuneBase.class;
-        this.localObjectType = mbEnums.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;
+        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public void GET_RUNE_REQS(final RuneBase rb) {

src/engine/db/handlers/dbRunegateHandler.java

@@ -9,8 +9,8 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.Building;
 import engine.objects.Portal;
 import org.pmw.tinylog.Logger;
@@ -49,7 +49,7 @@ public class dbRunegateHandler extends dbHandlerBase {
     public ArrayList<Portal> GET_PORTAL_LIST(int gateUID) {
 
         ArrayList<Portal> portalList = new ArrayList<>();
-        Building sourceBuilding = (Building) DbManager.getObject(mbEnums.GameObjectType.Building, gateUID);
+        Building sourceBuilding = (Building) DbManager.getObject(Enum.GameObjectType.Building, gateUID);
 
         try (Connection connection = DbManager.getConnection();
              PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `static_runegate_portals` WHERE `sourceBuilding` = ?;")) {
@@ -60,8 +60,8 @@ public class dbRunegateHandler extends dbHandlerBase {
 
             while (rs.next()) {
                 int targetBuildingID = rs.getInt("targetBuilding");
-                Building targetBuilding = (Building) DbManager.getObject(mbEnums.GameObjectType.Building, targetBuildingID);
-                mbEnums.PortalType portalType = mbEnums.PortalType.valueOf(rs.getString("portalType"));
+                Building targetBuilding = (Building) DbManager.getObject(Enum.GameObjectType.Building, targetBuildingID);
+                Enum.PortalType portalType = Enum.PortalType.valueOf(rs.getString("portalType"));
                 Portal portal = new Portal(sourceBuilding, portalType, targetBuilding);
                 portalList.add(portal);
             }

src/engine/db/handlers/dbShrineHandler.java

@@ -9,10 +9,9 @@
 
 package engine.db.handlers;
 
+import engine.Enum.ProtectionState;
 import engine.gameManager.DbManager;
 import engine.math.Vector3fImmutable;
-import engine.mbEnums;
-import engine.mbEnums.ProtectionState;
 import engine.objects.AbstractGameObject;
 import engine.objects.Building;
 import engine.objects.Shrine;
@@ -29,7 +28,7 @@ public class dbShrineHandler extends dbHandlerBase {
 
     public dbShrineHandler() {
         this.localClass = Shrine.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public static void addObject(ArrayList<AbstractGameObject> list, ResultSet rs) throws SQLException {

src/engine/db/handlers/dbSkillBaseHandler.java

@@ -9,9 +9,9 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
+import engine.Enum.GameObjectType;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
-import engine.mbEnums.GameObjectType;
 import engine.objects.MaxSkills;
 import engine.objects.SkillsBase;
 import org.pmw.tinylog.Logger;
@@ -27,7 +27,7 @@ public class dbSkillBaseHandler extends dbHandlerBase {
 
     public dbSkillBaseHandler() {
         this.localClass = SkillsBase.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public SkillsBase GET_BASE(final int objectUUID) {

src/engine/db/handlers/dbSkillReqHandler.java

@@ -10,7 +10,6 @@
 package engine.db.handlers;
 
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.SkillReq;
 import engine.powers.PowersBase;
 import org.pmw.tinylog.Logger;
@@ -26,7 +25,7 @@ public class dbSkillReqHandler extends dbHandlerBase {
 
     public dbSkillReqHandler() {
         this.localClass = SkillReq.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public static ArrayList<PowersBase> getAllPowersBase() {

src/engine/db/handlers/dbVendorDialogHandler.java

@@ -9,8 +9,8 @@
 
 package engine.db.handlers;
 
+import engine.Enum;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.VendorDialog;
 import org.pmw.tinylog.Logger;
 
@@ -23,12 +23,12 @@ public class dbVendorDialogHandler extends dbHandlerBase {
 
     public dbVendorDialogHandler() {
         this.localClass = VendorDialog.class;
-        this.localObjectType = mbEnums.GameObjectType.valueOf(this.localClass.getSimpleName());
+        this.localObjectType = Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
     }
 
     public VendorDialog GET_VENDORDIALOG(final int objectUUID) {
 
-        VendorDialog vendorDialog = (VendorDialog) DbManager.getFromCache(mbEnums.GameObjectType.VendorDialog, objectUUID);
+        VendorDialog vendorDialog = (VendorDialog) DbManager.getFromCache(Enum.GameObjectType.VendorDialog, objectUUID);
 
         if (vendorDialog != null)
             return vendorDialog;

src/engine/db/handlers/dbWarehouseHandler.java

@@ -9,20 +9,14 @@
 
 package engine.db.handlers;
 
+import engine.Enum.GameObjectType;
+import engine.Enum.ProtectionState;
+import engine.Enum.TransactionType;
 import engine.gameManager.DbManager;
-import engine.gameManager.ForgeManager;
-import engine.loot.WorkOrder;
-import engine.mbEnums;
-import engine.mbEnums.GameObjectType;
-import engine.mbEnums.TransactionType;
-import engine.objects.Building;
-import engine.objects.City;
-import engine.objects.Transaction;
-import engine.objects.Warehouse;
+import engine.math.Vector3fImmutable;
+import engine.objects.*;
 import engine.server.MBServerStatics;
 import org.joda.time.DateTime;
-import org.json.JSONArray;
-import org.json.JSONObject;
 import org.pmw.tinylog.Logger;
 
 import java.sql.Connection;
@@ -37,10 +31,463 @@ public class dbWarehouseHandler extends dbHandlerBase {
     private static final ConcurrentHashMap<Integer, String> columns = new ConcurrentHashMap<>(MBServerStatics.CHM_INIT_CAP, MBServerStatics.CHM_LOAD, MBServerStatics.CHM_THREAD_LOW);
 
     public dbWarehouseHandler() {
+        this.localClass = Warehouse.class;
+        this.localObjectType = engine.Enum.GameObjectType.valueOf(this.localClass.getSimpleName());
 
     }
 
-    public boolean CREATE_TRANSACTION(int warehouseBuildingID, GameObjectType targetType, int targetUUID, TransactionType transactionType, mbEnums.ResourceType resource, int amount, DateTime date) {
+    public static void addObject(ArrayList<AbstractGameObject> list, ResultSet rs) throws SQLException {
+        String type = rs.getString("type");
+        switch (type) {
+            case "building":
+                Building building = new Building(rs);
+                DbManager.addToCache(building);
+                list.add(building);
+                break;
+            case "warehouse":
+                Warehouse warehouse = new Warehouse(rs);
+                DbManager.addToCache(warehouse);
+                list.add(warehouse);
+                break;
+        }
+    }
+
+    public ArrayList<AbstractGameObject> CREATE_WAREHOUSE(int parentZoneID, int OwnerUUID, String name, int meshUUID,
+                                                          Vector3fImmutable location, float meshScale, int currentHP,
+                                                          ProtectionState protectionState, int currentGold, int rank,
+                                                          DateTime upgradeDate, int blueprintUUID, float w, float rotY) {
+
+        ArrayList<AbstractGameObject> warehouseList = new ArrayList<>();
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("CALL `WAREHOUSE_CREATE`(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? ,? ,? ,?, ?);")) {
+
+            preparedStatement.setInt(1, parentZoneID);
+            preparedStatement.setInt(2, OwnerUUID);
+            preparedStatement.setString(3, name);
+            preparedStatement.setInt(4, meshUUID);
+            preparedStatement.setFloat(5, location.x);
+            preparedStatement.setFloat(6, location.y);
+            preparedStatement.setFloat(7, location.z);
+            preparedStatement.setFloat(8, meshScale);
+            preparedStatement.setInt(9, currentHP);
+            preparedStatement.setString(10, protectionState.name());
+            preparedStatement.setInt(11, currentGold);
+            preparedStatement.setInt(12, rank);
+
+            if (upgradeDate != null)
+                preparedStatement.setTimestamp(13, new java.sql.Timestamp(upgradeDate.getMillis()));
+            else
+                preparedStatement.setNull(13, java.sql.Types.DATE);
+
+            preparedStatement.setInt(14, blueprintUUID);
+            preparedStatement.setFloat(15, w);
+            preparedStatement.setFloat(16, rotY);
+
+            preparedStatement.execute();
+            ResultSet rs = preparedStatement.getResultSet();
+
+            while (rs.next())
+                addObject(warehouseList, rs);
+
+            while (preparedStatement.getMoreResults()) {
+                rs = preparedStatement.getResultSet();
+
+                while (rs.next())
+                    addObject(warehouseList, rs);
+            }
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+
+        return warehouseList;
+    }
+
+    public boolean updateLocks(final Warehouse wh, long locks) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_locks`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setLong(1, locks);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateGold(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_gold`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateStone(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_stone`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateTruesteel(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_truesteel`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateIron(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_iron`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateAdamant(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_adamant`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateLumber(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_lumber`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateOak(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_oak`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateBronzewood(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_bronzewood`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateMandrake(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_mandrake`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateCoal(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_coal`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateAgate(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_agate`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateDiamond(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_diamond`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateOnyx(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_onyx`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateAzoth(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_azoth`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateOrichalk(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_orichalk`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateAntimony(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_antimony`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateSulfur(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_sulfur`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateQuicksilver(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_quicksilver`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateGalvor(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_galvor`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateWormwood(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_wormwood`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateObsidian(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_obsidian`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateBloodstone(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_bloodstone`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean updateMithril(final Warehouse wh, int amount) {
+
+        try (Connection connection = DbManager.getConnection();
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_warehouse` SET `warehouse_mithril`=? WHERE `UID` = ?")) {
+
+            preparedStatement.setInt(1, amount);
+            preparedStatement.setInt(2, wh.getUID());
+
+            return (preparedStatement.executeUpdate() > 0);
+
+        } catch (SQLException e) {
+            Logger.error(e);
+        }
+        return false;
+    }
+
+    public boolean CREATE_TRANSACTION(int warehouseBuildingID, GameObjectType targetType, int targetUUID, TransactionType transactionType, Resource resource, int amount, DateTime date) {
 
         try (Connection connection = DbManager.getConnection();
              PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_warehouse_transactions` (`warehouseUID`, `targetType`,`targetUID`, `type`,`resource`,`amount`,`date` ) VALUES (?,?,?,?,?,?,?)")) {
@@ -85,150 +532,24 @@ public class dbWarehouseHandler extends dbHandlerBase {
         return transactionsList;
     }
 
-    public void DELETE_WAREHOUSE(Warehouse warehouse) {
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_warehouse` WHERE `cityUUID` = ?;")) {
-            preparedStatement.setInt(1, warehouse.city.getObjectUUID());
-            preparedStatement.executeUpdate();
+    public void LOAD_ALL_WAREHOUSES() {
 
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-
-    }
-
-    public boolean UPDATE_WAREHOUSE(Warehouse warehouse) {
-
-        JSONObject warehouseJSON = new JSONObject();
-
-        JSONObject resources = new JSONObject(warehouse.resources);
-        warehouseJSON.put("resources", resources);
-
-        JSONArray locks = new JSONArray();
-
-        for (mbEnums.ResourceType resource : warehouse.locked)
-            locks.put(resource.name());
-
-        warehouseJSON.put("locked", locks);
+        Warehouse warehouse;
 
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_warehouse` (`cityUUID`, `warehouse`) VALUES (?, ?) " +
-                     "ON DUPLICATE KEY UPDATE `warehouse` = VALUES(`warehouse`)")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("SELECT `obj_warehouse`.*, `object`.`parent`, `object`.`type` FROM `object` LEFT JOIN `obj_warehouse` ON `object`.`UID` = `obj_warehouse`.`UID` WHERE `object`.`type` = 'warehouse';")) {
 
-            preparedStatement.setInt(1, warehouse.city.getObjectUUID());
-            preparedStatement.setString(2, warehouseJSON.toString());
 
-            return (preparedStatement.executeUpdate() > 0);
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-        return false;
-    }
-
-    public void LOAD_WAREHOUSES() {
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_warehouse`;");
-             ResultSet rs = preparedStatement.executeQuery()) {
+            ResultSet rs = preparedStatement.executeQuery();
 
             while (rs.next()) {
-                int cityUID = rs.getInt("cityUUID");
-                JSONObject jsonObject = new JSONObject(rs.getString("warehouse"));
-                City city = City.getCity(cityUID);
-
-                if (city == null) {
-                    Logger.error("No city " + cityUID + " for warehouse");
-                    continue;
-                }
-
-                city.warehouse = new Warehouse(jsonObject);
-                city.warehouse.city = city;
-
-                // Locate warehouse building
-                for (Building building : city.parentZone.zoneBuildingSet) {
-                    if (building.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.WAREHOUSE)) {
-                        city.warehouse.building = building;
-                        break;
-                    }
-                }
-
+                warehouse = new Warehouse(rs);
+                warehouse.runAfterLoad();
+                warehouse.loadAllTransactions();
             }
 
-        } catch (Exception e) {
-            Logger.error(e);
-        }
-    }
-
-    public boolean WRITE_WORKORDER(WorkOrder workOrder) {
-
-        JSONObject warehouseJSON = WorkOrder.toJson(workOrder);
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("INSERT INTO `dyn_workorders` (`workorderID`, `workorder`) VALUES (?, ?) " +
-                     "ON DUPLICATE KEY UPDATE `workorder` = VALUES(`workorder`)")) {
-
-            preparedStatement.setInt(1, workOrder.workOrderID);
-            preparedStatement.setString(2, warehouseJSON.toString());
-
-            return (preparedStatement.executeUpdate() > 0);
-
         } catch (SQLException e) {
             Logger.error(e);
         }
-        return false;
-    }
-
-    public void DELETE_WORKORDER(WorkOrder workOrder) {
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("DELETE FROM `dyn_workorders` WHERE `workorderID` = ?;")) {
-            preparedStatement.setInt(1, workOrder.workOrderID);
-            preparedStatement.executeUpdate();
-
-        } catch (SQLException e) {
-            Logger.error(e);
-        }
-
-    }
-
-    public void LOAD_WORKORDERS() {
-
-        // Method loads NPC workOrders from disk at bootstrap.
-        // A workOrder will persist until completed or junked
-        // via the client interface.
-
-        ArrayList<WorkOrder> submitList = new ArrayList<>();
-        ArrayList<WorkOrder> orphanList = new ArrayList<>();
-
-        try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("SELECT * FROM `dyn_workorders`;");
-             ResultSet rs = preparedStatement.executeQuery()) {
-
-            while (rs.next()) {
-                JSONObject jsonObject = new JSONObject(rs.getString("workorder"));
-                WorkOrder workOrder = new WorkOrder(jsonObject);
-                submitList.add(workOrder);
-            }
-        } catch (Exception e) {
-            Logger.error(e);
-        }
-
-        // Submit new workOrders to the ForgeManager
-
-        for (WorkOrder workOrder : submitList) {
-
-            DbManager.WarehouseQueries.DELETE_WORKORDER(workOrder);
-
-            // Delete but do not reconstitute orphan workOrders
-
-            if (workOrder.vendor == null)
-                continue;
-
-            workOrder.workOrderID = ForgeManager.workOrderCounter.incrementAndGet();
-            DbManager.WarehouseQueries.WRITE_WORKORDER(workOrder);
-            ForgeManager.vendorWorkOrderLookup.get(workOrder.vendor).add(workOrder);
-            ForgeManager.forge.add(workOrder);
-        }
-
     }
 }

src/engine/db/handlers/dbZoneHandler.java

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

src/engine/devcmd/AbstractDevCmd.java

@@ -9,9 +9,9 @@
 
 package engine.devcmd;
 
+import engine.Enum.GameObjectType;
 import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
-import engine.mbEnums.GameObjectType;
 import engine.objects.*;
 
 import java.util.ArrayList;

src/engine/devcmd/cmds/AddBuildingCmd.java

@@ -9,6 +9,7 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum.ProtectionState;
 import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.ChatManager;
@@ -16,7 +17,6 @@ import engine.gameManager.DbManager;
 import engine.gameManager.ZoneManager;
 import engine.math.Vector3f;
 import engine.math.Vector3fImmutable;
-import engine.mbEnums.ProtectionState;
 import engine.objects.*;
 import engine.server.MBServerStatics;
 

src/engine/devcmd/cmds/AddGoldCmd.java

@@ -32,7 +32,7 @@ public class AddGoldCmd extends AbstractDevCmd {
             return;
         }
 
-        Item gold = pc.charItemManager.getGoldInventory();
+        Item gold = pc.getCharItemManager().getGoldInventory();
         int curAmt;
         if (gold == null)
             curAmt = 0;
@@ -54,13 +54,13 @@ public class AddGoldCmd extends AbstractDevCmd {
             return;
         }
 
-        if (!pc.charItemManager.addGoldToInventory(amt, true)) {
+        if (!pc.getCharItemManager().addGoldToInventory(amt, true)) {
             throwbackError(pc, "Failed to add gold to inventory");
             return;
         }
 
         ChatManager.chatSayInfo(pc, amt + " gold added to inventory");
-        pc.charItemManager.updateInventory();
+        pc.getCharItemManager().updateInventory();
     }
 
     @Override

src/engine/devcmd/cmds/AddMobCmd.java

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

src/engine/devcmd/cmds/AddNPCCmd.java

@@ -9,10 +9,10 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum.GameObjectType;
 import engine.InterestManagement.WorldGrid;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.*;
-import engine.mbEnums.GameObjectType;
 import engine.objects.*;
 import org.pmw.tinylog.Logger;
 

src/engine/devcmd/cmds/ApplyBonusCmd.java

@@ -9,10 +9,10 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum.PowerActionType;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.ChatManager;
 import engine.gameManager.PowersManager;
-import engine.mbEnums.PowerActionType;
 import engine.objects.AbstractGameObject;
 import engine.objects.PlayerCharacter;
 import engine.powers.ActionsBase;

src/engine/devcmd/cmds/AuditFailedItemsCmd.java

@@ -0,0 +1,127 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.Enum.ModType;
+import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.PowersManager;
+import engine.net.ItemProductionManager;
+import engine.objects.*;
+import engine.powers.effectmodifiers.AbstractEffectModifier;
+import engine.powers.poweractions.AbstractPowerAction;
+import org.pmw.tinylog.Logger;
+
+public class AuditFailedItemsCmd extends AbstractDevCmd {
+
+    public AuditFailedItemsCmd() {
+        super("faileditems");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pcSender, String[] words,
+                          AbstractGameObject target) {
+
+
+        if (ItemProductionManager.FailedItems.isEmpty())
+            return;
+
+        Logger.info("Auditing Item production Failed Items");
+
+        String newLine = "\r\n";
+        String auditFailedItem = "Failed Item Name | Prefix | Suffix | NPC | Contract  | Player | ";
+
+        for (ProducedItem failedItem : ItemProductionManager.FailedItems) {
+
+            String npcName = "";
+            String playerName = "";
+            String contractName = "";
+
+            String prefix = "";
+            String suffix = "";
+            String itemName = "";
+            NPC npc = NPC.getFromCache(failedItem.getNpcUID());
+
+            if (npc == null) {
+                npcName = "null";
+                contractName = "null";
+            } else {
+                npcName = npc.getName();
+                if (npc.getContract() != null)
+                    contractName = npc.getContract().getName();
+            }
+
+            PlayerCharacter roller = PlayerCharacter.getFromCache(failedItem.getPlayerID());
+
+            if (roller == null)
+                playerName = "null";
+            else
+                playerName = roller.getName();
+
+            ItemBase ib = ItemBase.getItemBase(failedItem.getItemBaseID());
+
+            if (ib != null) {
+                itemName = ib.getName();
+            }
+
+            if (failedItem.isRandom() == false) {
+                if (failedItem.getPrefix().isEmpty() == false) {
+                    AbstractPowerAction pa = PowersManager.getPowerActionByIDString(failedItem.getPrefix());
+                    if (pa != null) {
+                        for (AbstractEffectModifier aem : pa.getEffectsBase().getModifiers()) {
+                            if (aem.modType.equals(ModType.ItemName)) {
+                                prefix = aem.getString1();
+                                break;
+                            }
+                        }
+                    }
+
+                }
+
+                if (failedItem.getSuffix().isEmpty() == false) {
+                    AbstractPowerAction pa = PowersManager.getPowerActionByIDString(failedItem.getSuffix());
+                    if (pa != null) {
+                        for (AbstractEffectModifier aem : pa.getEffectsBase().getModifiers()) {
+                            if (aem.modType.equals(ModType.ItemName)) {
+                                suffix = aem.getString1();
+                                break;
+                            }
+                        }
+                    }
+
+                }
+
+            } else {
+                prefix = "random";
+            }
+
+
+            auditFailedItem += newLine;
+            auditFailedItem += itemName + " | " + prefix + " | " + suffix + " | " + failedItem.getNpcUID() + ":" + npcName + " | " + contractName + " | " + failedItem.getPlayerID() + ":" + playerName;
+
+        }
+        Logger.info(auditFailedItem);
+        ItemProductionManager.FailedItems.clear();
+
+
+    }
+
+
+    @Override
+    protected String _getUsageString() {
+        return "' /bounds'";
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Audits all the mobs in a zone.";
+
+    }
+
+}

src/engine/devcmd/cmds/AuditHeightMapCmd.java

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

src/engine/devcmd/cmds/AuditMobsCmd.java

@@ -0,0 +1,105 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      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 AuditMobsCmd extends AbstractDevCmd {
+
+    public AuditMobsCmd() {
+        super("auditmobs");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pcSender, String[] words,
+                          AbstractGameObject target) {
+        if (pcSender == null)
+            return;
+
+        //get Zone to check mobs against
+
+        Zone zone;
+
+        if (words.length == 2) {
+            if (words[0].equals("all")) {
+                int plusplus = 0;
+                int count = Integer.parseInt(words[1]);
+                for (Zone zoneMicro : ZoneManager.getAllZones()) {
+                    int size = zoneMicro.zoneMobSet.size();
+
+                    if (size >= count) {
+                        plusplus++;
+                        throwbackInfo(pcSender, zoneMicro.getName() + " at location  " + zoneMicro.getLoc().toString() + " has " + size + " mobs. ");
+                        System.out.println(zoneMicro.getName() + " at location  " + zoneMicro.getLoc().toString() + " has " + size + " mobs. ");
+                    }
+
+
+                }
+                throwbackInfo(pcSender, " there are " + plusplus + " zones with at least " + count + " mobs in each.");
+            }
+            return;
+        }
+        if (words.length > 1) {
+            this.sendUsage(pcSender);
+            return;
+        } else if (words.length == 1) {
+            int uuid;
+            try {
+                uuid = Integer.parseInt(words[0]);
+                zone = ZoneManager.getZoneByUUID(uuid);
+            } catch (NumberFormatException e) {
+                zone = ZoneManager.findSmallestZone(pcSender.getLoc());
+            }
+        } else
+            zone = ZoneManager.findSmallestZone(pcSender.getLoc());
+
+        if (zone == null) {
+            throwbackError(pcSender, "Unable to find the zone");
+            return;
+        }
+
+        //get list of mobs for zone
+
+        if (zone.zoneMobSet.isEmpty()) {
+            throwbackError(pcSender, "No mobs found for this zone.");
+            return;
+        }
+
+        //	ConcurrentHashMap<Integer, Mob> spawnMap = Mob.getSpawnMap();
+        //ConcurrentHashMap<Mob, Long> respawnMap = Mob.getRespawnMap();
+        //		ConcurrentHashMap<Mob, Long> despawnMap = Mob.getDespawnMap();
+
+        throwbackInfo(pcSender, zone.getName() + ", numMobs: " + zone.zoneMobSet.size());
+        throwbackInfo(pcSender, "UUID, dbID, inRespawnMap, isAlive, activeAI, Loc");
+
+
+        //mob not found in spawn map, check respawn
+        boolean inRespawn = false;
+
+
+    }
+
+
+    @Override
+    protected String _getUsageString() {
+        return "' /auditmobs [zone.UUID]'";
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Audits all the mobs in a zone.";
+
+    }
+
+}

src/engine/devcmd/cmds/BoundsCmd.java

@@ -9,8 +9,8 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum.GameObjectType;
 import engine.devcmd.AbstractDevCmd;
-import engine.mbEnums.GameObjectType;
 import engine.objects.AbstractGameObject;
 import engine.objects.Building;
 import engine.objects.PlayerCharacter;

src/engine/devcmd/cmds/ChangeNameCmd.java

@@ -0,0 +1,114 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.DbManager;
+import engine.gameManager.SessionManager;
+import engine.math.Vector3fImmutable;
+import engine.objects.AbstractGameObject;
+import engine.objects.PlayerCharacter;
+import engine.util.MiscUtils;
+
+public class ChangeNameCmd extends AbstractDevCmd {
+
+    public ChangeNameCmd() {
+        super("changename");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pc, String[] words,
+                          AbstractGameObject target) {
+        Vector3fImmutable loc = null;
+
+        // Arg Count Check
+        if (words.length < 2) {
+            this.sendUsage(pc);
+            return;
+        }
+
+        String oldFirst = words[0];
+        String newFirst = words[1];
+        String newLast = "";
+        if (words.length > 2) {
+            newLast = words[2];
+            for (int i = 3; i < words.length; i++)
+                newLast += ' ' + words[i];
+        }
+
+        //verify new name length
+        if (newFirst.length() < 3) {
+            this.throwbackError(pc, "Error: First name is incorrect length. Must be between 3 and 15 characters");
+            return;
+        }
+
+        //verify old name length
+        if (newLast.length() > 50) {
+            this.throwbackError(pc, "Error: Last name is incorrect length. Must be no more than 50 characters");
+            return;
+        }
+
+        // Check if firstname is valid
+        if (MiscUtils.checkIfFirstNameInvalid(newFirst)) {
+            this.throwbackError(pc, "Error: First name is not allowed");
+            return;
+        }
+
+
+        //get the world ID we're modifying for
+
+        //test if first name is unique, unless new and old first name are equal.
+        if (!(oldFirst.equals(newFirst))) {
+            if (!DbManager.PlayerCharacterQueries.IS_CHARACTER_NAME_UNIQUE(newFirst)) {
+                this.throwbackError(pc, "Error: First name is not unique.");
+                return;
+            }
+        }
+
+        //tests passed, update name in database
+        if (!DbManager.PlayerCharacterQueries.UPDATE_NAME(oldFirst, newFirst, newLast)) {
+            this.throwbackError(pc, "Error: Database failed to update the name.");
+            return;
+        }
+
+        //Finally update player ingame
+        PlayerCharacter pcTar = null;
+        try {
+            pcTar = SessionManager
+                    .getPlayerCharacterByLowerCaseName(words[0]);
+            pcTar.setFirstName(newFirst);
+            pcTar.setLastName(newLast);
+            this.setTarget(pcTar); //for logging
+
+            //specify if last name is ascii characters only
+            String lastAscii = newLast.replaceAll("[^\\p{ASCII}]", "");
+            pcTar.setAsciiLastName(lastAscii.equals(newLast));
+        } catch (Exception e) {
+            this.throwbackError(pc, "Database was updated but ingame character failed to update.");
+            return;
+        }
+
+        String out = oldFirst + " was changed to " + newFirst + (newLast.isEmpty() ? "." : (' ' + newLast + '.'));
+        this.throwbackInfo(pc, out);
+
+
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Changes the name of a player";
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "'./changename oldFirstName newFirstName newLastName'";
+    }
+
+}

src/engine/devcmd/cmds/CombatMessageCmd.java

@@ -0,0 +1,56 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.devcmd.AbstractDevCmd;
+import engine.net.client.msg.TargetedActionMsg;
+import engine.objects.AbstractGameObject;
+import engine.objects.PlayerCharacter;
+
+/**
+ * @author Eighty
+ */
+public class CombatMessageCmd extends AbstractDevCmd {
+
+    public CombatMessageCmd() {
+        super("cm");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pcSender, String[] args,
+                          AbstractGameObject target) {
+        if (pcSender == null)
+            return;
+        if (args.length != 1) {
+            this.sendUsage(pcSender);
+            return;
+        }
+        int num = 0;
+        try {
+            num = Integer.parseInt(args[0]);
+        } catch (NumberFormatException e) {
+            throwbackError(pcSender, "Supplied message number " + args[0] + " failed to parse to an Integer");
+            return;
+        }
+        TargetedActionMsg.un2cnt = num;
+        throwbackInfo(pcSender, "CombatMessage set to " + num);
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "' /cm [cmNumber]'";
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Sets the combat message to the supplied integer value";
+    }
+
+}

src/engine/devcmd/cmds/CreateItemCmd.java

@@ -10,14 +10,10 @@
 package engine.devcmd.cmds;
 
 import engine.devcmd.AbstractDevCmd;
-import engine.gameManager.ChatManager;
-import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.AbstractGameObject;
-import engine.objects.Item;
-import engine.objects.ItemTemplate;
+import engine.objects.ItemBase;
+import engine.objects.ItemFactory;
 import engine.objects.PlayerCharacter;
-import org.pmw.tinylog.Logger;
 
 /**
  * @author Eighty
@@ -29,46 +25,30 @@ public class CreateItemCmd extends AbstractDevCmd {
     }
 
     @Override
-    protected void _doCmd(PlayerCharacter playerCharacter, String[] words,
+    protected void _doCmd(PlayerCharacter pc, String[] words,
                           AbstractGameObject target) {
-
         if (words.length < 2) {
-            this.sendUsage(playerCharacter);
+            this.sendUsage(pc);
+            return;
+        }
+        int id;
+        id = ItemBase.getIDByName(words[0]);
+
+        if (id == 0)
+            id = Integer.parseInt(words[0]);
+        if (id == 7) {
+            this.throwbackInfo(pc, "use /addgold to add gold.....");
             return;
         }
 
-        int templateID = Integer.parseInt(words[0]);
-        ItemTemplate template = ItemTemplate.templates.get(templateID);
-
-        if (template == null) {
-            ChatManager.chatSystemInfo(playerCharacter, "No such template found.");
-            return;
-        }
         int size = 1;
 
-        if (words.length == 2)
+        if (words.length < 3) {
             size = Integer.parseInt(words[1]);
-
-        for (int i = 0; i < size; i++) {
-
-            if (!playerCharacter.charItemManager.hasRoomInventory(template.item_wt)) {
-                ChatManager.chatSystemInfo(playerCharacter, "You are encumbered!.");
-                break;
-            }
-
-            Item item = new Item(templateID);
-            item.ownerID = playerCharacter.getObjectUUID();
-            item.ownerType = mbEnums.OwnerType.PlayerCharacter;
-            item.containerType = mbEnums.ItemContainerType.INVENTORY;
-
-            try {
-                item = DbManager.ItemQueries.PERSIST(item);
-                playerCharacter.charItemManager.addItemToInventory(item);
-            } catch (Exception e) {
-                Logger.error(e);
-            }
         }
-        playerCharacter.charItemManager.updateInventory();
+
+        ItemFactory.fillInventory(pc, id, size);
+
     }
 
     @Override
@@ -78,7 +58,7 @@ public class CreateItemCmd extends AbstractDevCmd {
 
     @Override
     protected String _getUsageString() {
-        return "' /createitem <templateID> <quantity>'";
+        return "' /createitem <ItembaseID> <quantity>'";
     }
 
 }

src/engine/devcmd/cmds/DebugCmd.java

@@ -0,0 +1,122 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.devcmd.AbstractDevCmd;
+import engine.jobs.DebugTimerJob;
+import engine.objects.AbstractGameObject;
+import engine.objects.PlayerCharacter;
+
+public class DebugCmd extends AbstractDevCmd {
+
+
+    public DebugCmd() {
+        super("debug");
+        //		super("debug", MBServerStatics.ACCESS_GROUP_ALL_TEAM, 0, false, false);
+    }
+
+    private static void toggleDebugTimer(PlayerCharacter pc, String name, int num, int duration, boolean toggle) {
+        if (toggle) {
+            DebugTimerJob dtj = new DebugTimerJob(pc, name, num, duration);
+            pc.renewTimer(name, dtj, duration);
+        } else
+            pc.cancelTimer(name);
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pc, String[] words,
+                          AbstractGameObject target) {
+        if (words.length < 2) {
+            this.sendUsage(pc);
+            return;
+        }
+
+        if (pc == null)
+            return;
+
+        //pc.setDebug must use bit sizes: 1, 2, 4, 8, 16, 32
+
+        String command = words[0].toLowerCase();
+        boolean toggle = (words[1].toLowerCase().equals("on")) ? true : false;
+
+        switch (command) {
+            case "magictrek":
+                pc.RUN_MAGICTREK = toggle;
+
+                break;
+            case "combat":
+                pc.setDebug(64, toggle);
+
+                break;
+            case "health":
+                toggleDebugTimer(pc, "Debug_Health", 1, 1000, toggle);
+
+                break;
+            case "mana":
+                toggleDebugTimer(pc, "Debug_Mana", 2, 1000, toggle);
+
+                break;
+            case "stamina":
+                toggleDebugTimer(pc, "Debug_Stamina", 3, 500, toggle);
+
+                break;
+            case "spells":
+                pc.setDebug(16, toggle);
+
+                break;
+            case "damageabsorber":
+                pc.setDebug(2, toggle);
+
+                break;
+            case "recast":
+            case "recycle":
+                pc.setDebug(4, toggle);
+
+                break;
+            case "seeinvis":
+                pc.setDebug(8, toggle);
+
+                break;
+            case "movement":
+                pc.setDebug(1, toggle);
+
+                break;
+            case "noaggro":
+                pc.setDebug(32, toggle);
+
+                break;
+            //		case "loot":
+            //			MBServerStatics.debugLoot = toggle;
+            //			break;
+
+            default:
+                String output = "Debug for " + command + " not found.";
+                throwbackError(pc, output);
+                return;
+        }
+
+
+        setTarget(pc); //for logging
+
+        String output = "Debug for " + command + " turned " + ((toggle) ? "on." : "off.");
+        throwbackInfo(pc, output);
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Runs debug commands";
+
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "'./Debug command on/off'";
+    }
+}

src/engine/devcmd/cmds/DebugMeleeSyncCmd.java

@@ -10,49 +10,48 @@
 package engine.devcmd.cmds;
 
 import engine.devcmd.AbstractDevCmd;
-import engine.objects.AbstractCharacter;
+import engine.gameManager.ChatManager;
 import engine.objects.AbstractGameObject;
-import engine.objects.CharacterRune;
 import engine.objects.PlayerCharacter;
 
-/**
- *
- */
+public class DebugMeleeSyncCmd extends AbstractDevCmd {
 
-public class PrintRunesCmd extends AbstractDevCmd {
-
-    public PrintRunesCmd() {
-        super("printrunes");
-        //		super("printstats", MBServerStatics.ACCESS_LEVEL_ADMIN);
+    public DebugMeleeSyncCmd() {
+        super("debugmeleesync");
     }
 
     @Override
     protected void _doCmd(PlayerCharacter pc, String[] words,
                           AbstractGameObject target) {
+        // Arg Count Check
+        if (words.length != 1) {
+            this.sendUsage(pc);
+            return;
+        }
 
-        AbstractCharacter tar;
+        String s = words[0].toLowerCase();
 
-        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);
+        if (s.equals("on")) {
+            pc.setDebug(64, true);
+            ChatManager.chatSayInfo(pc, "Melee Sync Debug ON");
+        } else if (s.equals("off")) {
+            pc.setDebug(64, false);
+            ChatManager.chatSayInfo(pc, "Melee Sync Debug OFF");
+        } else {
+            this.sendUsage(pc);
         }
     }
 
     @Override
     protected String _getHelpString() {
-        return "Returns the player's current stats";
+        return "Turns on/off melee sync debugging.";
+
     }
 
     @Override
     protected String _getUsageString() {
-        return "' /printstats'";
+        return "'./debugmeleesync on|off'";
+
     }
 
 }

src/engine/devcmd/cmds/DecachePlayerCmd.java

@@ -9,49 +9,46 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
-import engine.objects.AbstractCharacter;
+import engine.gameManager.DbManager;
 import engine.objects.AbstractGameObject;
 import engine.objects.PlayerCharacter;
 
 /**
  *
  */
+public class DecachePlayerCmd extends AbstractDevCmd {
 
-public class PrintEffectsCmd extends AbstractDevCmd {
-
-    public PrintEffectsCmd() {
-        super("printeffects");
-        //		super("printstats", MBServerStatics.ACCESS_LEVEL_ADMIN);
+    public DecachePlayerCmd() {
+        super("decacheplayer");
     }
 
     @Override
     protected void _doCmd(PlayerCharacter pc, String[] words,
                           AbstractGameObject target) {
+        if (words.length < 1) {
+            this.sendUsage(pc);
+        }
 
-        AbstractCharacter tar;
+        int objectUUID = Integer.parseInt(words[0]);
 
-        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);
+        if (DbManager.inCache(Enum.GameObjectType.PlayerCharacter, objectUUID)) {
+            this.setTarget(PlayerCharacter.getFromCache(objectUUID)); //for logging
+            PlayerCharacter.getFromCache(objectUUID).removeFromCache();
+        } else {
+            this.sendHelp(pc);
         }
     }
 
     @Override
     protected String _getHelpString() {
-        return "Returns the player's current stats";
+        return "No player found. Please make sure the table ID is correct.";
     }
 
     @Override
     protected String _getUsageString() {
-        return "' /printstats'";
+        return "' /decacheplayer <UUID>'";
     }
 
 }

src/engine/devcmd/cmds/DespawnCmd.java

@@ -0,0 +1,66 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.Enum.GameObjectType;
+import engine.devcmd.AbstractDevCmd;
+import engine.objects.AbstractGameObject;
+import engine.objects.Mob;
+import engine.objects.PlayerCharacter;
+
+public class DespawnCmd extends AbstractDevCmd {
+
+    public DespawnCmd() {
+        super("debugmob");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pc, String[] words,
+                          AbstractGameObject target) {
+
+
+        if (pc == null) {
+            return;
+        }
+
+
+        Mob mob = null;
+
+        if (target != null && target.getObjectType().equals(GameObjectType.Mob))
+            mob = (Mob) target;
+
+        if (mob == null)
+            mob = Mob.getFromCache(Integer.parseInt(words[1]));
+
+        if (mob == null)
+            return;
+
+        if (words[0].equalsIgnoreCase("respawn")) {
+            mob.respawn();
+            this.throwbackInfo(pc, "Mob with ID " + mob.getObjectUUID() + " Respawned");
+        } else if (words[0].equalsIgnoreCase("despawn")) {
+            mob.despawn();
+            this.throwbackInfo(pc, "Mob with ID " + mob.getObjectUUID() + " Despawned");
+        }
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Gets distance from a target.";
+
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "' /distance'";
+
+    }
+
+}

src/engine/devcmd/cmds/DistanceCmd.java

@@ -0,0 +1,65 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.devcmd.AbstractDevCmd;
+import engine.math.Vector3fImmutable;
+import engine.objects.AbstractGameObject;
+import engine.objects.AbstractWorldObject;
+import engine.objects.PlayerCharacter;
+
+public class DistanceCmd extends AbstractDevCmd {
+
+    public DistanceCmd() {
+        super("distance");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pc, String[] words,
+                          AbstractGameObject target) {
+
+
+        // Arg Count Check
+        if (words.length != 1) {
+            this.sendUsage(pc);
+            return;
+        }
+        if (pc == null) {
+            return;
+        }
+
+        if (target == null || !(target instanceof AbstractWorldObject)) {
+            throwbackError(pc, "No target found.");
+            return;
+        }
+
+        AbstractWorldObject awoTarget = (AbstractWorldObject) target;
+
+        Vector3fImmutable pcLoc = pc.getLoc();
+        Vector3fImmutable tarLoc = awoTarget.getLoc();
+        String out = "Distance: " + pcLoc.distance(tarLoc) +
+                "\r\nYour Loc: " + pcLoc.x + 'x' + pcLoc.y + 'x' + pcLoc.z +
+                "\r\nTarget Loc: " + tarLoc.x + 'x' + tarLoc.y + 'x' + tarLoc.z;
+        throwbackInfo(pc, out);
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Gets distance from a target.";
+
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "' /distance'";
+
+    }
+
+}

src/engine/devcmd/cmds/EffectCmd.java

@@ -0,0 +1,61 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.ChatManager;
+import engine.gameManager.PowersManager;
+import engine.objects.AbstractGameObject;
+import engine.objects.PlayerCharacter;
+import engine.powers.EffectsBase;
+
+/**
+ * @author Eighty
+ */
+public class EffectCmd extends AbstractDevCmd {
+
+    public EffectCmd() {
+        super("effect");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pcSender, String[] args,
+                          AbstractGameObject target) {
+        int ID = 0;
+        int token = 0;
+
+        if (args.length != 2) {
+            this.sendUsage(pcSender);
+            return;
+        }
+        ID = Integer.parseInt(args[0]);
+        token = Integer.parseInt(args[1]);
+
+        EffectsBase eb = PowersManager.setEffectToken(ID, token);
+        if (eb == null) {
+            throwbackError(pcSender, "Unable to find EffectsBase " + ID
+                    + " to modify.");
+            return;
+        }
+        ChatManager.chatSayInfo(pcSender,
+                "EffectsBase with ID " + ID + " changed token to " + token);
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "' /effect EffectsBaseID Token'";
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Temporarily places the effect token with the corresponding EffectsBase on the server";
+    }
+
+}

src/engine/devcmd/cmds/EnchantCmd.java

@@ -0,0 +1,87 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.devcmd.AbstractDevCmd;
+import engine.objects.*;
+
+public class EnchantCmd extends AbstractDevCmd {
+
+    public EnchantCmd() {
+        super("enchant");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pc, String[] words,
+                          AbstractGameObject target) {
+        int rank = 0;
+        if (words.length < 1) {
+            this.sendUsage(pc);
+            return;
+        }
+
+
+        try {
+            rank = Integer.parseInt(words[0]);
+        } catch (Exception e) {
+
+        }
+
+
+        Item item;
+        if (target == null || target instanceof Item)
+            item = (Item) target;
+        else {
+            throwbackError(pc, "Must have an item targeted");
+            return;
+        }
+
+        CharacterItemManager cim = pc.getCharItemManager();
+        if (cim == null) {
+            throwbackError(pc, "Unable to find the character item manager for player " + pc.getFirstName() + '.');
+            return;
+        }
+
+        if (words[0].equals("clear")) {
+            item.clearEnchantments();
+            cim.updateInventory();
+            this.setResult(String.valueOf(item.getObjectUUID()));
+        } else {
+            int cnt = words.length;
+            for (int i = 1; i < cnt; i++) {
+                String enchant = words[i];
+                boolean valid = true;
+                for (Effect eff : item.getEffects().values()) {
+                    if (eff.getEffectsBase().getIDString().equals(enchant)) {
+                        throwbackError(pc, "This item already has that enchantment");
+                        return;
+                    }
+                }
+                if (valid) {
+                    item.addPermanentEnchantmentForDev(enchant, rank);
+                    this.setResult(String.valueOf(item.getObjectUUID()));
+                } else
+                    throwbackError(pc, "Invalid Enchantment. Enchantment must consist of SUF-001 to SUF-328 or PRE-001 to PRE-334. Sent " + enchant + '.');
+            }
+            cim.updateInventory();
+        }
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Enchants an item with a prefix and suffix";
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "' /enchant clear/Enchant1 Enchant2 Enchant3 ...'";
+    }
+
+}

src/engine/devcmd/cmds/GateInfoCmd.java

@@ -0,0 +1,84 @@
+package engine.devcmd.cmds;
+
+import engine.Enum.BuildingGroup;
+import engine.Enum.GameObjectType;
+import engine.devcmd.AbstractDevCmd;
+import engine.math.Vector3fImmutable;
+import engine.objects.*;
+
+public class GateInfoCmd extends AbstractDevCmd {
+
+    public GateInfoCmd() {
+        super("gateinfo");
+    }
+
+    // AbstractDevCmd Overridden methods
+
+    @Override
+    protected void _doCmd(PlayerCharacter player, String[] args,
+                          AbstractGameObject target) {
+
+        Building targetBuilding;
+        String outString;
+        Runegate runeGate;
+        Blueprint blueprint;
+        String newline = "\r\n ";
+        targetBuilding = (Building) target;
+
+        if (targetBuilding.getObjectType() != GameObjectType.Building) {
+            throwbackInfo(player, "GateInfo: target must be a Building");
+            throwbackInfo(player, "Found" + targetBuilding.getObjectType().toString());
+            return;
+        }
+
+        blueprint = Blueprint._meshLookup.get(targetBuilding.getMeshUUID());
+
+        if (blueprint == null ||
+                (blueprint.getBuildingGroup() != BuildingGroup.RUNEGATE)) {
+            throwbackInfo(player, "showgate: target must be a Runegate");
+            return;
+        }
+
+
+        runeGate = Runegate._runegates.get(targetBuilding.getObjectUUID());
+
+        outString = "RungateType: " + runeGate.gateBuilding.getName();
+        outString += newline;
+
+        outString += "Portal State:";
+        outString += newline;
+
+        for (Portal portal : runeGate.getPortals()) {
+
+            outString += "Portal: " + portal.portalType.name();
+            outString += " Active: " + portal.isActive();
+            outString += " Dest: " + portal.targetGate.getName();
+            outString += newline;
+            outString += " Origin: " + portal.getPortalLocation().x + 'x';
+            outString += " " + portal.getPortalLocation().y + 'y';
+            outString += newline;
+
+            Vector3fImmutable offset = portal.getPortalLocation().subtract(targetBuilding.getLoc());
+            outString += " Offset: " + offset.x + "x " + offset.z + 'y';
+            outString += newline;
+            outString += newline;
+
+        }
+        outString += newline;
+        throwbackInfo(player, outString);
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Displays a runegate's gate status";
+    }
+
+    @Override
+    protected String _getUsageString() {
+
+
+        return "/gateinfo <target runegate> \n";
+    }
+
+
+}

src/engine/devcmd/cmds/GetBankCmd.java

@@ -6,39 +6,47 @@
 //      Magicbane Emulator Project © 2013 - 2022
 //                www.magicbane.com
 
-package engine.net.client.handlers;
 
+package engine.devcmd.cmds;
+
+import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.SessionManager;
-import engine.mbEnums;
 import engine.net.client.ClientConnection;
-import engine.net.client.msg.ClientNetMsg;
-import engine.net.client.msg.TargetObjectMsg;
+import engine.net.client.msg.VendorDialogMsg;
+import engine.objects.AbstractGameObject;
 import engine.objects.PlayerCharacter;
 
-public class TargetObjectMsgHandler extends AbstractClientMsgHandler {
+/**
+ * @author Eighty
+ */
+public class GetBankCmd extends AbstractDevCmd {
 
-    public TargetObjectMsgHandler() {
-        super();
+    public GetBankCmd() {
+        super("getbank");
     }
 
     @Override
-    protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
+    protected void _doCmd(PlayerCharacter pcSender, String[] args,
+                          AbstractGameObject target) {
+        if (pcSender == null)
+            return;
 
-        TargetObjectMsg msg = (TargetObjectMsg) baseMsg;
+        ClientConnection cc = SessionManager.getClientConnection(pcSender);
+        if (cc == null)
+            return;
 
-        PlayerCharacter player = SessionManager.getPlayerCharacter(origin);
-
-        if (player == null)
-            return true;
-
-        // TODO improve this later. hacky way to make sure player ingame is
-        // active.
-
-        if (!player.isActive())
-            player.setActive(true);
-
-        player.setLastTarget(mbEnums.GameObjectType.values()[msg.getTargetType()], msg.getTargetID());
-        return true;
+        VendorDialogMsg.getBank(pcSender, null, cc);
+        this.setTarget(pcSender); //for logging
     }
 
-}
+    @Override
+    protected String _getUsageString() {
+        return "' /getbank'";
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Opens bank window";
+    }
+
+}

src/engine/devcmd/cmds/GetCacheCountCmd.java

@@ -9,44 +9,32 @@
 
 package engine.devcmd.cmds;
 
-import engine.InterestManagement.InterestManager;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.DbManager;
-import engine.mbEnums;
 import engine.objects.AbstractGameObject;
-import engine.objects.NPC;
 import engine.objects.PlayerCharacter;
 
-public class SetRaceCmd extends AbstractDevCmd {
+public class GetCacheCountCmd extends AbstractDevCmd {
 
-    public SetRaceCmd() {
-        super("setRace");
+    public GetCacheCountCmd() {
+        super("getcachecount");
+        this.addCmdString("getcachecount");
     }
 
     @Override
-    protected void _doCmd(PlayerCharacter player, String[] words,
+    protected void _doCmd(PlayerCharacter pcSender, String[] args,
                           AbstractGameObject target) {
-
-        int newRace = Integer.parseInt(words[0]);
-
-        if (target.getObjectType().equals(mbEnums.GameObjectType.NPC) == false) {
-            throwbackError(player, "You Must Target An NPC");
-        }
-
-        NPC npc = (NPC) target;
-        npc.loadID = newRace;
-        DbManager.NPCQueries.UPDATE_RACE(npc, newRace);
-        InterestManager.reloadCharacter(npc);
-    }
-
-    @Override
-    protected String _getHelpString() {
-        return "Sets NPC race";
+        DbManager.printCacheCount(pcSender);
     }
 
     @Override
     protected String _getUsageString() {
-        return "' /setrace ID'";
+        return "' /getcachecount'";
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Get a count of the objects in the cache";
     }
 
 }

src/engine/devcmd/cmds/GetHeightCmd.java

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

src/engine/devcmd/cmds/GetMemoryCmd.java

@@ -0,0 +1,58 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.devcmd.AbstractDevCmd;
+import engine.objects.AbstractGameObject;
+import engine.objects.PlayerCharacter;
+
+public class GetMemoryCmd extends AbstractDevCmd {
+
+    public GetMemoryCmd() {
+        super("getmemory");
+    }
+
+    public static String getMemoryOutput(long memory) {
+        String out = "";
+        if (memory > 1073741824)
+            return (memory / 1073741824) + "GB";
+        else if (memory > 1048576)
+            return (memory / 1048576) + "MB";
+        else if (memory > 1024)
+            return (memory / 1048576) + "KB";
+        else
+            return memory + "B";
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pcSender, String[] words,
+                          AbstractGameObject target) {
+        if (pcSender == null)
+            return;
+
+        String hSize = getMemoryOutput(Runtime.getRuntime().totalMemory());
+        String mhSize = getMemoryOutput(Runtime.getRuntime().maxMemory());
+        String fhSize = getMemoryOutput(Runtime.getRuntime().freeMemory());
+
+        String out = "Heap Size: " + hSize + ", Max Heap Size: " + mhSize + ", Free Heap Size: " + fhSize;
+        throwbackInfo(pcSender, out);
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "' /getmemory'";
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "lists memory usage";
+    }
+
+}

src/engine/devcmd/cmds/GetOffsetCmd.java

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

src/engine/devcmd/cmds/GetRuneDropRateCmd.java

@@ -6,37 +6,38 @@
 //      Magicbane Emulator Project © 2013 - 2022
 //                www.magicbane.com
 
-package engine.net.client.handlers;
 
-import engine.net.client.ClientConnection;
-import engine.net.client.msg.ClientNetMsg;
-import engine.net.client.msg.GoldToVaultMsg;
-import engine.objects.Account;
+package engine.devcmd.cmds;
+
+import engine.devcmd.AbstractDevCmd;
+import engine.objects.AbstractGameObject;
 import engine.objects.PlayerCharacter;
 
-public class GoldToVaultMsgHandler extends AbstractClientMsgHandler {
 
-    public GoldToVaultMsgHandler() {
-        super();
+public class GetRuneDropRateCmd extends AbstractDevCmd {
+
+    public GetRuneDropRateCmd() {
+        super("getrunedroprate");
     }
 
     @Override
-    protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
+    protected void _doCmd(PlayerCharacter pcSender, String[] words,
+                          AbstractGameObject target) {
+        if (pcSender == null)
+            return;
 
-        PlayerCharacter player = origin.getPlayerCharacter();
-
-        GoldToVaultMsg msg = (GoldToVaultMsg) baseMsg;
-
-        if (player == null)
-            return true;
-
-        Account account = player.getAccount();
-
-        if (account == null)
-            return true;
-
-        account.transferGoldFromInventoryToVault(msg, origin);
-        return true;
+        String out = "Depracated";
+        throwbackInfo(pcSender, out);
     }
 
-}
+    @Override
+    protected String _getUsageString() {
+        return "' /getrunedroprate'";
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "lists drop rates for runes and contracts in non-hotzone.";
+    }
+
+}

src/engine/devcmd/cmds/GetVaultCmd.java

@@ -12,7 +12,7 @@ package engine.devcmd.cmds;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.SessionManager;
 import engine.net.client.ClientConnection;
-import engine.net.client.handlers.VendorDialogMsgHandler;
+import engine.net.client.msg.VendorDialogMsg;
 import engine.objects.AbstractGameObject;
 import engine.objects.PlayerCharacter;
 
@@ -32,7 +32,7 @@ public class GetVaultCmd extends AbstractDevCmd {
         if (cc == null)
             return;
 
-        VendorDialogMsgHandler.getVault(pcSender, null, cc);
+        VendorDialogMsg.getVault(pcSender, null, cc);
         this.setTarget(pcSender); //for logging
     }
 

src/engine/devcmd/cmds/GetZoneCmd.java

@@ -0,0 +1,67 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      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;
+
+import java.util.ArrayList;
+
+public class GetZoneCmd extends AbstractDevCmd {
+
+    public GetZoneCmd() {
+        super("getzone");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pcSender, String[] words,
+                          AbstractGameObject target) {
+        if (pcSender == null)
+            return;
+
+        if (words.length != 1) {
+            this.sendUsage(pcSender);
+            return;
+        }
+
+        ArrayList<Zone> allIn = new ArrayList<>();
+        switch (words[0].toLowerCase()) {
+            case "all":
+                throwbackInfo(pcSender, "All zones currently in");
+                allIn = ZoneManager.getAllZonesIn(pcSender.getLoc());
+                break;
+            case "smallest":
+                throwbackInfo(pcSender, "Smallest zone currently in");
+                Zone zone = ZoneManager.findSmallestZone(pcSender.getLoc());
+                allIn.add(zone);
+                break;
+            default:
+                this.sendUsage(pcSender);
+                return;
+        }
+
+        for (Zone zone : allIn)
+            throwbackInfo(pcSender, zone.getName() + "; UUID: " + zone.getObjectUUID() + ", loadNum: " + zone.getLoadNum());
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "' /getzone smallest/all'";
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "lists what zones a player is in";
+    }
+
+}

src/engine/devcmd/cmds/GotoBoundsCmd.java

@@ -0,0 +1,107 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.Enum.GameObjectType;
+import engine.devcmd.AbstractDevCmd;
+import engine.math.Vector3fImmutable;
+import engine.objects.AbstractGameObject;
+import engine.objects.Building;
+import engine.objects.PlayerCharacter;
+
+public class GotoBoundsCmd extends AbstractDevCmd {
+
+    public GotoBoundsCmd() {
+        super("gotobounds");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter player, String[] words,
+                          AbstractGameObject target) {
+
+        String corner = words[0];
+        Vector3fImmutable targetLoc = Vector3fImmutable.ZERO;
+
+        if (target == null || !target.getObjectType().equals(GameObjectType.Building)) {
+            this.throwbackError(player, "No Building Selected");
+            return;
+        }
+
+        Building building = (Building) target;
+
+        if (building.getBounds() == null) {
+            this.throwbackInfo(player, "No valid Bounds for building UUID " + building.getObjectUUID());
+            return;
+        }
+        float x = building.getBounds().getHalfExtents().x;
+        float z = building.getBounds().getHalfExtents().y;
+
+        if (building.getBlueprint() != null) {
+            x = building.getBlueprint().getExtents().x;
+            z = building.getBlueprint().getExtents().y;
+        }
+
+        float topLeftX = building.getLoc().x - x;
+        float topLeftY = building.getLoc().z - z;
+
+        float topRightX = building.getLoc().x + x;
+        float topRightY = building.getLoc().z - z;
+
+        float bottomLeftX = building.getLoc().x - x;
+        float bottomLeftY = building.getLoc().z + z;
+
+        float bottomRightX = building.getLoc().x + x;
+        float bottomRightY = building.getLoc().z + z;
+
+
+        switch (corner) {
+            case "topleft":
+                targetLoc = new Vector3fImmutable(topLeftX, 0, topLeftY);
+                break;
+            case "topright":
+                targetLoc = new Vector3fImmutable(topRightX, 0, topRightY);
+                break;
+            case "bottomleft":
+                targetLoc = new Vector3fImmutable(bottomLeftX, 0, bottomLeftY);
+                break;
+            case "bottomright":
+                targetLoc = new Vector3fImmutable(bottomRightX, 0, bottomRightY);
+                break;
+            default:
+                this.throwbackInfo(player, "wrong corner name. use topleft , topright , bottomleft , bottomright");
+                return;
+
+        }
+
+        targetLoc = Vector3fImmutable.transform(building.getLoc(), targetLoc, building.getBounds().getRotationDegrees());
+
+        // Teleport player
+
+        if (targetLoc == Vector3fImmutable.ZERO) {
+            this.throwbackError(player, "Failed to locate UUID");
+            return;
+        }
+
+        player.teleport(targetLoc);
+
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Teleports player to a UUID";
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "' /gotoobj <UID>'";
+
+    }
+
+}

src/engine/devcmd/cmds/GotoCmd.java

@@ -9,11 +9,11 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum.GameObjectType;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.DbManager;
 import engine.gameManager.SessionManager;
 import engine.math.Vector3fImmutable;
-import engine.mbEnums.GameObjectType;
 import engine.objects.*;
 import engine.server.MBServerStatics;
 
@@ -81,7 +81,7 @@ public class GotoCmd extends AbstractDevCmd {
                 continue;
             Zone zone = city.getParent();
             if (zone != null) {
-                if (zone.isNPCCity || zone.guild_zone)
+                if (zone.isNPCCity() || zone.isPlayerCity())
                     loc = Vector3fImmutable.getRandomPointOnCircle(zone.getLoc(), MBServerStatics.TREE_TELEPORT_RADIUS);
                 else
                     loc = zone.getLoc();
@@ -97,10 +97,10 @@ public class GotoCmd extends AbstractDevCmd {
                 Zone zone = (Zone) zoneAgo;
                 if (zone == null)
                     continue;
-                if (!zone.zoneName.equalsIgnoreCase(cityName))
+                if (!zone.getName().equalsIgnoreCase(cityName))
                     continue;
                 if (zone != null) {
-                    if (zone.isNPCCity || zone.guild_zone)
+                    if (zone.isNPCCity() || zone.isPlayerCity())
                         loc = Vector3fImmutable.getRandomPointOnCircle(zone.getLoc(), MBServerStatics.TREE_TELEPORT_RADIUS);
                     else
                         loc = zone.getLoc();

src/engine/devcmd/cmds/GotoObj.java

@@ -9,10 +9,10 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.DbManager;
 import engine.math.Vector3fImmutable;
-import engine.mbEnums;
 import engine.objects.*;
 
 public class GotoObj extends AbstractDevCmd {
@@ -27,7 +27,7 @@ public class GotoObj extends AbstractDevCmd {
 
         int uuid;
         Vector3fImmutable targetLoc = Vector3fImmutable.ZERO;
-        mbEnums.DbObjectType objectType;
+        Enum.DbObjectType objectType;
 
         try {
             uuid = Integer.parseInt(words[0]);
@@ -41,37 +41,37 @@ public class GotoObj extends AbstractDevCmd {
         switch (objectType) {
 
             case NPC:
-                NPC npc = (NPC) DbManager.getFromCache(mbEnums.GameObjectType.NPC, uuid);
+                NPC npc = (NPC) DbManager.getFromCache(Enum.GameObjectType.NPC, uuid);
 
                 if (npc != null)
                     targetLoc = npc.getLoc();
                 break;
             case MOB:
-                Mob mob = (Mob) DbManager.getFromCache(mbEnums.GameObjectType.Mob, uuid);
+                Mob mob = (Mob) DbManager.getFromCache(Enum.GameObjectType.Mob, uuid);
 
                 if (mob != null)
                     targetLoc = mob.getLoc();
                 break;
             case CHARACTER:
-                PlayerCharacter playerCharacter = (PlayerCharacter) DbManager.getFromCache(mbEnums.GameObjectType.PlayerCharacter, uuid);
+                PlayerCharacter playerCharacter = (PlayerCharacter) DbManager.getFromCache(Enum.GameObjectType.PlayerCharacter, uuid);
 
                 if (playerCharacter != null)
                     targetLoc = playerCharacter.getLoc();
                 break;
             case BUILDING:
-                Building building = (Building) DbManager.getFromCache(mbEnums.GameObjectType.Building, uuid);
+                Building building = (Building) DbManager.getFromCache(Enum.GameObjectType.Building, uuid);
 
                 if (building != null)
                     targetLoc = building.getLoc();
                 break;
             case ZONE:
-                Zone zone = (Zone) DbManager.getFromCache(mbEnums.GameObjectType.Zone, uuid);
+                Zone zone = (Zone) DbManager.getFromCache(Enum.GameObjectType.Zone, uuid);
 
                 if (zone != null)
                     targetLoc = zone.getLoc();
                 break;
             case CITY:
-                City city = (City) DbManager.getFromCache(mbEnums.GameObjectType.City, uuid);
+                City city = (City) DbManager.getFromCache(Enum.GameObjectType.City, uuid);
 
                 if (city != null)
                     targetLoc = city.getLoc();

src/engine/devcmd/cmds/HotzoneCmd.java

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

src/engine/devcmd/cmds/InfoCmd.java

@@ -9,14 +9,14 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum;
+import engine.Enum.BuildingGroup;
+import engine.Enum.GameObjectType;
+import engine.Enum.TargetColor;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.BuildingManager;
 import engine.gameManager.SessionManager;
 import engine.math.Vector3fImmutable;
-import engine.mbEnums;
-import engine.mbEnums.BuildingGroup;
-import engine.mbEnums.GameObjectType;
-import engine.mbEnums.TargetColor;
 import engine.objects.*;
 import engine.util.StringUtils;
 
@@ -253,9 +253,9 @@ public class InfoCmd extends AbstractDevCmd {
                 output += newline;
                 output += "InSession : " + SessionManager.getPlayerCharacterByID(target.getObjectUUID()) != null ? " true " : " false";
                 output += newline;
-                output += "RaceType: " + targetPC.race.getRaceType().name();
+                output += "RaceType: " + targetPC.getRace().getRaceType().name();
                 output += newline;
-                output += "Race: " + targetPC.race.getName();
+                output += "Race: " + targetPC.getRace().getName();
                 output += newline;
                 output += "Safe:" + targetPC.inSafeZone();
                 output += newline;
@@ -278,7 +278,7 @@ public class InfoCmd extends AbstractDevCmd {
                     output += "Account ID: UNKNOWN";
 
                 output += newline;
-                output += "Inventory Weight:" + (targetPC.charItemManager.getInventoryWeight() + targetPC.charItemManager.getEquipWeight());
+                output += "Inventory Weight:" + (targetPC.getCharItemManager().getInventoryWeight() + targetPC.getCharItemManager().getEquipWeight());
                 output += newline;
                 output += "Max Inventory Weight:" + ((int) targetPC.statStrBase * 3);
                 output += newline;
@@ -291,7 +291,7 @@ public class InfoCmd extends AbstractDevCmd {
                 output += "inFloor :" + targetPC.getInFloorID();
                 output += newline;
 
-                BaseClass baseClass = targetPC.baseClass;
+                BaseClass baseClass = targetPC.getBaseClass();
 
                 if (baseClass != null)
                     output += StringUtils.addWS("Class: " + baseClass.getName(), 20);
@@ -369,8 +369,7 @@ public class InfoCmd extends AbstractDevCmd {
                 output += newline;
                 output += "InventorySet: " + targetNPC.getContract().inventorySet;
                 output += newline;
-                Contract contract1 = targetNPC.getContract();
-                output += contract1.allowedBuildings.toString();
+                output += targetNPC.getContract().getAllowedBuildings().toString();
                 output += newline;
                 output += "Extra Rune: " + targetNPC.getContract().getExtraRune();
 
@@ -384,12 +383,11 @@ public class InfoCmd extends AbstractDevCmd {
                 output += newline;
                 if (mobBase != null) {
                     output += newline;
-                    Contract contract = targetNPC.getContract();
-                    output += "Slottable: " + contract.allowedBuildings.toString();
+                    output += "Slottable: " + targetNPC.getContract().getAllowedBuildings().toString();
                     output += newline;
                     output += "EquipSet: " + targetNPC.getEquipmentSetID();
                     output += newline;
-                    output += "Parent Zone LoadNum : " + targetNPC.getParentZone().templateID;
+                    output += "Parent Zone LoadNum : " + targetNPC.getParentZone().getLoadNum();
 
                 }
 
@@ -438,13 +436,11 @@ public class InfoCmd extends AbstractDevCmd {
                 if (targetMob.isPet()) {
                     output += "isPet: true";
                     output += newline;
-                    if ((targetMob.agentType.equals(mbEnums.AIAgentType.PET)))
+                    if ((targetMob.agentType.equals(Enum.AIAgentType.PET)))
                         output += "isSummonedPet: true";
                     else
                         output += "isSummonedPet: false";
-
-
-                    PlayerCharacter owner = (PlayerCharacter) targetMob.guardCaptain;
+                    PlayerCharacter owner = targetMob.getOwner();
                     if (owner != null)
                         output += "     owner: " + owner.getObjectUUID();
                     output += newline;
@@ -458,7 +454,7 @@ public class InfoCmd extends AbstractDevCmd {
                     output += newline;
 
                 }
-                if ((targetMob.agentType.equals(mbEnums.AIAgentType.MOBILE))) {
+                if ((targetMob.agentType.equals(Enum.AIAgentType.MOBILE))) {
                     output += "SpawnRadius: " + targetMob.getSpawnRadius();
                     output += newline;
                     output += "Spawn Timer: " + targetMob.getSpawnTimeAsString();
@@ -475,7 +471,7 @@ public class InfoCmd extends AbstractDevCmd {
                 output += "EquipSet: " + targetMob.equipmentSetID;
                 output += newline;
                 try {
-                    output += "Parent Zone LoadNum : " + targetMob.parentZone.templateID;
+                    output += "Parent Zone LoadNum : " + targetMob.getParentZone().getLoadNum();
                 } catch (Exception ex) {
                     //who cares
                 }
@@ -496,28 +492,28 @@ public class InfoCmd extends AbstractDevCmd {
                     output += newline;
                     output += "No building found." + newline;
                 }
-                int max = (int) (4.882 * targetMob.level + 121.0);
-                if (max > 321) {
+                int max = (int)(4.882 * targetMob.level + 121.0);
+                if(max > 321){
                     max = 321;
                 }
-                int min = (int) (4.469 * targetMob.level - 3.469);
+                int min = (int)(4.469 * targetMob.level - 3.469);
                 output += "Min Loot Roll = " + min;
                 output += "Max Loot Roll = " + max;
                 break;
             case Item:  //intentional passthrough
             case MobLoot:
                 Item item = (Item) target;
-                ItemTemplate template = ItemTemplate.templates.get(item.templateID);
-                output += StringUtils.addWS("Template: " + template.template_id, 20);
-                output += "Weight: " + template.item_wt;
+                ItemBase itemBase = item.getItemBase();
+                output += StringUtils.addWS("ItemBase: " + itemBase.getUUID(), 20);
+                output += "Weight: " + itemBase.getWeight();
                 output += newline;
                 DecimalFormat df = new DecimalFormat("###,###,###,###,##0");
                 output += StringUtils.addWS("Qty: "
                         + df.format(item.getNumOfItems()), 20);
-                output += "Charges: " + (byte) item.chargesRemaining
-                        + '/' + item.template.item_initial_charges;
+                output += "Charges: " + item.getChargesRemaining()
+                        + '/' + item.getChargesMax();
                 output += newline;
-                output += "Name: " + template.item_base_name;
+                output += "Name: " + itemBase.getName();
                 output += newline;
                 output += item.getContainerInfo();
 

src/engine/devcmd/cmds/MakeBaneCmd.java

@@ -0,0 +1,212 @@
+// • ▌ ▄ ·.  ▄▄▄·  ▄▄ • ▪   ▄▄· ▄▄▄▄·  ▄▄▄·  ▐▄▄▄  ▄▄▄ .
+// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌·
+// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀
+// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌
+// ▀▀  █▪▀▀▀ ▀  ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀  ▀  ▀ ▀▀  █▪ ▀▀▀
+//      Magicbane Emulator Project © 2013 - 2022
+//                www.magicbane.com
+
+
+package engine.devcmd.cmds;
+
+import engine.Enum.ProtectionState;
+import engine.InterestManagement.WorldGrid;
+import engine.devcmd.AbstractDevCmd;
+import engine.gameManager.BuildingManager;
+import engine.gameManager.ChatManager;
+import engine.gameManager.DbManager;
+import engine.gameManager.ZoneManager;
+import engine.math.Vector3f;
+import engine.math.Vector3fImmutable;
+import engine.objects.*;
+import org.pmw.tinylog.Logger;
+
+/**
+ * @author Eighty
+ */
+public class MakeBaneCmd extends AbstractDevCmd {
+
+    public MakeBaneCmd() {
+        super("makebane");
+    }
+
+    @Override
+    protected void _doCmd(PlayerCharacter pc, String[] words,
+                          AbstractGameObject target) {
+        if (words.length < 1 || words.length > 2) {
+            this.sendUsage(pc);
+            return;
+        }
+
+        int attackerID = 0;
+        int rank = 8;
+
+        if (words.length == 2) {
+            try {
+                attackerID = Integer.parseInt(words[0]);
+                rank = Integer.parseInt(words[1]);
+            } catch (NumberFormatException e) {
+                throwbackError(pc, "AttackerGuildID must be a number, " + words[0] + " is invalid");
+                return;
+            }
+        } else if (words.length == 1) {
+            if (target == null) {
+                throwbackError(pc, "No target specified");
+                return;
+            }
+
+            if (!(target instanceof PlayerCharacter)) {
+                throwbackError(pc, "Target is not a player");
+                return;
+            }
+            attackerID = target.getObjectUUID();
+
+            try {
+                rank = Integer.parseInt(words[0]);
+            } catch (NumberFormatException e) {
+                throwbackError(pc, "Rank must be specified, 1 through 8");
+                return;
+            }
+        }
+
+        if (rank < 1 || rank > 8) {
+            throwbackError(pc, "Rank must be 1 through 8");
+            return;
+        }
+
+        PlayerCharacter player = PlayerCharacter.getPlayerCharacter(attackerID);
+
+
+        if (player.getGuild().isEmptyGuild()) {
+            throwbackError(pc, "Errant's can not place banes");
+            return;
+        }
+
+        AbstractCharacter attackerAGL = Guild.GetGL(player.getGuild());
+
+        if (attackerAGL == null) {
+            throwbackError(pc, "No guild leader found for attacking guild.");
+            return;
+        }
+
+        if (!(attackerAGL instanceof PlayerCharacter)) {
+            throwbackError(pc, "Attacking guild leader is an NPC.");
+            return;
+        }
+
+        if (player.getGuild().isNPCGuild()) {
+            throwbackError(pc, "The guild used is an npc guild. They can not bane.");
+            return;
+        }
+
+        //		if (player.getGuild().getOwnedCity() != null) {
+        //			throwbackError(pc, "The attacking guild already has a city.");
+        //			return;
+        //		}
+
+        Zone zone = ZoneManager.findSmallestZone(pc.getLoc());
+
+        if (zone == null) {
+            throwbackError(pc, "Unable to find the zone you're in.");
+            return;
+        }
+
+        if (!zone.isPlayerCity()) {
+            throwbackError(pc, "This is not a player city.");
+            return;
+        }
+
+        City city = City.getCity(zone.getPlayerCityUUID());
+        if (city == null) {
+            throwbackError(pc, "Unable to find the city associated with this zone.");
+            return;
+        }
+
+        if (city.getTOL() == null) {
+            throwbackError(pc, "Unable to find the tree of life for this city.");
+            return;
+        }
+
+        if (city.getBane() != null) {
+            throwbackError(pc, "This city is already baned.");
+            return;
+        }
+
+        if (Bane.getBaneByAttackerGuild(player.getGuild()) != null) {
+            throwbackError(pc, "This guild is already baning someone.");
+            return;
+        }
+
+        Blueprint blueprint = Blueprint.getBlueprint(24300);
+
+        if (blueprint == null) {
+            throwbackError(pc, "Unable to find building set for banestone.");
+            return;
+        }
+
+        Vector3f rot = new Vector3f(0, 0, 0);
+
+        // *** Refactor : Overlap test goes here
+
+        //Let's drop a banestone!
+        Vector3fImmutable localLocation = ZoneManager.worldToLocal(pc.getLoc(), zone);
+
+        if (localLocation == null) {
+            ChatManager.chatSystemError(pc, "Failed to convert world location to zone location. Contact a CCR.");
+            Logger.info("Failed to Convert World coordinates to local zone coordinates");
+            return;
+        }
+
+        Building stone = DbManager.BuildingQueries.CREATE_BUILDING(
+                zone.getObjectUUID(), pc.getObjectUUID(), blueprint.getName(), blueprint.getBlueprintUUID(),
+                localLocation, 1.0f, blueprint.getMaxHealth(rank), ProtectionState.PROTECTED, 0, rank,
+                null, blueprint.getBlueprintUUID(), 1, 0.0f);
+
+        if (stone == null) {
+            ChatManager.chatSystemError(pc, "Failed to create banestone.");
+            return;
+        }
+        stone.addEffectBit((1 << 19));
+        stone.setRank((byte) rank);
+        stone.setMaxHitPoints(blueprint.getMaxHealth(stone.getRank()));
+        stone.setCurrentHitPoints(stone.getMaxHitPoints());
+        BuildingManager.setUpgradeDateTime(stone, null, 0);
+
+        //Make the bane
+
+        Bane bane = Bane.makeBane(player, city, stone);
+
+        if (bane == null) {
+
+            //delete bane stone, failed to make bane object
+            DbManager.BuildingQueries.DELETE_FROM_DATABASE(stone);
+
+            throwbackError(pc, "Failed to create bane.");
+            return;
+        }
+
+        WorldGrid.addObject(stone, pc);
+
+        //Add baned effect to TOL
+        city.getTOL().addEffectBit((1 << 16));
+        city.getTOL().updateEffects();
+
+        Vector3fImmutable movePlayerOutsideStone = player.getLoc();
+        movePlayerOutsideStone = movePlayerOutsideStone.setX(movePlayerOutsideStone.x + 10);
+        movePlayerOutsideStone = movePlayerOutsideStone.setZ(movePlayerOutsideStone.z + 10);
+        player.teleport(movePlayerOutsideStone);
+
+        throwbackInfo(pc, "The city has been succesfully baned.");
+    }
+
+    @Override
+    protected String _getHelpString() {
+        return "Creates an bane.";
+    }
+
+    @Override
+    protected String _getUsageString() {
+        return "'./makebane playerUUID baneRank'";
+    }
+
+}

src/engine/devcmd/cmds/MakeItemCmd.java

@@ -9,13 +9,16 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum.ItemContainerType;
+import engine.Enum.ItemType;
+import engine.Enum.OwnerType;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.DbManager;
-import engine.mbEnums.ItemType;
-import engine.mbEnums.OwnerType;
 import engine.objects.*;
 import engine.powers.EffectsBase;
 
+import java.util.ArrayList;
+
 /**
  * @author Eighty
  */
@@ -29,6 +32,48 @@ public class MakeItemCmd extends AbstractDevCmd {
     protected void _doCmd(PlayerCharacter pc, String[] words,
                           AbstractGameObject target) {
 
+        if (words[0].equals("resources")) {
+            for (int ibID : Warehouse.getMaxResources().keySet()) {
+                if (ibID == 7)
+                    continue;
+
+                ItemBase ib = ItemBase.getItemBase(ibID);
+
+                short weight = ib.getWeight();
+                if (!pc.getCharItemManager().hasRoomInventory(weight)) {
+                    throwbackError(pc, "Not enough room in inventory for any more of this item");
+
+                    pc.getCharItemManager().updateInventory();
+                    return;
+                }
+
+                boolean worked = false;
+                Item item = new Item(ib, pc.getObjectUUID(),
+                        OwnerType.PlayerCharacter, (byte) 0, (byte) 0, (short) ib.getDurability(), (short) ib.getDurability(),
+                        true, false, ItemContainerType.INVENTORY, (byte) 0,
+                        new ArrayList<>(), "");
+
+                item.setNumOfItems(Warehouse.getMaxResources().get(ibID));
+
+                try {
+                    item = DbManager.ItemQueries.ADD_ITEM(item);
+                    worked = true;
+                } catch (Exception e) {
+                    throwbackError(pc, "DB error 1: Unable to create item. " + e.getMessage());
+                    return;
+                }
+
+                if (item == null || !worked) {
+                    throwbackError(pc, "DB error 2: Unable to create item.");
+                    return;
+                }
+
+
+                //add item to inventory
+                pc.getCharItemManager().addItemToInventory(item);
+            }
+            return;
+        }
         if (words.length < 3 || words.length > 5) {
             this.sendUsage(pc);
             return;
@@ -58,23 +103,16 @@ public class MakeItemCmd extends AbstractDevCmd {
             numItems = (numItems > 5000) ? 5000 : numItems;
         }
 
-        int templateID;
-        ItemTemplate template;
+        int itembaseID;
         try {
-            templateID = Integer.parseInt(words[0]);
-            template = ItemTemplate.templates.get(words[0].toLowerCase());
-
-            if (template == null) {
+            itembaseID = Integer.parseInt(words[0]);
+        } catch (NumberFormatException e) {
+            itembaseID = ItemBase.getIDByName(words[0].toLowerCase());
+            if (itembaseID == 0) {
                 throwbackError(pc, "Supplied type " + words[0]
                         + " failed to parse to an Integer");
                 return;
             }
-
-            if (template.item_type == ItemType.GOLD) {
-                this.throwbackInfo(pc, "use /addgold to add gold.");
-                return;
-            }
-
         } catch (Exception e) {
             throwbackError(pc,
                     "An unknown exception occurred when trying to use createitem command for type "
@@ -82,6 +120,10 @@ public class MakeItemCmd extends AbstractDevCmd {
             return; // NaN
         }
 
+        if (itembaseID == 7) {
+            this.throwbackInfo(pc, "use /addgold to add gold.");
+            return;
+        }
 
         String prefix = "";
         String suffix = "";
@@ -132,54 +174,57 @@ public class MakeItemCmd extends AbstractDevCmd {
                 return;
             }
         }
-        template = ItemTemplate.templates.get(templateID);
-
-        if (template == null) {
-            throwbackError(pc, "Unable to find template " + templateID);
+        ItemBase ib = ItemBase.getItemBase(itembaseID);
+        if (ib == null) {
+            throwbackError(pc, "Unable to find itembase of ID " + itembaseID);
             return;
         }
 
         if ((numItems > 1)
-                && (template.item_type.equals(ItemType.RESOURCE) == false)
-                && (template.item_type.equals(ItemType.OFFERING)) == false)
+                && (ib.getType().equals(ItemType.RESOURCE) == false)
+                && (ib.getType().equals(ItemType.OFFERING)) == false)
             numItems = 1;
 
-        CharacterItemManager cim = pc.charItemManager;
-
+        CharacterItemManager cim = pc.getCharItemManager();
         if (cim == null) {
             throwbackError(pc, "Unable to find the character item manager for player " + pc.getFirstName() + '.');
             return;
         }
 
+        byte charges = (byte) ib.getNumCharges();
+        short dur = (short) ib.getDurability();
+
         String result = "";
-
         for (int i = 0; i < quantity; i++) {
-
-            int weight = template.item_wt;
-
+            short weight = ib.getWeight();
             if (!cim.hasRoomInventory(weight)) {
                 throwbackError(pc, "Not enough room in inventory for any more of this item. " + i + " produced.");
-
                 if (i > 0)
                     cim.updateInventory();
-
                 return;
             }
 
-            Item item = new Item(templateID);
-            item.ownerID = pc.getObjectUUID();
-            item.ownerType = OwnerType.PlayerCharacter;
-
+            boolean worked = false;
+            Item item = new Item(ib, pc.getObjectUUID(),
+                    OwnerType.PlayerCharacter, charges, charges, dur, dur,
+                    true, false, ItemContainerType.INVENTORY, (byte) 0,
+                    new ArrayList<>(), "");
             if (numItems > 1)
                 item.setNumOfItems(numItems);
 
             try {
-                item = DbManager.ItemQueries.PERSIST(item);
+                item = DbManager.ItemQueries.ADD_ITEM(item);
+                worked = true;
             } catch (Exception e) {
                 throwbackError(pc, "DB error 1: Unable to create item. " + e.getMessage());
                 return;
             }
 
+            if (item == null || !worked) {
+                throwbackError(pc, "DB error 2: Unable to create item.");
+                return;
+            }
+
             //create prefix
             if (!prefix.isEmpty())
                 item.addPermanentEnchantmentForDev(prefix, 0);
@@ -198,12 +243,12 @@ public class MakeItemCmd extends AbstractDevCmd {
 
     @Override
     protected String _getHelpString() {
-        return "Creates an item of type templateID with a prefix and suffix";
+        return "Creates an item of type 'itembaseID' with a prefix and suffix";
     }
 
     @Override
     protected String _getUsageString() {
-        return "'./makeitem templateID PrefixID SuffixID [quantity] [numResources]'";
+        return "'./makeitem itembaseID PrefixID SuffixID [quantity] [numResources]'";
     }
 
 }

src/engine/devcmd/cmds/PrintBankCmd.java

@@ -47,17 +47,13 @@ public class PrintBankCmd extends AbstractDevCmd {
         }
 
 
-        CharacterItemManager cim = ((AbstractCharacter) tar).charItemManager;
+        CharacterItemManager cim = ((AbstractCharacter) tar).getCharItemManager();
         ArrayList<Item> list = cim.getBank();
         throwbackInfo(pc, "Bank for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
-
         for (Item item : list) {
-            ItemTemplate template = ItemTemplate.templates.get(item.templateID);
-            throwbackInfo(pc, "    " + template.item_base_name + ", count: " + item.getNumOfItems());
+            throwbackInfo(pc, "    " + item.getItemBase().getName() + ", count: " + item.getNumOfItems());
         }
-
         Item gold = cim.getGoldBank();
-
         if (gold != null)
             throwbackInfo(pc, "    Gold, count: " + gold.getNumOfItems());
         else

src/engine/devcmd/cmds/PrintBonusesCmd.java

@@ -9,9 +9,9 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum.GameObjectType;
 import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.ChatManager;
-import engine.mbEnums.GameObjectType;
 import engine.objects.*;
 import engine.powers.effectmodifiers.AbstractEffectModifier;
 
@@ -33,8 +33,7 @@ public class PrintBonusesCmd extends AbstractDevCmd {
             if (target instanceof Item) {
                 type = "Item";
                 tar = (Item) target;
-                ItemTemplate template = ItemTemplate.templates.get(((Item) tar).templateID);
-                name = template.item_base_name;
+                name = ((Item) tar).getItemBase().getName();
             } else if (target instanceof AbstractCharacter) {
                 tar = (AbstractCharacter) target;
                 name = ((AbstractCharacter) tar).getFirstName();

src/engine/devcmd/cmds/PrintEquipCmd.java

@@ -9,9 +9,8 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum.GameObjectType;
 import engine.devcmd.AbstractDevCmd;
-import engine.mbEnums;
-import engine.mbEnums.GameObjectType;
 import engine.objects.*;
 
 import java.util.concurrent.ConcurrentHashMap;
@@ -64,9 +63,9 @@ public class PrintEquipCmd extends AbstractDevCmd {
         if (tar.getObjectType() == GameObjectType.Mob) {
             Mob tarMob = (Mob) tar;
             throwbackInfo(pc, "Equip for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
-            for (mbEnums.EquipSlotType slot : tarMob.charItemManager.equipped.keySet()) {
-                Item equip = tarMob.charItemManager.equipped.get(slot);
-                throwbackInfo(pc, equip.templateID + "  :  " + equip.template.item_base_name + ", slot: " + slot);
+            for (int slot : tarMob.getEquip().keySet()) {
+                MobEquipment equip = tarMob.getEquip().get(slot);
+                throwbackInfo(pc, equip.getItemBase().getUUID() + "  :  " + equip.getItemBase().getName() + ", slot: " + slot);
             }
             return;
         }
@@ -74,20 +73,19 @@ public class PrintEquipCmd extends AbstractDevCmd {
         if (tar.getObjectType() == GameObjectType.NPC) {
             NPC tarMob = (NPC) tar;
             throwbackInfo(pc, "Equip for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
-            for (mbEnums.EquipSlotType slot : tarMob.charItemManager.equipped.keySet()) {
-                Item equip = tarMob.charItemManager.equipped.get(slot);
-                throwbackInfo(pc, equip.templateID + "  :  " + equip.template.item_base_name + ", slot: " + slot);
+            for (int slot : tarMob.getEquip().keySet()) {
+                MobEquipment equip = tarMob.getEquip().get(slot);
+                throwbackInfo(pc, equip.getItemBase().getUUID() + "  :  " + equip.getItemBase().getName() + ", slot: " + slot);
             }
             return;
         }
 
-        CharacterItemManager cim = ((AbstractCharacter) tar).charItemManager;
-        ConcurrentHashMap<mbEnums.EquipSlotType, Item> list = cim.getEquipped();
+        CharacterItemManager cim = ((AbstractCharacter) tar).getCharItemManager();
+        ConcurrentHashMap<Integer, Item> list = cim.getEquipped();
         throwbackInfo(pc, "Equip for " + type + ' ' + name + " (" + tar.getObjectUUID() + ')');
-
-        for (mbEnums.EquipSlotType slot : list.keySet()) {
+        for (Integer slot : list.keySet()) {
             Item item = list.get(slot);
-            throwbackInfo(pc, "    " + item.template.item_base_name + ", slot: " + slot);
+            throwbackInfo(pc, "    " + item.getItemBase().getName() + ", slot: " + slot);
         }
     }
 

src/engine/devcmd/cmds/PrintInventoryCmd.java

@@ -9,8 +9,8 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum.ItemType;
 import engine.devcmd.AbstractDevCmd;
-import engine.mbEnums.ItemType;
 import engine.objects.*;
 
 import java.text.DecimalFormat;
@@ -60,7 +60,7 @@ public class PrintInventoryCmd extends AbstractDevCmd {
                 }
             }
 
-            CharacterItemManager cim = tar.charItemManager;
+            CharacterItemManager cim = tar.getCharItemManager();
             inventory = cim.getInventory();  //this list can contain gold when tar is a PC that is dead
             gold = cim.getGoldInventory();
             throwbackInfo(pc, " Weight : " + (cim.getInventoryWeight() + cim.getEquipWeight()));
@@ -75,18 +75,14 @@ public class PrintInventoryCmd extends AbstractDevCmd {
         int goldCount = 0;
 
         for (Item item : inventory) {
-            ItemTemplate template = ItemTemplate.templates.get(item.templateID);
-
-            if (item.template.item_type.equals(ItemType.GOLD) == false) {
-
+            if (item.getItemBase().getType().equals(ItemType.GOLD) == false) {
                 String chargeInfo = "";
-                int chargeMax = template.item_initial_charges;
-
+                byte chargeMax = item.getChargesMax();
                 if (chargeMax > 0) {
-                    int charges = item.chargesRemaining;
+                    byte charges = item.getChargesRemaining();
                     chargeInfo = " charges: " + charges + '/' + chargeMax;
                 }
-                throwbackInfo(pc, "    " + template.item_base_name + ", count: " + item.getNumOfItems() + chargeInfo);
+                throwbackInfo(pc, "    " + item.getItemBase().getName() + ", count: " + item.getNumOfItems() + chargeInfo);
             } else
                 goldCount += item.getNumOfItems();
         }

src/engine/devcmd/cmds/PrintSkillsCmd.java

@@ -9,8 +9,8 @@
 
 package engine.devcmd.cmds;
 
+import engine.Enum.GameObjectType;
 import engine.devcmd.AbstractDevCmd;
-import engine.mbEnums.GameObjectType;
 import engine.objects.*;
 
 import java.util.concurrent.ConcurrentHashMap;