MagicBane/Server
Template
92
1
Fork 5
Code Issues 5 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/workthreads/DestroyCityThread.java
+10 -10
View File
@@ -18,7 +18,7 @@ package engine.workthreads;
* next reboot.
*/
import engine.Enum;
import engine.mbEnums;
import engine.gameManager.BuildingManager;
import engine.gameManager.DbManager;
import engine.gameManager.GuildManager;
@@ -63,7 +63,7 @@ public class DestroyCityThread implements Runnable {
//Successful Update of guild
formerGuild.setGuildState(engine.Enum.GuildState.Errant);
formerGuild.setGuildState(mbEnums.GuildState.Errant);
formerGuild.setNation(null);
formerGuild.setCityUUID(0);
GuildManager.updateAllGuildTags(formerGuild);
@@ -97,12 +97,12 @@ public class DestroyCityThread implements Runnable {
// Do nothing with the banestone. It will be removed elsewhere
if (cityBuilding.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.BANESTONE))
if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.BANESTONE))
continue;
// TOL is processed after all other structures in the city zone
if (cityBuilding.getBlueprint().getBuildingGroup().equals(Enum.BuildingGroup.TOL)) {
if (cityBuilding.getBlueprint().getBuildingGroup().equals(mbEnums.BuildingGroup.TOL)) {
tol = cityBuilding;
continue;
}
@@ -123,16 +123,16 @@ public class DestroyCityThread implements Runnable {
// No longer a tree, no longer any protection contract!
cityBuilding.setProtectionState(Enum.ProtectionState.NONE);
cityBuilding.setProtectionState(mbEnums.ProtectionState.NONE);
// Destroy all remaining city assets
if ((cityBuilding.getBlueprint().getBuildingGroup() == Enum.BuildingGroup.BARRACK)
if ((cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.BARRACK)
|| (cityBuilding.getBlueprint().isWallPiece())
|| (cityBuilding.getBlueprint().getBuildingGroup() == Enum.BuildingGroup.SHRINE)
|| (cityBuilding.getBlueprint().getBuildingGroup() == Enum.BuildingGroup.TOL)
|| (cityBuilding.getBlueprint().getBuildingGroup() == Enum.BuildingGroup.SPIRE)
|| (cityBuilding.getBlueprint().getBuildingGroup() == Enum.BuildingGroup.WAREHOUSE)) {
|| (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.SHRINE)
|| (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.TOL)
|| (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.SPIRE)
|| (cityBuilding.getBlueprint().getBuildingGroup() == mbEnums.BuildingGroup.WAREHOUSE)) {
if (cityBuilding.getRank() != -1)
BuildingManager.setRank(cityBuilding, -1);
src/engine/workthreads/DisconnectTrashTask.java
+2 -2
View File
@@ -8,7 +8,7 @@
package engine.workthreads;
import engine.Enum;
import engine.mbEnums;
import engine.gameManager.DbManager;
import engine.gameManager.SessionManager;
import engine.objects.PlayerCharacter;
@@ -45,7 +45,7 @@ public class DisconnectTrashTask extends TimerTask {
// Remove account from cache
DbManager.removeFromCache(Enum.GameObjectType.Account, accountUID);
DbManager.removeFromCache(mbEnums.GameObjectType.Account, accountUID);
}
}
src/engine/workthreads/HourlyJobThread.java
+6 -6
View File
@@ -9,11 +9,11 @@
package engine.workthreads;
import engine.Enum;
import engine.InterestManagement.WorldGrid;
import engine.db.archive.DataWarehouse;
import engine.db.archive.MineRecord;
import engine.gameManager.*;
import engine.mbEnums;
import engine.net.DispatchMessage;
import engine.net.MessageDispatcher;
import engine.net.client.msg.chat.ChatSystemMsg;
@@ -38,7 +38,7 @@ public class HourlyJobThread implements Runnable {
for (Shrine shrine : Shrine.shrinesByBuildingUUID.values()) {
try {
Building shrineBuilding = (Building) DbManager.getObject(Enum.GameObjectType.Building, shrine.getBuildingID());
Building shrineBuilding = (Building) DbManager.getObject(mbEnums.GameObjectType.Building, shrine.getBuildingID());
if (shrineBuilding == null)
continue;
@@ -168,12 +168,12 @@ public class HourlyJobThread implements Runnable {
ChatSystemMsg chatMsg = new ChatSystemMsg(null, mine.lastClaimer.getName() + " has claimed the mine in " + mine.getParentZone().parent.zoneName + " for " + mine.getOwningGuild().getName() + ". The mine is no longer active.");
chatMsg.setMessageType(10);
chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
chatMsg.setChannel(mbEnums.ChatChannelType.SYSTEM.getChannelID());
DispatchMessage.dispatchMsgToAll(chatMsg);
// Warehouse this claim event
MineRecord mineRecord = MineRecord.borrow(mine, mine.lastClaimer, Enum.RecordEventType.CAPTURE);
MineRecord mineRecord = MineRecord.borrow(mine, mine.lastClaimer, mbEnums.RecordEventType.CAPTURE);
DataWarehouse.pushToWarehouse(mineRecord);
BuildingManager.setRank(mineBuilding, mineBuilding.getRank());
@@ -233,7 +233,7 @@ public class HourlyJobThread implements Runnable {
if (LocalDateTime.now().getHour() == MINE_LATE_WINDOW) {
Guild guild;
for (AbstractGameObject dbObject : DbManager.getList(Enum.GameObjectType.Guild)) {
for (AbstractGameObject dbObject : DbManager.getList(mbEnums.GameObjectType.Guild)) {
guild = (Guild) dbObject;
if (guild != null)
@@ -261,7 +261,7 @@ public class HourlyJobThread implements Runnable {
// Update city population values
ConcurrentHashMap<Integer, AbstractGameObject> map = DbManager.getMap(Enum.GameObjectType.City);
ConcurrentHashMap<Integer, AbstractGameObject> map = DbManager.getMap(mbEnums.GameObjectType.City);
if (map != null) {
src/engine/workthreads/TransferCityThread.java
+2 -2
View File
@@ -15,7 +15,7 @@ package engine.workthreads;
*
*/
import engine.Enum;
import engine.mbEnums;
import engine.gameManager.BuildingManager;
import engine.gameManager.DbManager;
import engine.gameManager.GuildManager;
@@ -50,7 +50,7 @@ public class TransferCityThread implements Runnable {
if (formerGuild != null)
if (DbManager.GuildQueries.SET_GUILD_OWNED_CITY(formerGuild.getObjectUUID(), 0)) {
formerGuild.setGuildState(Enum.GuildState.Errant);
formerGuild.setGuildState(mbEnums.GuildState.Errant);
formerGuild.setNation(null);
formerGuild.setCityUUID(0);
GuildManager.updateAllGuildTags(formerGuild);
src/engine/workthreads/WarehousePushThread.java
+2 -2
View File
@@ -15,7 +15,7 @@ package engine.workthreads;
*
*/
import engine.Enum;
import engine.mbEnums;
import engine.db.archive.*;
import engine.gameManager.ConfigManager;
import engine.gameManager.DbManager;
@@ -359,7 +359,7 @@ public class WarehousePushThread implements Runnable {
// Push records to remote database
for (Enum.DataRecordType recordType : Enum.DataRecordType.values()) {
for (mbEnums.DataRecordType recordType : mbEnums.DataRecordType.values()) {
switch (recordType) {
case PVP: