Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

subs limited to cap rank

Browse Source
This commit is contained in:
FatBoy-DOTC
2023-01-01 15:48:17 -06:00
parent 9988863a85
commit d3e05ec247
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/AcceptSubInviteHandler.java
+1 -1
View File
@@ -75,7 +75,7 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
//source guild is limited to 7 subs //source guild is limited to 7 subs
//TODO this should be based on TOL rank //TODO this should be based on TOL rank
if (!targetGuild.canSubAGuild(sourceGuild)) { if (!targetGuild.canSubAGuild(sourceGuild,targetGuild)) {
ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild ErrorPopupMsg.sendErrorPopup(sourcePlayer, 45); // Failure to swear guild
return true; return true;
} }
src/engine/net/client/handlers/InviteToSubHandler.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
//TODO this should be based on TOL rank //TODO this should be based on TOL rank
if (!sourceGuild.canSubAGuild(targetGuild)) { if (!sourceGuild.canSubAGuild(targetGuild, null)) {
sendChat(source, "This Guild can't be subbed."); sendChat(source, "This Guild can't be subbed.");
return true; return true;
} }
src/engine/objects/Guild.java
+6 -2
View File
@@ -559,13 +559,17 @@ public class Guild extends AbstractWorldObject {
} }
public boolean canSubAGuild(Guild toSub){ public boolean canSubAGuild(Guild toSub, Guild nation){
boolean canSub; boolean canSub;
if (this.equals(toSub)) if (this.equals(toSub))
return false; return false;
City nationCap = City.getCity(nation.cityUUID);
if (nation.getSubGuildList().size() >= nationCap.getRank()) {
canSub = false;
return canSub;
}
switch(this.guildState) { switch(this.guildState) {
case Nation: case Nation:
case Sovereign: case Sovereign: