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/gameManager/BuildingManager.java
+1 -1
View File
@@ -328,7 +328,7 @@ public enum BuildingManager {
if (building.getOwner().equals(player))
return true;
if (player.getGuild().isErrant())
if (player.getGuild().isEmptyGuild())
return false;
if (building.getGuild().isGuildLeader(player.getObjectUUID()))
src/engine/gameManager/GuildManager.java
+2 -2
View File
@@ -61,13 +61,13 @@ public enum GuildManager {
if (origin == null)
return false;
if (playerCharacter.getGuild().isErrant() == false && GuildStatusController.isGuildLeader(playerCharacter.getGuildStatus()))
if (playerCharacter.getGuild().isEmptyGuild() == false && GuildStatusController.isGuildLeader(playerCharacter.getGuildStatus()))
return false;
if (playerCharacter.getGuild() != null && playerCharacter.getGuild().isGuildLeader(playerCharacter.getObjectUUID()))
return false;
if (playerCharacter.getGuild() != null && !playerCharacter.getGuild().isErrant()){
if (playerCharacter.getGuild() != null && !playerCharacter.getGuild().isEmptyGuild()){
if (DbManager.GuildQueries.ADD_TO_GUILDHISTORY(playerCharacter.getGuildUUID(), playerCharacter, DateTime.now(), GuildHistoryType.LEAVE)){
GuildHistory guildHistory = new GuildHistory(playerCharacter.getGuildUUID(),playerCharacter.getGuild().getName(),DateTime.now(), GuildHistoryType.LEAVE) ;
playerCharacter.getGuildHistory().add(guildHistory);