Cleaned up bad logic in helper

This commit is contained in:
2026-05-10 21:38:38 -04:00
parent 3f91ef7409
commit 258bef5cb3
2 changed files with 24 additions and 42 deletions
+3 -24
View File
@@ -629,34 +629,13 @@ public class Guild extends AbstractWorldObject {
public boolean canSubAGuild(Guild toSub) {
boolean canSub;
if (this.equals(toSub))
return false;
switch (this.guildState) {
case Nation:
case Sovereign:
canSub = true;
break;
default:
canSub = false;
}
switch (toSub.guildState) {
case Errant:
case Sovereign:
canSub = true;
break;
default:
canSub = false;
}
boolean validNation = (this.guildState == GuildState.Nation || this.guildState == GuildState.Sovereign);
boolean validProtectorate = (toSub.guildState == GuildState.Errant || toSub.guildState == GuildState.Sovereign);
City nationCap = City.getCity(nation.cityUUID);
if (nation.getSubGuildList().size() >= nationCap.getRank())
canSub = false;
return canSub;
return validNation && validProtectorate;
}
public int getRealmsOwnedFlag() {