Case added for protectorate.

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());
@@ -471,4 +467,4 @@ public class dbNPCHandler extends dbHandlerBase {
             return false;
         }
     }
-}
+}

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,76 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
     protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException {
 
         AcceptSubInviteMsg msg = (AcceptSubInviteMsg) baseMsg;
-        PlayerCharacter sourcePlayer;
-        Guild sourceGuild;
-        Guild targetGuild;
+        PlayerCharacter playerCharacter;
+        Guild protectorate;
+        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();
-        targetGuild = (Guild) DbManager.getObject(GameObjectType.Guild, msg.guildUUID());
+        protectorate = playerCharacter.getGuild();
+        nation = (Guild) DbManager.getObject(GameObjectType.Guild, msg.guildUUID());
 
         //must be source guild to sub to
 
-        if (targetGuild == null) {
-            ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
+        if (nation == null) {
+            ErrorPopupMsg.sendErrorPopup(playerCharacter, 45); // Failure to swear guild
             return true;
         }
-        if (sourceGuild == null) {
-            ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
+        if (protectorate == null) {
+            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) {
-            ErrorPopupMsg.sendErrorMsg(sourcePlayer, "Only a guild leader can accept fealty!");
+        if (GuildStatusController.isGuildLeader(playerCharacter.getGuildStatus()) == false) {
+            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)) {
-            ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
+        if (!nation.canSubAGuild(protectorate)) {
+            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();
-        subs.add(sourceGuild);
+        //update Guild states.
 
-        targetGuild.setGuildState(GuildState.Nation);
+        protectorate.setNation(nation);
+        GuildManager.updateAllGuildTags(protectorate);
+        protectorate.upgradeGuildState(false);
 
+        if (nation.getGuildState() == GuildState.Sovereign)
+            nation.upgradeGuildState(true);
+
+        nation.getSubGuildList().add(protectorate);
 
         //Let's send the message back.
 
         msg.setUnknown02(1);
-        msg.setResponse("Your guild is now a " + sourceGuild.getGuildState().name() + '.');
-        dispatch = Dispatch.borrow(sourcePlayer, msg);
+        msg.setResponse("Your guild is now a " + protectorate.getGuildState().name() + '.');
+        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/net/client/handlers/BreakFealtyHandler.java

@@ -26,6 +26,7 @@ import engine.net.client.msg.guild.SendGuildEntryMsg;
 import engine.objects.*;
 import engine.server.world.WorldServer;
 import engine.session.Session;
+import org.pmw.tinylog.Logger;
 
 import java.util.ArrayList;
 
@@ -40,8 +41,8 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
 
         BreakFealtyMsg bfm;
         PlayerCharacter player;
-        Guild toBreak;
-        Guild guild;
+        Guild nation;
+        Guild protectorate;
         Dispatch dispatch;
 
         bfm = (BreakFealtyMsg) baseMsg;
@@ -54,46 +55,50 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
         if (player == null)
             return true;
 
-        toBreak = (Guild) DbManager.getObject(GameObjectType.Guild, bfm.getGuildUUID());
+        nation = (Guild) DbManager.getObject(GameObjectType.Guild, bfm.getGuildUUID());
 
-        if (toBreak == null) {
+        if (nation == null) {
             ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
             return true;
         }
 
-        guild = player.getGuild();
+        protectorate = player.getGuild();
 
-        if (guild == null) {
+        if (protectorate == null) {
             ErrorPopupMsg.sendErrorMsg(player, "You do not belong to a guild!");
             return true;
         }
 
-        if (toBreak.isNPCGuild()) {
+        if (nation.isNPCGuild()) {
             if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false) {
                 ErrorPopupMsg.sendErrorMsg(player, "Only guild leader can break fealty!");
                 return true;
             }
 
 
-            if (!DbManager.GuildQueries.UPDATE_PARENT(guild.getObjectUUID(), WorldServer.worldUUID)) {
+            if (!DbManager.GuildQueries.UPDATE_PARENT(protectorate.getObjectUUID(), WorldServer.worldUUID)) {
                 ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occurred. Please post details for to ensure transaction integrity");
                 return true;
             }
 
-            switch (guild.getGuildState()) {
+            switch (protectorate.getGuildState()) {
                 case Sworn:
-                    guild.setNation(null);
-                    GuildManager.updateAllGuildTags(guild);
-                    GuildManager.updateAllGuildBinds(guild, null);
+                    protectorate.setNation(Guild.getErrantGuild());
+                    GuildManager.updateAllGuildTags(protectorate);
+                    GuildManager.updateAllGuildBinds(protectorate, null);
                     break;
                 case Province:
-                    guild.setNation(guild);
-                    GuildManager.updateAllGuildTags(guild);
-                    GuildManager.updateAllGuildBinds(guild, guild.getOwnedCity());
+                case Protectorate:
+                    protectorate.setNation(protectorate);
+                    GuildManager.updateAllGuildTags(protectorate);
+                    GuildManager.updateAllGuildBinds(protectorate, protectorate.getOwnedCity());
+                    break;
+                default:
+                    Logger.error("Unhandled guild state");
                     break;
             }
 
-            guild.downgradeGuildState();
+            protectorate.downgradeGuildState();
 
             SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
             dispatch = Dispatch.borrow(player, msg);
@@ -106,16 +111,16 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
             City.lastCityUpdate = System.currentTimeMillis();
 
 
-            ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(guild.getObjectUUID());
+            ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(protectorate.getObjectUUID());
 
             for (PlayerCharacter member : guildMembers) {
-                ChatManager.chatGuildInfo(member, guild.getName() + " has broke fealty from " + toBreak.getName() + '!');
+                ChatManager.chatGuildInfo(member, protectorate.getName() + " has broke fealty from " + nation.getName() + '!');
             }
 
-            ArrayList<PlayerCharacter> breakFealtyMembers = SessionManager.getActivePCsInGuildID(toBreak.getObjectUUID());
+            ArrayList<PlayerCharacter> breakFealtyMembers = SessionManager.getActivePCsInGuildID(nation.getObjectUUID());
 
             for (PlayerCharacter member : breakFealtyMembers) {
-                ChatManager.chatGuildInfo(member, guild.getName() + " has broken fealty from " + toBreak.getName() + '!');
+                ChatManager.chatGuildInfo(member, protectorate.getName() + " has broken fealty from " + nation.getName() + '!');
             }
 
             return true;
@@ -123,7 +128,7 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
 
         }
 
-        if (!toBreak.getSubGuildList().contains(guild)) {
+        if (!nation.getSubGuildList().contains(protectorate)) {
             ErrorPopupMsg.sendErrorMsg(player, "Failure to break fealty!");
             return true;
         }
@@ -133,34 +138,34 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
             return true;
         }
 
-        if (Bane.getBaneByAttackerGuild(guild) != null) {
+        if (Bane.getBaneByAttackerGuild(protectorate) != null) {
             ErrorPopupMsg.sendErrorMsg(player, "You may break fealty with active bane!");
             return true;
         }
 
-        if (!DbManager.GuildQueries.UPDATE_PARENT(guild.getObjectUUID(), WorldServer.worldUUID)) {
+        if (!DbManager.GuildQueries.UPDATE_PARENT(protectorate.getObjectUUID(), WorldServer.worldUUID)) {
             ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occurred. Please post details for to ensure transaction integrity");
             return true;
         }
 
-        switch (guild.getGuildState()) {
+        switch (protectorate.getGuildState()) {
             case Sworn:
-                guild.setNation(null);
-                GuildManager.updateAllGuildTags(guild);
-                GuildManager.updateAllGuildBinds(guild, null);
+                protectorate.setNation(null);
+                GuildManager.updateAllGuildTags(protectorate);
+                GuildManager.updateAllGuildBinds(protectorate, null);
                 break;
             case Province:
-                guild.setNation(guild);
-                GuildManager.updateAllGuildTags(guild);
-                GuildManager.updateAllGuildBinds(guild, guild.getOwnedCity());
+                protectorate.setNation(protectorate);
+                GuildManager.updateAllGuildTags(protectorate);
+                GuildManager.updateAllGuildBinds(protectorate, protectorate.getOwnedCity());
                 break;
         }
 
-        guild.downgradeGuildState();
-        toBreak.getSubGuildList().remove(guild);
+        protectorate.downgradeGuildState();
+        nation.getSubGuildList().remove(protectorate);
 
-        if (toBreak.getSubGuildList().isEmpty())
-            toBreak.downgradeGuildState();
+        if (nation.getSubGuildList().isEmpty())
+            nation.downgradeGuildState();
 
         SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
         dispatch = Dispatch.borrow(player, msg);
@@ -173,16 +178,16 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
         City.lastCityUpdate = System.currentTimeMillis();
 
 
-        ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(guild.getObjectUUID());
+        ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(protectorate.getObjectUUID());
 
         for (PlayerCharacter member : guildMembers) {
-            ChatManager.chatGuildInfo(member, guild.getName() + " has broke fealty from " + toBreak.getName() + '!');
+            ChatManager.chatGuildInfo(member, protectorate.getName() + " has broke fealty from " + nation.getName() + '!');
         }
 
-        ArrayList<PlayerCharacter> breakFealtyMembers = SessionManager.getActivePCsInGuildID(toBreak.getObjectUUID());
+        ArrayList<PlayerCharacter> breakFealtyMembers = SessionManager.getActivePCsInGuildID(nation.getObjectUUID());
 
         for (PlayerCharacter member : breakFealtyMembers) {
-            ChatManager.chatGuildInfo(member, guild.getName() + " has broken fealty from " + toBreak.getName() + '!');
+            ChatManager.chatGuildInfo(member, protectorate.getName() + " has broken fealty from " + nation.getName() + '!');
         }
 
         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 != null) ? guild.getObjectUUID() : 0;
+        newNPC.guildUUID = guild.getObjectUUID();
 
         if (building == null)
             newNPC.buildingUUID = 0;
@@ -1348,4 +1347,4 @@ public class NPC extends AbstractCharacter {
         }
     }
 
-}
+}