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/net/client/handlers/BreakFealtyHandler.java
+3 -5
View File
@@ -24,7 +24,7 @@ import engine.net.client.msg.ErrorPopupMsg;
import engine.net.client.msg.guild.BreakFealtyMsg;
import engine.net.client.msg.guild.SendGuildEntryMsg;
import engine.objects.*;
import engine.server.MBServerStatics;
import engine.server.world.WorldServer;
import engine.session.Session;
import java.util.ArrayList;
@@ -75,9 +75,7 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
}
if (!DbManager.GuildQueries.UPDATE_PARENT(guild.getObjectUUID(),MBServerStatics.worldUUID)) {
if (!DbManager.GuildQueries.UPDATE_PARENT(guild.getObjectUUID(), WorldServer.worldUUID)) {
ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occurred. Please post details for to ensure transaction integrity");
return true;
}
@@ -141,7 +139,7 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
return true;
}
if (!DbManager.GuildQueries.UPDATE_PARENT(guild.getObjectUUID(),MBServerStatics.worldUUID)) {
if (!DbManager.GuildQueries.UPDATE_PARENT(guild.getObjectUUID(), WorldServer.worldUUID)) {
ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occurred. Please post details for to ensure transaction integrity");
return true;
}
src/engine/net/client/handlers/DismissGuildHandler.java
+4 -4
View File
@@ -24,7 +24,7 @@ import engine.net.client.msg.ErrorPopupMsg;
import engine.net.client.msg.guild.DismissGuildMsg;
import engine.net.client.msg.guild.SendGuildEntryMsg;
import engine.objects.*;
import engine.server.MBServerStatics;
import engine.server.world.WorldServer;
import engine.session.Session;
import java.util.ArrayList;
@@ -86,8 +86,8 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
switch (toDismiss.getGuildState()) {
case Sworn:
if (!DbManager.GuildQueries.UPDATE_PARENT(toDismiss.getObjectUUID(), MBServerStatics.worldUUID)) {
ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
if (!DbManager.GuildQueries.UPDATE_PARENT(toDismiss.getObjectUUID(), WorldServer.worldUUID)) {
ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
return true;
}
nation.getSubGuildList().remove(toDismiss);
@@ -97,7 +97,7 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
break;
case Province:
if (!DbManager.GuildQueries.UPDATE_PARENT(toDismiss.getObjectUUID(),MBServerStatics.worldUUID)) {
if (!DbManager.GuildQueries.UPDATE_PARENT(toDismiss.getObjectUUID(), WorldServer.worldUUID)) {
ErrorPopupMsg.sendErrorMsg(player, "A Serious error has occured. Please post details for to ensure transaction integrity");
return true;
}
src/engine/net/client/handlers/RequestEnterWorldHandler.java
+5 -4
View File
@@ -18,6 +18,7 @@ import engine.objects.AbstractWorldObject;
import engine.objects.Account;
import engine.objects.PlayerCharacter;
import engine.server.MBServerStatics;
import engine.server.world.WorldServer;
import engine.session.Session;
import org.pmw.tinylog.Logger;
@@ -60,10 +61,10 @@ public class RequestEnterWorldHandler extends AbstractClientMsgHandler {
Account acc = SessionManager.getAccount(origin);
if (acc.status.ordinal() < MBServerStatics.worldAccessLevel.ordinal() || MBServerStatics.blockLogin) {
origin.disconnect();
return true;
}
if (acc.status.ordinal() < WorldServer.worldAccessLevel.ordinal() || MBServerStatics.blockLogin) {
origin.disconnect();
return true;
}
// Brand new character. Send the city select screen