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

Checking for landed subguilds when setting nation

Browse Source
This commit is contained in:
MagicBot
2026-07-20 06:57:39 -04:00
parent 586031e810
commit cb81a3093d
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/gameManager/GuildManager.java
+7 -2
View File
@@ -186,8 +186,13 @@ public enum GuildManager {
if (guild.getNation() == null) if (guild.getNation() == null)
return mbEnums.GuildState.Errant; return mbEnums.GuildState.Errant;
if (guild.getNation() == guild) if (guild.getNation() == guild) {
return guild.getSubGuildList().isEmpty() ? mbEnums.GuildState.Sovereign : mbEnums.GuildState.Nation; // Check if any subguild in the list has an owned city
boolean hasCityOwningSubguild = guild.getSubGuildList().stream()
.anyMatch(subGuild -> subGuild.getOwnedCity() != null);
return hasCityOwningSubguild ? mbEnums.GuildState.Nation : mbEnums.GuildState.Sovereign;
}
if (guild.getOwnedCity() == null) if (guild.getOwnedCity() == null)
return mbEnums.GuildState.Sworn; return mbEnums.GuildState.Sworn;