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

Renamed class to not conflict with the java.lang version.

Browse Source
This commit is contained in:
MagicBot
2024-04-05 07:59:44 -04:00
parent dd84615ca1
commit c1ee6f5b52
388 changed files with 1807 additions and 1779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/server/MBServerStatics.java
+2 -2
View File
@@ -9,8 +9,8 @@
package engine.server;
import engine.Enum;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
public class MBServerStatics {
@@ -383,7 +383,7 @@ public class MBServerStatics {
public static float PLAYER_HATE_DELIMITER = 50; // reduces 50 hate a second
public static float PLAYER_COMBAT_HATE_MODIFIER = 2;
// DO NOT FINAL THESE FIELD!
public static Enum.AccountStatus accessLevel; // Min account level to login to server
public static mbEnums.AccountStatus accessLevel; // Min account level to login to server
public static boolean blockLogin = false;
public static boolean ENABLE_VAULT_FILL = false;
public static boolean ENABLE_MOB_LOOT = true;
src/engine/server/login/LoginServer.java
+7 -7
View File
@@ -9,11 +9,11 @@
package engine.server.login;
import engine.Enum;
import engine.gameManager.*;
import engine.job.JobScheduler;
import engine.jobs.CSessionCleanupJob;
import engine.jobs.DisconnectJob;
import engine.mbEnums;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.Network;
@@ -87,7 +87,7 @@ public class LoginServer {
loginServer = new LoginServer();
ConfigManager.loginServer = loginServer;
ConfigManager.serverType = Enum.ServerType.LOGINSERVER;
ConfigManager.serverType = mbEnums.ServerType.LOGINSERVER;
if (ConfigManager.init() == false) {
Logger.error("ABORT! Missing config entry!");
@@ -192,7 +192,7 @@ public class LoginServer {
origin.sendMsg(msg);
} else {
Dispatch dispatch = Dispatch.borrow(player, msg);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.PRIMARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.PRIMARY);
}
@@ -314,7 +314,7 @@ public class LoginServer {
DbManager.KitQueries.GET_ALL_KITS();
Logger.info("Initializing Race data");
Enum.RaceType.initRaceTypeTables();
mbEnums.RaceType.initRaceTypeTables();
Race.loadAllRaces();
Logger.info("Initializing Errant Guild");
@@ -491,11 +491,11 @@ public class LoginServer {
switch (objectType) {
case "account":
DbManager.removeFromCache(Enum.GameObjectType.Account, objectUUID);
DbManager.removeFromCache(mbEnums.GameObjectType.Account, objectUUID);
break;
case "character":
DbManager.removeFromCache(Enum.GameObjectType.PlayerCharacter, objectUUID);
PlayerCharacter player = (PlayerCharacter) DbManager.getObject(Enum.GameObjectType.PlayerCharacter, objectUUID);
DbManager.removeFromCache(mbEnums.GameObjectType.PlayerCharacter, objectUUID);
PlayerCharacter player = (PlayerCharacter) DbManager.getObject(mbEnums.GameObjectType.PlayerCharacter, objectUUID);
PlayerCharacter.initializePlayer(player);
player.getAccount().characterMap.replace(player.getObjectUUID(), player);
Logger.info("Player active state is : " + player.isActive());
src/engine/server/world/WorldServer.java
+10 -10
View File
@@ -9,10 +9,10 @@
package engine.server.world;
import engine.Enum;
import engine.Enum.DispatchChannel;
import engine.Enum.MinionType;
import engine.Enum.SupportMsgType;
import engine.mbEnums;
import engine.mbEnums.DispatchChannel;
import engine.mbEnums.MinionType;
import engine.mbEnums.SupportMsgType;
import engine.InterestManagement.RealmMap;
import engine.InterestManagement.WorldGrid;
import engine.db.archive.DataWarehouse;
@@ -69,7 +69,7 @@ public class WorldServer {
public static int worldRealmMap = Integer.parseInt(ConfigManager.MB_WORLD_REALMMAP.getValue());
public static int worldUUID = 1; // Root object in database
public static Enum.AccountStatus worldAccessLevel = Enum.AccountStatus.valueOf(ConfigManager.MB_WORLD_ACCESS_LVL.getValue());
public static mbEnums.AccountStatus worldAccessLevel = mbEnums.AccountStatus.valueOf(ConfigManager.MB_WORLD_ACCESS_LVL.getValue());
private static LocalDateTime bootTime = LocalDateTime.now();
public boolean isRunning = false;
@@ -100,7 +100,7 @@ public class WorldServer {
worldServer = new WorldServer();
ConfigManager.serverType = Enum.ServerType.WORLDSERVER;
ConfigManager.serverType = mbEnums.ServerType.WORLDSERVER;
ConfigManager.worldServer = worldServer;
worldServer.init();
@@ -364,7 +364,7 @@ public class WorldServer {
MapLoader.loadAlHeightMaps();
Logger.info("Loading Race data");
Enum.RaceType.initRaceTypeTables();
mbEnums.RaceType.initRaceTypeTables();
Race.loadAllRaces();
Logger.info("Loading building slot/stuck location data.");
@@ -413,7 +413,7 @@ public class WorldServer {
DbManager.ShrineQueries.LOAD_ALL_SHRINES();
Logger.info("Initialize Resource type lookup");
Enum.ResourceType.InitializeResourceTypes();
mbEnums.ResourceType.InitializeResourceTypes();
Logger.info("Loading Warehouse data.");
DbManager.WarehouseQueries.LOAD_WAREHOUSES();
@@ -720,8 +720,8 @@ public class WorldServer {
Logger.info("Msg: " + flashString);
ChatSystemMsg msg = new ChatSystemMsg(null, flashString);
msg.setChannel(engine.Enum.ChatChannelType.FLASH.getChannelID());
msg.setMessageType(Enum.ChatMessageType.INFO.ordinal());
msg.setChannel(mbEnums.ChatChannelType.FLASH.getChannelID());
msg.setMessageType(mbEnums.ChatMessageType.INFO.ordinal());
DispatchMessage.dispatchMsgToAll(msg);
// Delete file