forked from MagicBane/Server
Sovereign as still having a city.
This commit is contained in:
@@ -848,14 +848,12 @@ 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());
|
||||||
|
|
||||||
// Guild without any subs is no longer a nation
|
|
||||||
|
|
||||||
if (subGuild.getOwnedCity() == null) {
|
if (subGuild.getOwnedCity() == null) {
|
||||||
subGuild.guildState = GuildState.Errant;
|
subGuild.guildState = GuildState.Errant;
|
||||||
subGuild.nation = Guild.getErrantNation();
|
subGuild.nation = Guild.getErrantNation();
|
||||||
} else {
|
} else {
|
||||||
subGuild.nation = subGuild;
|
subGuild.nation = subGuild;
|
||||||
subGuild.guildState = GuildState.Errant;
|
subGuild.guildState = GuildState.Sovereign;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Remove from collection
|
// Remove from collection
|
||||||
|
|||||||
Reference in New Issue
Block a user