diff --git a/src/engine/net/client/handlers/SwearInGuildHandler.java b/src/engine/net/client/handlers/SwearInGuildHandler.java index b413430b..e1f6b8ec 100644 --- a/src/engine/net/client/handlers/SwearInGuildHandler.java +++ b/src/engine/net/client/handlers/SwearInGuildHandler.java @@ -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); diff --git a/src/engine/objects/Guild.java b/src/engine/objects/Guild.java index 96b157f2..6ea89ac7 100644 --- a/src/engine/objects/Guild.java +++ b/src/engine/objects/Guild.java @@ -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;