MagicBane/Server
Template
434
1
Fork 5
Code Issues 10 Pull Requests Projects Releases Wiki Activity

State set properly upon dismissal

Browse Source
This commit is contained in:
MagicBot
2026-05-10 11:58:50 -04:00
parent 631989e626
commit 950523ddcc
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/DismissGuildHandler.java
+14 -6
View File
@@ -85,8 +85,8 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
return true; return true;
} }
nation.getSubGuildList().remove(toDismiss); nation.getSubGuildList().remove(toDismiss);
toDismiss.downgradeGuildState(); toDismiss.guildState = mbEnums.GuildState.Errant;
toDismiss.setNation(null); toDismiss.setNation(Guild.getErrantNation());
GuildManager.updateAllGuildBinds(toDismiss, null); GuildManager.updateAllGuildBinds(toDismiss, null);
break; break;
@@ -96,24 +96,32 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
return true; return true;
} }
nation.getSubGuildList().remove(toDismiss); nation.getSubGuildList().remove(toDismiss);
toDismiss.downgradeGuildState(); toDismiss.guildState = mbEnums.GuildState.Sovereign;
toDismiss.setNation(toDismiss); toDismiss.setNation(toDismiss);
break; break;
case Petitioner: case Petitioner:
nation.getSubGuildList().remove(toDismiss); nation.getSubGuildList().remove(toDismiss);
toDismiss.downgradeGuildState(); if (toDismiss.getNation().isEmptyGuild()) {
toDismiss.guildState = mbEnums.GuildState.Errant;
toDismiss.setNation(Guild.getErrantNation());
} else {
toDismiss.guildState = mbEnums.GuildState.Sovereign;
toDismiss.setNation(toDismiss);
}
break; break;
case Protectorate: case Protectorate:
nation.getSubGuildList().remove(toDismiss); nation.getSubGuildList().remove(toDismiss);
toDismiss.downgradeGuildState(); toDismiss.guildState = mbEnums.GuildState.Sovereign;
;
toDismiss.setNation(toDismiss);
break; break;
} }
GuildManager.updateAllGuildTags(toDismiss); GuildManager.updateAllGuildTags(toDismiss);
if (nation.getSubGuildList().isEmpty()) if (nation.getSubGuildList().isEmpty())
nation.downgradeGuildState(); nation.guildState = mbEnums.GuildState.Sovereign;
SendGuildEntryMsg msg = new SendGuildEntryMsg(player); SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
dispatch = Dispatch.borrow(player, msg); dispatch = Dispatch.borrow(player, msg);