diff --git a/src/engine/net/client/handlers/MerchantMsgHandler.java b/src/engine/net/client/handlers/MerchantMsgHandler.java index a4ada8b6..4d8212b5 100644 --- a/src/engine/net/client/handlers/MerchantMsgHandler.java +++ b/src/engine/net/client/handlers/MerchantMsgHandler.java @@ -79,18 +79,14 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler { return; } - GuildManager.updateAllGuildBinds(player.getGuild(), npc.getGuild().getOwnedCity()); - //update Guild state. player.getGuild().setNation(npc.getGuild()); GuildManager.updateAllGuildTags(player.getGuild()); - //update state twice, errant to petitioner, to sworn. - player.getGuild().upgradeGuildState(false);//to petitioner - player.getGuild().upgradeGuildState(false);//to sworn - + //update state + player.getGuild().guildState = mbEnums.GuildState.Sworn; } diff --git a/src/engine/objects/Guild.java b/src/engine/objects/Guild.java index b7e10edd..5b3422dd 100644 --- a/src/engine/objects/Guild.java +++ b/src/engine/objects/Guild.java @@ -627,38 +627,6 @@ public class Guild extends AbstractWorldObject { } - public void upgradeGuildState(boolean nation) { - if (nation) { - this.guildState = GuildState.Nation; - return; - } - switch (this.guildState) { - - case Errant: - this.guildState = GuildState.Petitioner; - break; - case Sworn: - //Can't upgrade - break; - case Protectorate: - this.guildState = GuildState.Province; - break; - case Petitioner: - this.guildState = GuildState.Sworn; - break; - case Province: - //Can't upgrade - break; - case Nation: - //Can't upgrade - break; - case Sovereign: - this.guildState = GuildState.Protectorate; - break; - } - - } - public boolean canSubAGuild(Guild toSub) { boolean canSub;