Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 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/msg/GuildTreeStatusMsg.java
+1 -1
View File
@@ -100,7 +100,7 @@ public class GuildTreeStatusMsg extends ClientNetMsg {
canAccess = this.canModify();
canBind = 0;
if (player.getGuild() != null && this.treeOfLife.getGuild() != null && !this.treeOfLife.getGuild().isErrant()
if (player.getGuild() != null && this.treeOfLife.getGuild() != null && !this.treeOfLife.getGuild().isEmptyGuild()
&& player.getGuild().getNation() == this.treeOfLife.getGuild().getNation())
canBind = 1;
src/engine/net/client/msg/OpenFriendsCondemnListMsg.java
+2 -2
View File
@@ -644,7 +644,7 @@ public class OpenFriendsCondemnListMsg extends ClientNetMsg {
writer.putInt(guild.getObjectType().ordinal());
writer.putInt(guild.getObjectUUID());
if (!guild.getNation().isErrant()) {
if (!guild.getNation().isEmptyGuild()) {
writer.putInt(guild.getNation().getObjectType().ordinal());
writer.putInt(guild.getNation().getObjectUUID());
}else{
@@ -741,7 +741,7 @@ public class OpenFriendsCondemnListMsg extends ClientNetMsg {
writer.putInt(heraldryCharacter.getGuild().getObjectType().ordinal());
writer.putInt(heraldryCharacter.getGuild().getObjectUUID());
if (!heraldryCharacter.getGuild().getNation().isErrant()) {
if (!heraldryCharacter.getGuild().getNation().isEmptyGuild()) {
writer.putInt(heraldryCharacter.getGuild().getNation().getObjectType().ordinal());
writer.putInt(heraldryCharacter.getGuild().getNation().getObjectUUID());
}else{