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

Members moved to WorldServer.

Browse Source 
Root object no longer read from config.
This commit is contained in:
MagicBot
2023-06-07 13:37:43 -04:00
parent d695d3db26
commit b9db6e8dc6
21 changed files with 76 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/objects/Guild.java
+4 -4
View File
@@ -31,7 +31,7 @@ import engine.net.client.msg.AllianceChangeMsg;
import engine.net.client.msg.ErrorPopupMsg;
import engine.net.client.msg.UpdateClientAlliancesMsg;
import engine.net.client.msg.guild.GuildInfoMsg;
import engine.server.MBServerStatics;
import engine.server.world.WorldServer;
import org.joda.time.DateTime;
import org.pmw.tinylog.Logger;
@@ -805,9 +805,9 @@ public class Guild extends AbstractWorldObject {
}
if (MBServerStatics.worldUUID == nationUUID && this.cityUUID != 0)
if (WorldServer.worldUUID == nationUUID && this.cityUUID != 0)
this.nation = this;
else if (nationUUID == 0 || (MBServerStatics.worldUUID == nationUUID && this.cityUUID == 0)) {
else if (nationUUID == 0 || (WorldServer.worldUUID == nationUUID && this.cityUUID == 0)) {
this.nation = Guild.getErrantGuild();
this.nmotd = "";
} else
@@ -919,7 +919,7 @@ public class Guild extends AbstractWorldObject {
// Update database
if (!DbManager.GuildQueries.UPDATE_PARENT(subGuild.getObjectUUID(), MBServerStatics.worldUUID))
if (!DbManager.GuildQueries.UPDATE_PARENT(subGuild.getObjectUUID(), WorldServer.worldUUID))
Logger.debug("Failed to set Nation Guild for Guild with UID " + subGuild.getObjectUUID());
// Guild without any subs is no longer a nation