Browse Source

Merge remote-tracking branch 'origin/nation-sub-limits' into post-wipe-merge

master
MagicBot 2 years ago
parent
commit
f979a7b694
  1. 8
      src/engine/objects/Guild.java

8
src/engine/objects/Guild.java

@ -565,8 +565,7 @@ public class Guild extends AbstractWorldObject {
if (this.equals(toSub)) if (this.equals(toSub))
return false; return false;
switch(this.guildState) {
switch(this.guildState){
case Nation: case Nation:
case Sovereign: case Sovereign:
canSub = true; canSub = true;
@ -583,7 +582,10 @@ public class Guild extends AbstractWorldObject {
default: default:
canSub = false; canSub = false;
} }
City nationCap = City.getCity(nation.cityUUID);
if (nation.getSubGuildList().size() >= nationCap.getRank()) {
canSub = false;
}
return canSub; return canSub;
} }

Loading…
Cancel
Save