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

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

Browse Source
This commit is contained in:
MagicBot
2023-01-07 09:01:39 -05:00
parent 78be9bfd4f 5f0803eec4
commit f979a7b694
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Guild.java
+8 -6
View File
@@ -565,11 +565,10 @@ 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;
break; break;
default: default:
canSub = false; canSub = false;
@@ -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;
} }