forked from MagicBane/Server
Cleaned up bad logic in helper
This commit is contained in:
@@ -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() {
|
||||
|
||||
Reference in New Issue
Block a user