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

rename method to isEmptyGuild() so as not to confuse with GuildState.

Browse Source
This commit is contained in:
MagicBot
2023-01-21 09:28:30 -05:00
parent 2fac480117
commit 825f41e469
28 changed files with 71 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/DisbandGuildHandler.java
+2 -2
View File
@@ -52,7 +52,7 @@ public class DisbandGuildHandler extends AbstractClientMsgHandler {
guild = player.getGuild();
if (guild == null || guild.isErrant())
if (guild == null || guild.isEmptyGuild())
return true;
// Don't allow disbanding if a city is owned
@@ -86,7 +86,7 @@ public class DisbandGuildHandler extends AbstractClientMsgHandler {
// Remove us as a subguild of our nation
if (guild.getNation() != null && Guild.sameGuild(guild, guild.getNation()) == false && guild.getNation().isErrant() == false)
if (guild.getNation() != null && Guild.sameGuild(guild, guild.getNation()) == false && guild.getNation().isEmptyGuild() == false)
guild.getNation().removeSubGuild(guild);
// Update all online guild players