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

src/engine/objects/Guild.java

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