MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 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/City.java
+2 -1
View File
@@ -30,6 +30,7 @@ import engine.net.client.msg.TaxResourcesMsg;
import engine.net.client.msg.ViewResourcesMessage;
import engine.powers.EffectsBase;
import engine.server.MBServerStatics;
import engine.server.world.WorldServer;
import engine.workthreads.DestroyCityThread;
import engine.workthreads.TransferCityThread;
import org.pmw.tinylog.Logger;
@@ -1125,7 +1126,7 @@ public class City extends AbstractWorldObject {
// claiming your new tree and set as Landed
if (!sourceNation.isEmptyGuild() && sourceNation != sourceGuild) {
if (!DbManager.GuildQueries.UPDATE_PARENT(sourceGuild.getObjectUUID(), MBServerStatics.worldUUID)) {
if (!DbManager.GuildQueries.UPDATE_PARENT(sourceGuild.getObjectUUID(), WorldServer.worldUUID)) {
ChatManager.chatGuildError((PlayerCharacter) sourcePlayer, "A Serious error has occurred. Please post details for to ensure transaction integrity");
return;
}
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
src/engine/objects/PlayerCharacter.java
+5 -4
View File
@@ -39,6 +39,7 @@ import engine.powers.EffectsBase;
import engine.server.MBServerStatics;
import engine.server.login.LoginServer;
import engine.server.login.LoginServerMsgHandler;
import engine.server.world.WorldServer;
import engine.util.MiscUtils;
import org.joda.time.DateTime;
import org.pmw.tinylog.Logger;
@@ -1995,7 +1996,7 @@ public class PlayerCharacter extends AbstractCharacter {
writer.putInt(0);
writer.putString(ConfigManager.MB_WORLD_NAME.getValue());
writer.putInt(MBServerStatics.worldMapID);
writer.putInt(WorldServer.worldMapID);
writer.put((byte) 1); // End Datablock byte
writer.putInt(0); // Unsure, Pad?
@@ -2315,9 +2316,9 @@ public class PlayerCharacter extends AbstractCharacter {
if (playerCharacter.account == null)
serverUp = 0;
if ((playerCharacter.account.status.equals(AccountStatus.ADMIN) == false) &&
(playerCharacter.account.status.equals(MBServerStatics.worldAccessLevel) == false))
serverUp = 0;
if ((playerCharacter.account.status.equals(AccountStatus.ADMIN) == false) &&
(playerCharacter.account.status.equals(WorldServer.worldAccessLevel) == false))
serverUp = 0;
writer.putInt(serverUp);
writer.putInt(0); // effects, not sure used by players