BadBird/BattleBane
1
0
Fork 0
forked from MagicBane/Server
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Province qualifies as nation too.

Browse Source
This commit is contained in:
MagicBot
2026-05-11 03:58:31 -04:00
parent 5f67c043c2
commit 3aca40dc78
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/net/client/handlers/SwearInGuildHandler.java
+2 -1
View File
@@ -101,7 +101,8 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler {
GuildManager.updateAllGuildTags(protectorate); GuildManager.updateAllGuildTags(protectorate);
if (nation.guildState == GuildState.Sovereign) 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; nation.guildState = GuildState.Nation;
SendGuildEntryMsg msg = new SendGuildEntryMsg(player); SendGuildEntryMsg msg = new SendGuildEntryMsg(player);
src/engine/objects/Guild.java
-2
View File
@@ -741,8 +741,6 @@ public class Guild extends AbstractWorldObject {
this.guildState = GuildManager.calcuateGuildState(this); this.guildState = GuildManager.calcuateGuildState(this);
Logger.info(this.name + ":" + this.guildState + ":" + this.nation.name);
if (this.getOwnedCity() == null) if (this.getOwnedCity() == null)
return; return;