Case added for protectorate.

This commit is contained in:
2026-05-10 08:21:34 -04:00
parent e2909564a4
commit 2487915a13
@@ -40,8 +40,8 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
BreakFealtyMsg bfm; BreakFealtyMsg bfm;
PlayerCharacter player; PlayerCharacter player;
Guild toBreak; Guild nation;
Guild guild; Guild protectorate;
Dispatch dispatch; Dispatch dispatch;
bfm = (BreakFealtyMsg) baseMsg; bfm = (BreakFealtyMsg) baseMsg;
@@ -54,46 +54,47 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
if (player == null) if (player == null)
return true; 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"); ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
return true; return true;
} }
guild = player.getGuild(); protectorate = player.getGuild();
if (guild == null) { if (protectorate == null) {
ErrorPopupMsg.sendErrorMsg(player, "You do not belong to a guild!"); ErrorPopupMsg.sendErrorMsg(player, "You do not belong to a guild!");
return true; return true;
} }
if (toBreak.isNPCGuild()) { if (nation.isNPCGuild()) {
if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false) { if (GuildStatusController.isGuildLeader(player.getGuildStatus()) == false) {
ErrorPopupMsg.sendErrorMsg(player, "Only guild leader can break fealty!"); ErrorPopupMsg.sendErrorMsg(player, "Only guild leader can break fealty!");
return true; 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"); ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occurred. Please post details for to ensure transaction integrity");
return true; return true;
} }
switch (guild.getGuildState()) { switch (protectorate.getGuildState()) {
case Sworn: case Sworn:
guild.setNation(null); protectorate.setNation(Guild.getErrantGuild());
GuildManager.updateAllGuildTags(guild); GuildManager.updateAllGuildTags(protectorate);
GuildManager.updateAllGuildBinds(guild, null); GuildManager.updateAllGuildBinds(protectorate, null);
break; break;
case Province: case Province:
guild.setNation(guild); case Protectorate:
GuildManager.updateAllGuildTags(guild); protectorate.setNation(protectorate);
GuildManager.updateAllGuildBinds(guild, guild.getOwnedCity()); GuildManager.updateAllGuildTags(protectorate);
GuildManager.updateAllGuildBinds(protectorate, protectorate.getOwnedCity());
break; break;
} }
guild.downgradeGuildState(); protectorate.downgradeGuildState();
SendGuildEntryMsg msg = new SendGuildEntryMsg(player); SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
dispatch = Dispatch.borrow(player, msg); dispatch = Dispatch.borrow(player, msg);
@@ -106,16 +107,16 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
City.lastCityUpdate = System.currentTimeMillis(); City.lastCityUpdate = System.currentTimeMillis();
ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(guild.getObjectUUID()); ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(protectorate.getObjectUUID());
for (PlayerCharacter member : guildMembers) { 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) { 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; return true;
@@ -123,7 +124,7 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
} }
if (!toBreak.getSubGuildList().contains(guild)) { if (!nation.getSubGuildList().contains(protectorate)) {
ErrorPopupMsg.sendErrorMsg(player, "Failure to break fealty!"); ErrorPopupMsg.sendErrorMsg(player, "Failure to break fealty!");
return true; return true;
} }
@@ -133,34 +134,34 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
return true; return true;
} }
if (Bane.getBaneByAttackerGuild(guild) != null) { if (Bane.getBaneByAttackerGuild(protectorate) != null) {
ErrorPopupMsg.sendErrorMsg(player, "You may break fealty with active bane!"); ErrorPopupMsg.sendErrorMsg(player, "You may break fealty with active bane!");
return true; 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"); ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occurred. Please post details for to ensure transaction integrity");
return true; return true;
} }
switch (guild.getGuildState()) { switch (protectorate.getGuildState()) {
case Sworn: case Sworn:
guild.setNation(null); protectorate.setNation(null);
GuildManager.updateAllGuildTags(guild); GuildManager.updateAllGuildTags(protectorate);
GuildManager.updateAllGuildBinds(guild, null); GuildManager.updateAllGuildBinds(protectorate, null);
break; break;
case Province: case Province:
guild.setNation(guild); protectorate.setNation(protectorate);
GuildManager.updateAllGuildTags(guild); GuildManager.updateAllGuildTags(protectorate);
GuildManager.updateAllGuildBinds(guild, guild.getOwnedCity()); GuildManager.updateAllGuildBinds(protectorate, protectorate.getOwnedCity());
break; break;
} }
guild.downgradeGuildState(); protectorate.downgradeGuildState();
toBreak.getSubGuildList().remove(guild); nation.getSubGuildList().remove(protectorate);
if (toBreak.getSubGuildList().isEmpty()) if (nation.getSubGuildList().isEmpty())
toBreak.downgradeGuildState(); nation.downgradeGuildState();
SendGuildEntryMsg msg = new SendGuildEntryMsg(player); SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
dispatch = Dispatch.borrow(player, msg); dispatch = Dispatch.borrow(player, msg);
@@ -173,16 +174,16 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
City.lastCityUpdate = System.currentTimeMillis(); City.lastCityUpdate = System.currentTimeMillis();
ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(guild.getObjectUUID()); ArrayList<PlayerCharacter> guildMembers = SessionManager.getActivePCsInGuildID(protectorate.getObjectUUID());
for (PlayerCharacter member : guildMembers) { 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) { 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; return true;