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/objects/Bane.java
+13 -13
View File
@@ -9,10 +9,6 @@
package engine.objects;
import engine.Enum;
import engine.Enum.ProtectionState;
import engine.Enum.SiegePhase;
import engine.Enum.SiegeResult;
import engine.InterestManagement.WorldGrid;
import engine.db.archive.BaneRecord;
import engine.db.archive.DataWarehouse;
@@ -24,6 +20,10 @@ import engine.job.JobScheduler;
import engine.jobs.ActivateBaneJob;
import engine.jobs.BaneDefaultTimeJob;
import engine.math.Vector3fImmutable;
import engine.mbEnums;
import engine.mbEnums.ProtectionState;
import engine.mbEnums.SiegePhase;
import engine.mbEnums.SiegeResult;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
import engine.net.client.msg.PlaceAssetMsg;
@@ -256,13 +256,13 @@ public final class Bane {
ChatSystemMsg chatMsg = new ChatSystemMsg(null, "[Bane Channel] " + targetCity.getCityName() + " has been baned by " + baningGuild.getName() + ". Standoff phase has begun!");
chatMsg.setMessageType(4);
chatMsg.setChannel(Enum.ChatChannelType.SYSTEM.getChannelID());
chatMsg.setChannel(mbEnums.ChatChannelType.SYSTEM.getChannelID());
DispatchMessage.dispatchMsgToAll(chatMsg);
// Push this event to the DataWarehouse
BaneRecord baneRecord = BaneRecord.borrow(bane, Enum.RecordEventType.PENDING);
BaneRecord baneRecord = BaneRecord.borrow(bane, mbEnums.RecordEventType.PENDING);
DataWarehouse.pushToWarehouse(baneRecord);
return true;
@@ -403,7 +403,7 @@ public final class Bane {
}
public PlayerCharacter getOwner() {
return (PlayerCharacter) DbManager.getObject(Enum.GameObjectType.PlayerCharacter, ownerUUID);
return (PlayerCharacter) DbManager.getObject(mbEnums.GameObjectType.PlayerCharacter, ownerUUID);
}
public boolean remove() {
@@ -538,7 +538,7 @@ public final class Bane {
// Push event to warehouse
BaneRecord.updateResolution(this, Enum.RecordEventType.DEFEND);
BaneRecord.updateResolution(this, mbEnums.RecordEventType.DEFEND);
baneRemoved = remove();
@@ -552,7 +552,7 @@ public final class Bane {
ChatSystemMsg msg = new ChatSystemMsg(null, "[Bane Channel]" + this.getCity().getGuild().getName() + " has rallied against " + this.getOwner().getGuild().getName() + ". The siege on " + this.getCity().getCityName() + " has been broken!");
msg.setMessageType(4);
msg.setChannel(engine.Enum.ChatChannelType.SYSTEM.getChannelID());
msg.setChannel(mbEnums.ChatChannelType.SYSTEM.getChannelID());
DispatchMessage.dispatchMsgToAll(msg);
@@ -563,7 +563,7 @@ public final class Bane {
// Push event to warehouse
BaneRecord.updateResolution(this, Enum.RecordEventType.CAPTURE);
BaneRecord.updateResolution(this, mbEnums.RecordEventType.CAPTURE);
baneRemoved = this.remove();
@@ -571,7 +571,7 @@ public final class Bane {
ChatSystemMsg msg = new ChatSystemMsg(null, "[Bane Channel]" + this.getOwner().getGuild().getName() + " have defeated " + this.getCity().getGuild().getName() + " and captured " + this.getCity().getCityName() + '!');
msg.setMessageType(4);
msg.setChannel(engine.Enum.ChatChannelType.SYSTEM.getChannelID());
msg.setChannel(mbEnums.ChatChannelType.SYSTEM.getChannelID());
DispatchMessage.dispatchMsgToAll(msg);
}
@@ -580,7 +580,7 @@ public final class Bane {
// Push event to warehouse
BaneRecord.updateResolution(this, Enum.RecordEventType.DESTROY);
BaneRecord.updateResolution(this, mbEnums.RecordEventType.DESTROY);
baneRemoved = this.remove();
@@ -588,7 +588,7 @@ public final class Bane {
ChatSystemMsg msg = new ChatSystemMsg(null, "[Bane Channel]" + this.getOwner().getGuild().getName() + " have defeated " + this.getCity().getGuild().getName() + " and razed " + this.getCity().getCityName() + '!');
msg.setMessageType(4);
msg.setChannel(engine.Enum.ChatChannelType.SYSTEM.getChannelID());
msg.setChannel(mbEnums.ChatChannelType.SYSTEM.getChannelID());
DispatchMessage.dispatchMsgToAll(msg);
}