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

.gitignore

@@ -24,5 +24,3 @@
 hs_err_pid*
 replay_pid*
 
-.idea/
-*.iml

src/engine/db/handlers/dbNPCHandler.java

@@ -243,8 +243,12 @@ public class dbNPCHandler extends dbHandlerBase {
 
     public boolean UPDATE_EQUIPSET(NPC npc, int equipSetID) {
 
+        // Column name must match what NPC/Mob loaders read ("equipmentSet").
+        // Using the wrong column here causes the update to fail silently and
+        // dev command to report "Unable to find Equipset" despite a valid ID.
+
         try (Connection connection = DbManager.getConnection();
-             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_npc` SET `equipsetID`=? WHERE `UID`=?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_npc` SET `equipmentSet`=? WHERE `UID`=?")) {
 
             preparedStatement.setInt(1, equipSetID);
             preparedStatement.setLong(2, npc.getObjectUUID());

src/engine/devcmd/cmds/AddGoldCmd.java

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

src/engine/devcmd/cmds/MakeItemCmd.java

@@ -16,7 +16,6 @@ import engine.devcmd.AbstractDevCmd;
 import engine.gameManager.DbManager;
 import engine.objects.*;
 import engine.powers.EffectsBase;
-import engine.server.MBServerStatics;
 
 import java.util.ArrayList;
 
@@ -32,82 +31,47 @@ public class MakeItemCmd extends AbstractDevCmd {
     @Override
     protected void _doCmd(PlayerCharacter pc, String[] words,
                           AbstractGameObject target) {
+
         if (words[0].equals("resources")) {
-
-            int resourceAmount = 1000;
-
-            if (words.length > 1) {
-                try {
-                    resourceAmount = Integer.parseInt(words[1]);
-                } catch (NumberFormatException e) {
-                    throwbackError(pc, "Resource amount must be a number.");
-                    return;
-                }
-            }
-
-            if (resourceAmount < 1)
-                resourceAmount = 1;
-
-            resourceAmount = Math.min(
-                    resourceAmount,
-                    MBServerStatics.RESOURCE_STACK_LIMIT
-            );
-
             for (int ibID : Warehouse.getMaxResources().keySet()) {
-
                 if (ibID == 7)
                     continue;
 
                 ItemBase ib = ItemBase.getItemBase(ibID);
 
-                if (ib == null)
-                    continue;
-
                 short weight = ib.getWeight();
-
                 if (!pc.getCharItemManager().hasRoomInventory(weight)) {
-                    throwbackError(pc, "Not enough room in inventory for any more resources.");
+                    throwbackError(pc, "Not enough room in inventory for any more of this item");
+
                     pc.getCharItemManager().updateInventory();
                     return;
                 }
 
-                Item item = new Item(
+                boolean worked = false;
-                        ib,
+                Item item = new Item(ib, pc.getObjectUUID(),
-                        pc.getObjectUUID(),
+                        OwnerType.PlayerCharacter, (byte) 0, (byte) 0, (short) ib.getDurability(), (short) ib.getDurability(),
-                        OwnerType.PlayerCharacter,
+                        true, false, ItemContainerType.INVENTORY, (byte) 0,
-                        (byte) 0,
+                        new ArrayList<>(), "");
-                        (byte) 0,
-                        (short) ib.getDurability(),
-                        (short) ib.getDurability(),
-                        true,
-                        false,
-                        ItemContainerType.INVENTORY,
-                        (byte) 0,
-                        new ArrayList<>(),
-                        ""
-                );
 
-                item.setNumOfItems(resourceAmount);
+                item.setNumOfItems(Warehouse.getMaxResources().get(ibID));
 
                 try {
                     item = DbManager.ItemQueries.ADD_ITEM(item);
+                    worked = true;
                 } catch (Exception e) {
-                    throwbackError(
+                    throwbackError(pc, "DB error 1: Unable to create item. " + e.getMessage());
-                            pc,
-                            "Unable to create resource " + ib.getName() + ": " + e.getMessage()
-                    );
                     return;
                 }
 
-                if (item == null) {
+                if (item == null || !worked) {
-                    throwbackError(pc, "Unable to create resource " + ib.getName() + ".");
+                    throwbackError(pc, "DB error 2: Unable to create item.");
                     return;
                 }
 
+
+                //add item to inventory
                 pc.getCharItemManager().addItemToInventory(item);
             }
-
-            pc.getCharItemManager().updateInventory();
             return;
         }
         if (words.length < 3 || words.length > 5) {
@@ -136,7 +100,7 @@ public class MakeItemCmd extends AbstractDevCmd {
                 return;
             }
             numItems = (numItems < 1) ? 1 : numItems;
-            numItems = Math.min(numItems, MBServerStatics.RESOURCE_STACK_LIMIT);
+            numItems = (numItems > 5000) ? 5000 : numItems;
         }
 
         int itembaseID;

src/engine/devcmd/cmds/SlotTestCmd.java

@@ -39,13 +39,6 @@ public class SlotTestCmd extends AbstractDevCmd {
 
         Building building = (Building) target;
 
-        outString += "Rank: " + building.getRank() + "\r\n";
-        outString += "MaxSlots: " + building.getBlueprint().getMaxSlots() + "\r\n";
-        outString += "SlotsForRank: "
-                + building.getBlueprint().getSlotsForRank(building.getRank())
-                + "\r\n";
-        outString += "Hireling Count: " + building.getHirelings().size() + "\r\n\r\n";
-
         buildingLocations = BuildingManager._slotLocations.get(building.meshUUID);
 
         if (buildingLocations == null) {

src/engine/gameManager/BuildingManager.java

@@ -289,34 +289,6 @@ public enum BuildingManager {
 
     // Method transfers ownership of all hirelings in a building
 
-    public static void reslotHirelings(Building building) {
-
-        if (building == null)
-            return;
-
-        ArrayList<AbstractCharacter> hirelings =
-                new ArrayList<>(building.getHirelings().keySet());
-
-        building.getHirelings().clear();
-
-        for (AbstractCharacter hireling : hirelings) {
-
-            int newSlot = NPCManager.slotCharacterInBuilding(hireling);
-
-            if (newSlot == -1) {
-                Logger.error("Unable to re-slot hireling "
-                        + hireling.getObjectUUID()
-                        + " for building "
-                        + building.getObjectUUID());
-                continue;
-            }
-
-            hireling.setLoc(hireling.getBindLoc());
-            WorldGrid.updateObject(hireling);
-            InterestManager.setObjectDirty(hireling);
-        }
-    }
-
     public static void refreshHirelings(Building building) {
 
         if (building == null)

src/engine/net/client/ClientMessagePump.java

@@ -1259,7 +1259,7 @@ public class ClientMessagePump implements NetMsgHandler {
 
                 cost *= profit;
 
-                if (gold.getNumOfItems() + cost > MBServerStatics.PLAYER_GOLD_LIMIT) {
+                if (gold.getNumOfItems() + cost > 10000000) {
                     return;
                 }
 

src/engine/objects/Blueprint.java

@@ -335,7 +335,7 @@ public class Blueprint {
                 availableSlots = 3;
                 break;
             case 8:
-                availableSlots = Math.min(3, this.maxSlots);
+                availableSlots = 1;
                 break;
             default:
                 availableSlots = 0;

src/engine/objects/Building.java

@@ -427,10 +427,6 @@ public class Building extends AbstractWorldObject {
 
         BuildingManager.cleanupHirelings(this);
 
-        if (this.getBlueprint().getBuildingGroup() == BuildingGroup.TOL
-                && this.rank == 8)
-            BuildingManager.reslotHirelings(this);
-
         this.isDeranking.compareAndSet(true, false);
     }
 

src/engine/objects/CharacterItemManager.java

@@ -2335,14 +2335,15 @@ public class CharacterItemManager {
         }
 
 
-        if (this.getGoldInventory().getNumOfItems() + goldFrom2 > MBServerStatics.PLAYER_GOLD_LIMIT) {
+        if (this.getGoldInventory().getNumOfItems() + goldFrom2 > 10000000) {
             PlayerCharacter pc = (PlayerCharacter) this.absCharacter;
             if (pc.getClientConnection() != null)
                 ErrorPopupMsg.sendErrorPopup(pc, 202);
             return false;
         }
 
-        if (tradingWith.getGoldInventory().getNumOfItems() + goldFrom1 > MBServerStatics.PLAYER_GOLD_LIMIT) {
+
+        if (tradingWith.getGoldInventory().getNumOfItems() + goldFrom1 > 10000000) {
             PlayerCharacter pc = (PlayerCharacter) tradingWith.absCharacter;
             if (pc.getClientConnection() != null)
                 ErrorPopupMsg.sendErrorPopup(pc, 202);

src/engine/objects/Item.java

@@ -674,6 +674,46 @@ public class Item extends AbstractWorldObject {
     public static Item newGoldItem(AbstractWorldObject awo, ItemBase ib, Enum.ItemContainerType containerType) {
         return newGoldItem(awo, ib, containerType, true);
     }
+
+    //used for vault!
+    public static Item newGoldItem(int accountID, ItemBase ib, Enum.ItemContainerType containerType) {
+        return newGoldItem(accountID, ib, containerType, true);
+    }
+
+    private static Item newGoldItem(int accountID, ItemBase ib, Enum.ItemContainerType containerType, boolean persist) {
+
+        int ownerID;
+        OwnerType ownerType;
+
+        ownerID = accountID;
+        ownerType = OwnerType.Account;
+
+
+        Item newGold = new Item(ib, ownerID, ownerType,
+                (byte) 0, (byte) 0, (short) 0, (short) 0, true, false, containerType, (byte) 0,
+                new ArrayList<>(), "");
+
+        synchronized (newGold) {
+            newGold.numberOfItems = 0;
+        }
+
+        if (persist) {
+            try {
+                newGold = DbManager.ItemQueries.ADD_ITEM(newGold);
+                if (newGold != null) {
+                    synchronized (newGold) {
+                        newGold.numberOfItems = 0;
+                    }
+                }
+            } catch (Exception e) {
+                Logger.error(e);
+            }
+            DbManager.ItemQueries.ZERO_ITEM_STACK(newGold);
+        }
+
+        return newGold;
+    }
+
     private static Item newGoldItem(AbstractWorldObject awo, ItemBase ib, Enum.ItemContainerType containerType, boolean persist) {
 
         int ownerID;
@@ -731,49 +771,10 @@ public class Item extends AbstractWorldObject {
             }
             DbManager.ItemQueries.ZERO_ITEM_STACK(newGold);
         }
-
         newGold.containerType = containerType;
 
         return newGold;
     }
-    //used for vault!
-    public static Item newGoldItem(int accountID, ItemBase ib, Enum.ItemContainerType containerType) {
-        return newGoldItem(accountID, ib, containerType, true);
-    }
-
-    private static Item newGoldItem(int accountID, ItemBase ib, Enum.ItemContainerType containerType, boolean persist) {
-
-        int ownerID;
-        OwnerType ownerType;
-
-        ownerID = accountID;
-        ownerType = OwnerType.Account;
-
-
-        Item newGold = new Item(ib, ownerID, ownerType,
-                (byte) 0, (byte) 0, (short) 0, (short) 0, true, false, containerType, (byte) 0,
-                new ArrayList<>(), "");
-
-        synchronized (newGold) {
-            newGold.numberOfItems = 0;
-        }
-
-        if (persist) {
-            try {
-                newGold = DbManager.ItemQueries.ADD_ITEM(newGold);
-                if (newGold != null) {
-                    synchronized (newGold) {
-                        newGold.numberOfItems = 0;
-                    }
-                }
-            } catch (Exception e) {
-                Logger.error(e);
-            }
-            DbManager.ItemQueries.ZERO_ITEM_STACK(newGold);
-        }
-
-        return newGold;
-    }
 
     // This is to be used for trades - the new item is not stored in the database
     public static Item newGoldItemTemp(AbstractWorldObject awo, ItemBase ib) {

src/engine/objects/Mob.java

@@ -541,8 +541,18 @@ public class Mob extends AbstractIntelligenceAgent {
         mobWithoutID.parentZone = parent;
         mobWithoutID.parentZoneID = parent.getObjectUUID();
 
-        // NPC in a Building derives position from slot
+        // Ensure spawn coordinates are persisted for DB insert
+        // statLat/statAlt/statLon represent local (zone-relative) spawn
+        // coordinates used by the DB handler when creating the mob row.
+        if (spawn != null && parent != null) {
+            // Convert world coordinates to zone-local spawn coordinates
+            Vector3fImmutable localSpawn = spawn.subtract(parent.getLoc());
+            mobWithoutID.statLat = localSpawn.x;
+            mobWithoutID.statAlt = localSpawn.y;
+            mobWithoutID.statLon = localSpawn.z;
+        }
 
+        // NPC in a Building derives position from slot
         if (mobWithoutID.building != null)
             mobWithoutID.bindLoc = Vector3fImmutable.ZERO;
 

src/engine/objects/NPC.java

@@ -470,7 +470,8 @@ public class NPC extends AbstractCharacter {
             newNPC.bindLoc = Vector3fImmutable.ZERO;
 
         newNPC.parentZoneUUID = parent.getObjectUUID();
-        newNPC.guildUUID = guild.getObjectUUID();
+        // guild may be null when spawning via ./npc; default to 0
+        newNPC.guildUUID = (guild != null) ? guild.getObjectUUID() : 0;
 
         if (building == null)
             newNPC.buildingUUID = 0;

src/engine/objects/PlayerCharacter.java

@@ -1239,17 +1239,12 @@ public class PlayerCharacter extends AbstractCharacter {
             playerCharacter.deactivateCharacter();
             return null;
         }
-        // Ebonreach: give new characters starter gold.
-        Item starterGold = Item.newGoldItem(playerCharacter, ItemBase.getItemBase(7), Enum.ItemContainerType.INVENTORY);
-
-        if (starterGold != null)
-            DbManager.ItemQueries.UPDATE_GOLD(starterGold, 10000);
 
         // Get any new skills that belong to the player
         playerCharacter.calculateSkills();
 
         a.setLastCharacter(playerCharacter.getObjectUUID());
-        playerCharacter.getCharItemManager().load();
+        playerCharacter.charItemManager.load();
 
         playerCharacter.activateCharacter();
 

src/engine/objects/Warehouse.java

@@ -99,29 +99,29 @@ public class Warehouse extends AbstractWorldObject {
 
     public static ConcurrentHashMap<Integer, Integer> getMaxResources() {
         if (maxResources.size() != 23) {
-            maxResources.put(7, 1000000000);
+            maxResources.put(7, 100000000);
-            maxResources.put(1580000, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580000, 10000);
-            maxResources.put(1580001, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580001, 2000);
-            maxResources.put(1580002, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580002, 2000);
-            maxResources.put(1580003, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580003, 1000);
-            maxResources.put(1580004, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580004, 10000);
-            maxResources.put(1580005, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580005, 3000);
-            maxResources.put(1580006, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580006, 3000);
-            maxResources.put(1580007, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580007, 1000);
-            maxResources.put(1580008, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580008, 3000);
-            maxResources.put(1580009, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580009, 2000);
-            maxResources.put(1580010, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580010, 2000);
-            maxResources.put(1580011, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580011, 1000);
-            maxResources.put(1580012, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580012, 2000);
-            maxResources.put(1580013, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580013, 3000);
-            maxResources.put(1580014, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580014, 1000);
-            maxResources.put(1580015, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580015, 1000);
-            maxResources.put(1580016, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580016, 1000);
-            maxResources.put(1580017, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580017, 500);
-            maxResources.put(1580018, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580018, 500);
-            maxResources.put(1580019, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580019, 500);
-            maxResources.put(1580020, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580020, 500);
-            maxResources.put(1580021, MBServerStatics.RESOURCE_STACK_LIMIT);
+            maxResources.put(1580021, 500);
         }
 
         return maxResources;

src/engine/server/MBServerStatics.java

@@ -33,16 +33,15 @@ public class MBServerStatics {
     // hit box
     // calcs
     public static final boolean PRINT_INCOMING_OPCODES = false; // print
-    public static final int BANK_GOLD_LIMIT = 1000000000;
+    public static final int BANK_GOLD_LIMIT = 25000000;
     // incoming
     // opcodes to
     // console
-    public static final int PLAYER_GOLD_LIMIT = 500000000;
+    public static final int PLAYER_GOLD_LIMIT = 10000000;
     // buildings, npcs
     /*
      * Login cache flags
      */
-    public static final int RESOURCE_STACK_LIMIT = 1000000000;
     public static final boolean SKIP_CACHE_LOGIN = false; // skip caching														// login server
     public static final boolean SKIP_CACHE_LOGIN_PLAYER = false; // skip caching															// on login
     public static final boolean SKIP_CACHE_LOGIN_ITEM = false; // skip caching