forked from MagicBane/Server
Province qualifies as nation too.
This commit is contained in:
@@ -101,7 +101,8 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
|
||||
GuildManager.updateAllGuildTags(protectorate);
|
||||
|
||||
if (nation.guildState == GuildState.Sovereign)
|
||||
if (protectorate.guildState.equals(GuildState.Protectorate))
|
||||
if (protectorate.guildState.equals(GuildState.Protectorate) ||
|
||||
protectorate.guildState.equals(GuildState.Province))
|
||||
nation.guildState = GuildState.Nation;
|
||||
|
||||
SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
|
||||
|
||||
@@ -741,8 +741,6 @@ public class Guild extends AbstractWorldObject {
|
||||
|
||||
this.guildState = GuildManager.calcuateGuildState(this);
|
||||
|
||||
Logger.info(this.name + ":" + this.guildState + ":" + this.nation.name);
|
||||
|
||||
if (this.getOwnedCity() == null)
|
||||
return;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user