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/net/client/handlers/AssetSupportMsgHandler.java
+15 -15
View File
@@ -1,12 +1,12 @@
package engine.net.client.handlers;
import engine.Enum;
import engine.Enum.SupportMsgType;
import engine.Enum.TaxType;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager;
import engine.gameManager.NPCManager;
import engine.gameManager.SessionManager;
import engine.mbEnums;
import engine.mbEnums.SupportMsgType;
import engine.mbEnums.TaxType;
import engine.net.Dispatch;
import engine.net.DispatchMessage;
import engine.net.client.ClientConnection;
@@ -83,20 +83,20 @@ public class AssetSupportMsgHandler extends AbstractClientMsgHandler {
ErrorPopupMsg.sendErrorMsg(origin.getPlayerCharacter(), "Failed to add taxes to building.");
return;
}
targetBuilding.setProtectionState(Enum.ProtectionState.PENDING);
targetBuilding.setProtectionState(mbEnums.ProtectionState.PENDING);
} else if (msg.getProfitTax() != 0) {
if (!serverCity.getTOL().addProtectionTax(targetBuilding, origin.getPlayerCharacter(), TaxType.PROFIT, msg.getProfitTax(), msg.getEnforceKOS() == 1 ? true : false)) {
ErrorPopupMsg.sendErrorMsg(origin.getPlayerCharacter(), "Failed to add taxes to building.");
return;
}
targetBuilding.setProtectionState(Enum.ProtectionState.PENDING);
targetBuilding.setProtectionState(mbEnums.ProtectionState.PENDING);
} else
targetBuilding.setProtectionState(Enum.ProtectionState.CONTRACT);
targetBuilding.setProtectionState(mbEnums.ProtectionState.CONTRACT);
outMsg = new ManageNPCMsg(vendor);
dispatch = Dispatch.borrow(origin.getPlayerCharacter(), outMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
}
private static void unprotectAsset(Building targetBuilding, NPC vendor, ClientConnection origin) {
@@ -106,11 +106,11 @@ public class AssetSupportMsgHandler extends AbstractClientMsgHandler {
// Early exit if UUID < the last database derived building UUID.
if (targetBuilding.getProtectionState() == Enum.ProtectionState.NPC) {
if (targetBuilding.getProtectionState() == mbEnums.ProtectionState.NPC) {
return;
}
if (targetBuilding.getProtectionState() == engine.Enum.ProtectionState.NONE)
if (targetBuilding.getProtectionState() == mbEnums.ProtectionState.NONE)
return;
if (GuildStatusController.isInnerCouncil(origin.getPlayerCharacter().getGuildStatus()) == false)
@@ -118,7 +118,7 @@ public class AssetSupportMsgHandler extends AbstractClientMsgHandler {
targetBuilding.removeTaxes();
targetBuilding.setProtectionState(engine.Enum.ProtectionState.NONE);
targetBuilding.setProtectionState(mbEnums.ProtectionState.NONE);
}
@@ -160,7 +160,7 @@ public class AssetSupportMsgHandler extends AbstractClientMsgHandler {
SupportMsgType supportType = SupportMsgType.typeLookup.get(msg.getMessageType());
if (supportType == null) {
supportType = Enum.SupportMsgType.NONE;
supportType = mbEnums.SupportMsgType.NONE;
Logger.error("No enumeration for support type" + msg.getMessageType());
}
switch (supportType) {
@@ -179,7 +179,7 @@ public class AssetSupportMsgHandler extends AbstractClientMsgHandler {
outMsg.configure();
dispatch = Dispatch.borrow(player, outMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
break;
case REMOVETAX:
@@ -202,7 +202,7 @@ public class AssetSupportMsgHandler extends AbstractClientMsgHandler {
mca.setAssetName1(targetBuilding.getName());
mca.setUnknown54(1);
dispatch = Dispatch.borrow(player, mca);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return true;
case ACCEPTTAX: //AcceptTax
@@ -226,12 +226,12 @@ public class AssetSupportMsgHandler extends AbstractClientMsgHandler {
mca.setUnknown54(1);
dispatch = Dispatch.borrow(player, mca);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return true;
}
dispatch = Dispatch.borrow(player, baseMsg);
DispatchMessage.dispatchMsgDispatch(dispatch, Enum.DispatchChannel.SECONDARY);
DispatchMessage.dispatchMsgDispatch(dispatch, mbEnums.DispatchChannel.SECONDARY);
return true;