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

Cleaner implementation

Browse Source
This commit is contained in:
MagicBot
2026-05-11 03:51:21 -04:00
parent 258bef5cb3
commit 5f67c043c2
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Guild.java
+10 -6
View File
@@ -820,12 +820,16 @@ public class Guild extends AbstractWorldObject {
if (!DbManager.GuildQueries.UPDATE_PARENT(subGuild.getObjectUUID(), WorldServer.worldUUID)) if (!DbManager.GuildQueries.UPDATE_PARENT(subGuild.getObjectUUID(), WorldServer.worldUUID))
Logger.debug("Failed to set Nation Guild for Guild with UID " + subGuild.getObjectUUID()); Logger.debug("Failed to set Nation Guild for Guild with UID " + subGuild.getObjectUUID());
if (subGuild.getOwnedCity() == null) { switch (subGuild.guildState) {
subGuild.guildState = GuildState.Errant; case Sworn:
subGuild.nation = Guild.getErrantNation(); subGuild.guildState = GuildState.Errant;
} else { subGuild.nation = Guild.getErrantNation();
subGuild.nation = subGuild; break;
subGuild.guildState = GuildState.Sovereign; case Protectorate:
case Petitioner:
subGuild.nation = subGuild;
subGuild.guildState = GuildState.Sovereign;
break;
} }
// Remove from collection // Remove from collection