state updated properly

src/engine/db/handlers/dbNPCHandler.java

@@ -243,12 +243,8 @@ 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 `equipmentSet`=? WHERE `UID`=?")) {
+             PreparedStatement preparedStatement = connection.prepareStatement("UPDATE `obj_npc` SET `equipsetID`=? WHERE `UID`=?")) {
 
             preparedStatement.setInt(1, equipSetID);
             preparedStatement.setLong(2, npc.getObjectUUID());

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

@@ -15,6 +15,7 @@ import engine.Enum.GuildState;
 import engine.exception.MsgSendException;
 import engine.gameManager.ChatManager;
 import engine.gameManager.DbManager;
+import engine.gameManager.GuildManager;
 import engine.gameManager.SessionManager;
 import engine.net.Dispatch;
 import engine.net.DispatchMessage;
@@ -26,8 +27,6 @@ import engine.objects.Guild;
 import engine.objects.GuildStatusController;
 import engine.objects.PlayerCharacter;
 
-import java.util.ArrayList;
-
 public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
 
     public AcceptSubInviteHandler() {
@@ -38,69 +37,74 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
     protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException {
 
         AcceptSubInviteMsg msg = (AcceptSubInviteMsg) baseMsg;
-        PlayerCharacter sourcePlayer;
+        PlayerCharacter playerCharacter;
-        Guild sourceGuild;
+        Guild protectorate;
-        Guild targetGuild;
+        Guild nation;
         Dispatch dispatch;
 
         // get PlayerCharacter of person sending sub invite
 
-        sourcePlayer = SessionManager.getPlayerCharacter(origin);
+        playerCharacter = SessionManager.getPlayerCharacter(origin);
 
-        if (sourcePlayer == null)
+        if (playerCharacter == null)
             return true;
 
-        sourceGuild = sourcePlayer.getGuild();
+        protectorate = playerCharacter.getGuild();
-        targetGuild = (Guild) DbManager.getObject(GameObjectType.Guild, msg.guildUUID());
+        nation = (Guild) DbManager.getObject(GameObjectType.Guild, msg.guildUUID());
 
         //must be source guild to sub to
 
-        if (targetGuild == null) {
+        if (nation == null) {
-            ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
+            ErrorPopupMsg.sendErrorPopup(playerCharacter, 45); // Failure to swear guild
             return true;
         }
-        if (sourceGuild == null) {
+        if (protectorate == null) {
-            ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
+            ErrorPopupMsg.sendErrorPopup(playerCharacter, 45); // Failure to swear guild
             return true;
         }
 
-        if (sourceGuild.equals(targetGuild))
+        if (protectorate.equals(nation))
             return true;
 
-        if (GuildStatusController.isGuildLeader(sourcePlayer.getGuildStatus()) == false) {
+        if (GuildStatusController.isGuildLeader(playerCharacter.getGuildStatus()) == false) {
-            ErrorPopupMsg.sendErrorMsg(sourcePlayer, "Only a guild leader can accept fealty!");
+            ErrorPopupMsg.sendErrorMsg(playerCharacter, "Only a guild leader can accept fealty!");
             return true;
         }
 
         //source guild is limited to 7 subs
         //TODO this should be based on TOL rank
 
-        if (!targetGuild.canSubAGuild(sourceGuild)) {
+        if (!nation.canSubAGuild(protectorate)) {
-            ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
+            ErrorPopupMsg.sendErrorPopup(playerCharacter, 45); // Failure to swear guild
             return true;
         }
 
         //all tests passed, let's Handle code
-        //Update Target Guild State.
 
-        sourceGuild.upgradeGuildState(false);
+        // Update database
 
-        //Add sub so GuildMaster can Swear in.
+        if (!DbManager.GuildQueries.UPDATE_PARENT(protectorate.getObjectUUID(), nation.getObjectUUID())) {
+            ErrorPopupMsg.sendErrorMsg(playerCharacter, "A Serious error has occured. Please post details for to ensure transaction integrity");
+            return true;
+        }
 
-        ArrayList<Guild> subs = targetGuild.getSubGuildList();
+        //update Guild states.
-        subs.add(sourceGuild);
 
-        targetGuild.setGuildState(GuildState.Nation);
+        protectorate.setNation(nation);
+        GuildManager.updateAllGuildTags(protectorate);
+        protectorate.upgradeGuildState(false);
 
+        if (nation.getGuildState() == GuildState.Sovereign)
+            nation.upgradeGuildState(true);
 
         //Let's send the message back.
 
         msg.setUnknown02(1);
-        msg.setResponse("Your guild is now a " + sourceGuild.getGuildState().name() + '.');
+        msg.setResponse("Your guild is now a " + protectorate.getGuildState().name() + '.');
-        dispatch = Dispatch.borrow(sourcePlayer, msg);
+        dispatch = Dispatch.borrow(playerCharacter, msg);
         DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
 
-        ChatManager.chatSystemInfo(sourcePlayer, "Your guild is now a " + sourceGuild.getGuildState().name() + '.');
+        ChatManager.chatSystemInfo(playerCharacter, "Your guild is now a " + protectorate.getGuildState().name() + '.');
         return true;
     }
 }

src/engine/objects/Mob.java

@@ -541,18 +541,8 @@ public class Mob extends AbstractIntelligenceAgent {
         mobWithoutID.parentZone = parent;
         mobWithoutID.parentZoneID = parent.getObjectUUID();
 
-        // 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,8 +470,7 @@ public class NPC extends AbstractCharacter {
             newNPC.bindLoc = Vector3fImmutable.ZERO;
 
         newNPC.parentZoneUUID = parent.getObjectUUID();
-        // guild may be null when spawning via ./npc; default to 0
+        newNPC.guildUUID = guild.getObjectUUID();
-        newNPC.guildUUID = (guild != null) ? guild.getObjectUUID() : 0;
 
         if (building == null)
             newNPC.buildingUUID = 0;