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/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
src/engine/net/client/msg/ServerInfoMsg.java
+4 -3
View File
@@ -17,6 +17,7 @@ import engine.net.ByteBufferWriter;
import engine.net.client.Protocol;
import engine.server.MBServerStatics;
import engine.server.login.LoginServer;
import engine.server.world.WorldServer;
public class ServerInfoMsg extends ClientNetMsg {
@@ -49,9 +50,9 @@ public class ServerInfoMsg extends ClientNetMsg {
// wsis.serializeForClientMsg(writer);
// }
writer.putInt(1);
writer.putInt(MBServerStatics.worldMapID);
writer.putString(ConfigManager.MB_WORLD_NAME.getValue());
writer.putInt(WorldServer.worldMapID);
writer.putString(ConfigManager.MB_WORLD_NAME.getValue());
if (LoginServer.population < MBServerStatics.LOW_POPULATION)
writer.putInt(0); //Land Rush
else if (LoginServer.population < MBServerStatics.NORMAL_POPULATION)
src/engine/net/client/msg/WorldDataMsg.java
+2 -2
View File
@@ -19,7 +19,7 @@ import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
import engine.net.client.Protocol;
import engine.objects.Zone;
import engine.server.MBServerStatics;
import engine.server.world.WorldServer;
import org.pmw.tinylog.Logger;
public class WorldDataMsg extends ClientNetMsg {
@@ -74,7 +74,7 @@ public class WorldDataMsg extends ClientNetMsg {
writer.putInt(512);
writer.putInt(384);
writer.putInt(MBServerStatics.worldMapID);
writer.putInt(WorldServer.worldMapID);
writer.putInt(0x00000000);
writer.putInt(getTotalMapSize(root) + 1);
src/engine/net/client/msg/chat/ChatCSRMsg.java
+3 -3
View File
@@ -17,7 +17,7 @@ import engine.net.ByteBufferWriter;
import engine.net.client.ClientConnection;
import engine.net.client.Protocol;
import engine.objects.AbstractWorldObject;
import engine.server.MBServerStatics;
import engine.server.world.WorldServer;
import engine.session.Session;
public class ChatCSRMsg extends AbstractChatMsg {
@@ -71,8 +71,8 @@ public class ChatCSRMsg extends AbstractChatMsg {
writer.putInt(this.source.getObjectUUID());
writer.putInt(this.unknown01);
writer.putString(this.message);
writer.putString(this.source.getName());
writer.putInt(MBServerStatics.worldMapID);
writer.putString(this.source.getName());
writer.putInt(WorldServer.worldMapID);
}
}
src/engine/net/client/msg/chat/ChatCityMsg.java
+3 -3
View File
@@ -18,7 +18,7 @@ import engine.net.client.Protocol;
import engine.objects.AbstractCharacter;
import engine.objects.AbstractGameObject;
import engine.objects.AbstractWorldObject;
import engine.server.MBServerStatics;
import engine.server.world.WorldServer;
public class ChatCityMsg extends AbstractChatMsg {
@@ -80,8 +80,8 @@ public class ChatCityMsg extends AbstractChatMsg {
writer.putString("");
writer.putInt(0);
} else {
writer.putString(((AbstractCharacter) this.source).getFirstName());
writer.putInt(MBServerStatics.worldMapID);
writer.putString(((AbstractCharacter) this.source).getFirstName());
writer.putInt(WorldServer.worldMapID);
}
}
src/engine/net/client/msg/chat/ChatGlobalMsg.java
+3 -3
View File
@@ -16,7 +16,7 @@ import engine.net.ByteBufferWriter;
import engine.net.client.Protocol;
import engine.objects.AbstractCharacter;
import engine.objects.AbstractWorldObject;
import engine.server.MBServerStatics;
import engine.server.world.WorldServer;
public class ChatGlobalMsg extends AbstractChatMsg {
@@ -79,8 +79,8 @@ public class ChatGlobalMsg extends AbstractChatMsg {
writer.putString("");
writer.putInt(0);
} else {
writer.putString(((AbstractCharacter) this.source).getFirstName());
writer.putInt(MBServerStatics.worldMapID);
writer.putString(((AbstractCharacter) this.source).getFirstName());
writer.putInt(WorldServer.worldMapID);
}
writer.putInt(0);
writer.putInt(0);
src/engine/net/client/msg/chat/ChatSayMsg.java
+3 -3
View File
@@ -18,7 +18,7 @@ import engine.net.client.Protocol;
import engine.objects.AbstractCharacter;
import engine.objects.AbstractGameObject;
import engine.objects.AbstractWorldObject;
import engine.server.MBServerStatics;
import engine.server.world.WorldServer;
public class ChatSayMsg extends AbstractChatMsg {
@@ -84,8 +84,8 @@ public class ChatSayMsg extends AbstractChatMsg {
writer.putString("");
writer.putInt(0);
} else {
writer.putString(((AbstractCharacter) this.source).getFirstName());
writer.putInt(MBServerStatics.worldMapID);
writer.putString(((AbstractCharacter) this.source).getFirstName());
writer.putInt(WorldServer.worldMapID);
}
}
}
src/engine/net/client/msg/chat/ChatShoutMsg.java
+3 -3
View File
@@ -16,7 +16,7 @@ import engine.net.ByteBufferWriter;
import engine.net.client.Protocol;
import engine.objects.AbstractCharacter;
import engine.objects.AbstractWorldObject;
import engine.server.MBServerStatics;
import engine.server.world.WorldServer;
public class ChatShoutMsg extends AbstractChatMsg {
@@ -73,8 +73,8 @@ public class ChatShoutMsg extends AbstractChatMsg {
writer.putString("");
writer.putInt(0);
} else {
writer.putString(((AbstractCharacter) this.source).getFirstName());
writer.putInt(MBServerStatics.worldMapID);
writer.putString(((AbstractCharacter) this.source).getFirstName());
writer.putInt(WorldServer.worldMapID);
}
}
}
src/engine/net/client/msg/chat/ChatTellMsg.java
+14 -14
View File
@@ -16,7 +16,7 @@ import engine.net.ByteBufferWriter;
import engine.net.client.Protocol;
import engine.objects.AbstractCharacter;
import engine.objects.AbstractWorldObject;
import engine.server.MBServerStatics;
import engine.server.world.WorldServer;
public class ChatTellMsg extends AbstractChatMsg {
@@ -106,19 +106,19 @@ public class ChatTellMsg extends AbstractChatMsg {
if (this.target != null) {
writer.putInt(this.target.getObjectType().ordinal());
writer.putInt(this.target.getObjectUUID());
if (AbstractWorldObject.IsAbstractCharacter(target)) {
writer.putString(((AbstractCharacter) this.target).getFirstName());
} else {
writer.putString(this.target.getName());
}
} else {
writer.putInt(this.targetType);
writer.putInt(this.targetID);
writer.putString(this.targetName);
}
writer.putInt(MBServerStatics.worldMapID);
writer.putInt(MBServerStatics.worldMapID);
}
if (AbstractWorldObject.IsAbstractCharacter(target)) {
writer.putString(((AbstractCharacter) this.target).getFirstName());
} else {
writer.putString(this.target.getName());
}
} else {
writer.putInt(this.targetType);
writer.putInt(this.targetID);
writer.putString(this.targetName);
}
writer.putInt(WorldServer.worldMapID);
writer.putInt(WorldServer.worldMapID);
}
/**
* @return the target
src/engine/net/client/msg/login/InvalidNameMsg.java
+4 -4
View File
@@ -15,7 +15,7 @@ import engine.net.ByteBufferReader;
import engine.net.ByteBufferWriter;
import engine.net.client.Protocol;
import engine.net.client.msg.ClientNetMsg;
import engine.server.MBServerStatics;
import engine.server.world.WorldServer;
public class InvalidNameMsg extends ClientNetMsg {
@@ -48,9 +48,9 @@ public class InvalidNameMsg extends ClientNetMsg {
@Override
protected void _serialize(ByteBufferWriter writer) {
writer.putString(this.FirstName);
writer.putString(this.LastName);
writer.putInt(MBServerStatics.worldMapID);
writer.putInt(errorCode);
writer.putString(this.LastName);
writer.putInt(WorldServer.worldMapID);
writer.putInt(errorCode);
}
/**