From f8180a700056f6064904a49f05051ebdcd7c764b Mon Sep 17 00:00:00 2001 From: MagicBot Date: Sun, 12 May 2024 13:42:11 -0400 Subject: [PATCH] Removed custom exception candy --- src/engine/exception/MsgSendException.java | 31 ------------------- src/engine/gameManager/GroupManager.java | 5 ++- src/engine/gameManager/MovementManager.java | 5 ++- .../mobileAI/utilities/MovementUtilities.java | 3 +- .../handlers/AbandonAssetMsgHandler.java | 3 +- .../handlers/AbstractChatMsgHandler.java | 3 +- .../handlers/AbstractClientMsgHandler.java | 5 ++- .../handlers/AcceptInviteToGuildHandler.java | 3 +- .../handlers/AcceptSubInviteHandler.java | 3 +- .../AcceptTradeRequestMsgHandler.java | 3 +- .../handlers/ActivateNPCMsgHandler.java | 3 +- .../AddGoldToTradeWindowMsgHandler.java | 3 +- .../AddItemToTradeWindowMsgHandler.java | 3 +- .../handlers/AllianceChangeMsgHandler.java | 3 +- .../handlers/AllyEnemyListMsgHandler.java | 3 +- .../handlers/AppointGroupLeaderHandler.java | 3 +- .../handlers/ArcLoginNotifyMsgHandler.java | 3 +- .../ArcMineChangeProductionMsgHandler.java | 3 +- .../ArcMineWindowAvailableTimeHandler.java | 3 +- .../handlers/ArcOwnedMinesListHandler.java | 3 +- .../handlers/ArcSiegeSpireMsgHandler.java | 3 +- .../ArcViewAssetTransactionsMsgHandler.java | 3 +- .../handlers/AssetSupportMsgHandler.java | 3 +- .../client/handlers/AttackCmdMsgHandler.java | 3 +- .../handlers/BanishUnbanishHandler.java | 3 +- .../client/handlers/BreakFealtyHandler.java | 3 +- .../handlers/ChangeAltitudeHandler.java | 3 +- .../handlers/ChangeGuildLeaderHandler.java | 3 +- .../client/handlers/ChangeRankHandler.java | 3 +- .../handlers/ChannelMuteMsgHandler.java | 3 +- .../client/handlers/CityChoiceMsgHandler.java | 3 +- .../net/client/handlers/CityDataHandler.java | 3 +- .../client/handlers/ClaimAssetMsgHandler.java | 3 +- .../handlers/ClaimGuildTreeMsgHandler.java | 3 +- .../ClientAdminCommandMsgHandler.java | 3 +- .../handlers/ClientLoginInfoMsgHandler.java | 3 +- .../handlers/CloseTradeWindowMsgHandler.java | 3 +- .../CommitNewCharacterMsgHandler.java | 3 +- .../handlers/CommitToTradeMsgHandler.java | 3 +- .../handlers/DeleteCharacterMsgHandler.java | 3 +- .../client/handlers/DeleteItemMsgHandler.java | 3 +- .../handlers/DestroyBuildingHandler.java | 3 +- .../client/handlers/DisbandGroupHandler.java | 3 +- .../client/handlers/DisbandGuildHandler.java | 3 +- .../client/handlers/DismissGuildHandler.java | 3 +- .../handlers/DoorTryOpenMsgHandler.java | 3 +- .../handlers/FormationFollowHandler.java | 4 +-- .../client/handlers/FriendAcceptHandler.java | 3 +- .../client/handlers/FriendDeclineHandler.java | 3 +- .../client/handlers/FriendRequestHandler.java | 3 +- .../net/client/handlers/FurnitureHandler.java | 3 +- .../GameServerIPRequestMsgHandler.java | 3 +- .../handlers/GoldFromVaultMsgHandler.java | 3 +- .../handlers/GoldToVaultMsgHandler.java | 3 +- .../client/handlers/GroupInviteHandler.java | 3 +- .../handlers/GroupInviteResponseHandler.java | 3 +- .../client/handlers/GroupUpdateHandler.java | 3 +- .../client/handlers/GuildControlHandler.java | 3 +- .../handlers/GuildCreationCloseHandler.java | 3 +- .../GuildCreationFinalizeHandler.java | 3 +- .../handlers/GuildCreationOptionsHandler.java | 3 +- .../net/client/handlers/GuildInfoHandler.java | 3 +- .../net/client/handlers/GuildListHandler.java | 3 +- .../handlers/GuildTreeStatusMsgHandler.java | 3 +- .../client/handlers/GuildUnknownHandler.java | 3 +- .../handlers/HirelingServiceMsgHandler.java | 3 +- .../net/client/handlers/IgnoreMsgHandler.java | 3 +- .../InvalidTradeRequestMsgHandler.java | 3 +- .../client/handlers/InviteToGuildHandler.java | 3 +- .../client/handlers/InviteToSubHandler.java | 3 +- .../handlers/ItemFromVaultMsgHandler.java | 3 +- .../handlers/ItemProductionMsgHandler.java | 3 +- .../handlers/ItemToVaultMsgHandler.java | 3 +- .../KeepAliveServerClientHandler.java | 3 +- .../client/handlers/LeaveGroupHandler.java | 3 +- .../client/handlers/LeaveGuildHandler.java | 3 +- .../client/handlers/LeaveWorldMsgHandler.java | 3 +- .../handlers/LockUnlockDoorMsgHandler.java | 3 +- .../handlers/LoginToGameServerMsgHandler.java | 3 +- .../net/client/handlers/LootMsgHandler.java | 3 +- .../handlers/LootWindowRequestMsgHandler.java | 3 +- .../client/handlers/MOTDCommitHandler.java | 3 +- .../net/client/handlers/MOTDEditHandler.java | 3 +- .../handlers/ManageCityAssetMsgHandler.java | 3 +- .../client/handlers/MerchantMsgHandler.java | 3 +- .../handlers/MineWindowChangeHandler.java | 3 +- .../handlers/MinionTrainingMsgHandler.java | 3 +- .../client/handlers/ModifyStatMsgHandler.java | 3 +- .../client/handlers/MoveToPointHandler.java | 3 +- .../handlers/ObjectActionMsgHandler.java | 3 +- .../OpenFriendsCondemnListMsgHandler.java | 3 +- .../client/handlers/OrderNPCMsgHandler.java | 3 +- .../handlers/PerformActionMsgHandler.java | 3 +- .../client/handlers/PetAttackMsgHandler.java | 3 +- .../net/client/handlers/PetCmdMsgHandler.java | 3 +- .../handlers/PetitionReceivedMsgHandler.java | 3 +- .../client/handlers/PlaceAssetMsgHandler.java | 3 +- .../handlers/PromptRecallMsgHandler.java | 3 +- .../net/client/handlers/RandomMsgHandler.java | 3 +- .../handlers/RecommendNationMsgHandler.java | 3 +- .../handlers/RecvSummonsMsgHandler.java | 3 +- .../net/client/handlers/RefineMsgHandler.java | 3 +- .../handlers/RefinerScreenMsgHandler.java | 3 +- .../client/handlers/RemoveFriendHandler.java | 3 +- .../handlers/RemoveFromGroupHandler.java | 3 +- .../handlers/RepairBuildingMsgHandler.java | 3 +- .../net/client/handlers/RepairMsgHandler.java | 3 +- .../handlers/RequestBallListHandler.java | 3 +- .../handlers/RequestEnterWorldHandler.java | 3 +- .../handlers/RequestGuildListHandler.java | 3 +- .../client/handlers/RespawnMsgHandler.java | 3 +- .../client/handlers/SendBallEntryHandler.java | 3 +- .../handlers/SendSummonsMsgHandler.java | 3 +- .../client/handlers/ServerInfoMsgHandler.java | 3 +- .../handlers/SetCombatModeMsgHandler.java | 3 +- .../net/client/handlers/ShowMsgHandler.java | 3 +- .../net/client/handlers/SocialMsgHandler.java | 3 +- .../net/client/handlers/StuckMsgHandler.java | 3 +- .../client/handlers/SwearInGuildHandler.java | 3 +- .../net/client/handlers/SwearInHandler.java | 3 +- .../handlers/TargetObjectMsgHandler.java | 3 +- .../client/handlers/TaxCityMsgHandler.java | 3 +- .../handlers/TaxResourcesMsgHandler.java | 3 +- .../handlers/ToggleCombatMsgHandler.java | 3 +- .../handlers/ToggleGroupSplitHandler.java | 3 +- .../ToggleLfgRecruitingMsgHandler.java | 3 +- .../handlers/ToggleSitStandMsgHandler.java | 3 +- .../handlers/TrackWindowMsgHandler.java | 3 +- .../handlers/TradeRequestMsgHandler.java | 3 +- .../net/client/handlers/TrainMsgHandler.java | 3 +- .../handlers/TrainerInfoMsgHandler.java | 3 +- .../handlers/TransferAssetMsgHandler.java | 3 +- .../TransferGoldToFromBuildingMsgHandler.java | 3 +- .../TransferItemFromBankMsgHandler.java | 3 +- ...ansferItemFromEquipToInventoryHandler.java | 3 +- ...ansferItemFromInventoryToEquipHandler.java | 3 +- .../TransferItemToBankMsgHandler.java | 3 +- .../handlers/UncommitToTradeMsgHandler.java | 3 +- .../handlers/UpdateFriendStatusHandler.java | 3 +- .../handlers/UpdateStateMsgHandler.java | 3 +- .../handlers/UpgradeAssetMsgHandler.java | 3 +- .../client/handlers/UseCharterMsgHandler.java | 3 +- .../client/handlers/VendorBuyMsgHandler.java | 3 +- .../handlers/VendorBuyWindowMsgHandler.java | 3 +- .../handlers/VendorDialogMsgHandler.java | 5 ++- .../client/handlers/VendorSellMsgHandler.java | 3 +- .../handlers/VendorSellWindowMsgHandler.java | 3 +- .../handlers/VersionInfoMsgHandler.java | 3 +- .../handlers/ViewResourcesMsgHandler.java | 3 +- .../client/handlers/WhoRequestMsgHandler.java | 3 +- src/engine/objects/PlayerCharacter.java | 3 +- .../effectmodifiers/HealthEffectModifier.java | 2 +- src/engine/server/world/WorldServer.java | 3 +- 153 files changed, 156 insertions(+), 339 deletions(-) delete mode 100644 src/engine/exception/MsgSendException.java diff --git a/src/engine/exception/MsgSendException.java b/src/engine/exception/MsgSendException.java deleted file mode 100644 index f789402f..00000000 --- a/src/engine/exception/MsgSendException.java +++ /dev/null @@ -1,31 +0,0 @@ -// • ▌ ▄ ·. ▄▄▄· ▄▄ • ▪ ▄▄· ▄▄▄▄· ▄▄▄· ▐▄▄▄ ▄▄▄ . -// ·██ ▐███▪▐█ ▀█ ▐█ ▀ ▪██ ▐█ ▌▪▐█ ▀█▪▐█ ▀█ •█▌ ▐█▐▌· -// ▐█ ▌▐▌▐█·▄█▀▀█ ▄█ ▀█▄▐█·██ ▄▄▐█▀▀█▄▄█▀▀█ ▐█▐ ▐▌▐▀▀▀ -// ██ ██▌▐█▌▐█ ▪▐▌▐█▄▪▐█▐█▌▐███▌██▄▪▐█▐█ ▪▐▌██▐ █▌▐█▄▄▌ -// ▀▀ █▪▀▀▀ ▀ ▀ ·▀▀▀▀ ▀▀▀·▀▀▀ ·▀▀▀▀ ▀ ▀ ▀▀ █▪ ▀▀▀ -// Magicbane Emulator Project © 2013 - 2022 -// www.magicbane.com - - -package engine.exception; - -public class MsgSendException extends MBServerException { - private static final long serialVersionUID = 6927044139998382254L; - - public MsgSendException() { - super(); - } - - public MsgSendException(String arg0, Throwable arg1) { - super(arg0, arg1); - } - - public MsgSendException(String arg0) { - super(arg0); - } - - public MsgSendException(Throwable arg0) { - super(arg0); - } - -} diff --git a/src/engine/gameManager/GroupManager.java b/src/engine/gameManager/GroupManager.java index b59e2606..8911e3c0 100644 --- a/src/engine/gameManager/GroupManager.java +++ b/src/engine/gameManager/GroupManager.java @@ -8,7 +8,6 @@ package engine.gameManager; -import engine.exception.MsgSendException; import engine.mbEnums; import engine.net.Dispatch; import engine.net.client.ClientConnection; @@ -45,12 +44,12 @@ public enum GroupManager { } - public static void LeaveGroup(ClientConnection origin) throws MsgSendException { + public static void LeaveGroup(ClientConnection origin) { PlayerCharacter source = SessionManager.getPlayerCharacter(origin); LeaveGroup(source); } - public static void LeaveGroup(PlayerCharacter source) throws MsgSendException { + public static void LeaveGroup(PlayerCharacter source) { if (source == null) return; diff --git a/src/engine/gameManager/MovementManager.java b/src/engine/gameManager/MovementManager.java index 2549a927..4363a3d5 100644 --- a/src/engine/gameManager/MovementManager.java +++ b/src/engine/gameManager/MovementManager.java @@ -9,7 +9,6 @@ package engine.gameManager; import engine.InterestManagement.InterestManager; -import engine.exception.MsgSendException; import engine.math.Bounds; import engine.math.Vector3f; import engine.math.Vector3fImmutable; @@ -60,7 +59,7 @@ public enum MovementManager { * target upon each move, unless something has set the firstHitCombatTarget * Also used to determine the size of a monster's hitbox */ - public static void movement(MoveToPointMsg msg, AbstractCharacter toMove) throws MsgSendException { + public static void movement(MoveToPointMsg msg, AbstractCharacter toMove) { // check for stun/root if (!toMove.isAlive()) @@ -348,7 +347,7 @@ public enum MovementManager { // Handle formation movement in group - public static void moveGroup(PlayerCharacter pc, ClientConnection origin, MoveToPointMsg msg) throws MsgSendException { + public static void moveGroup(PlayerCharacter pc, ClientConnection origin, MoveToPointMsg msg) { // get forward vector Vector3f faceDir = new Vector3f(pc.getFaceDir().x, 0, pc.getFaceDir().z).normalize(); // get perpendicular vector diff --git a/src/engine/mobileAI/utilities/MovementUtilities.java b/src/engine/mobileAI/utilities/MovementUtilities.java index 4a48bae1..5fd1b57e 100644 --- a/src/engine/mobileAI/utilities/MovementUtilities.java +++ b/src/engine/mobileAI/utilities/MovementUtilities.java @@ -9,7 +9,6 @@ package engine.mobileAI.utilities; -import engine.exception.MsgSendException; import engine.gameManager.MovementManager; import engine.math.Vector3fImmutable; import engine.mbEnums; @@ -253,7 +252,7 @@ public class MovementUtilities { try { MovementManager.movement(msg, agent); - } catch (MsgSendException e) { + } catch (Exception e) { // TODO Figure out how we want to handle the msg send exception e.printStackTrace(); } diff --git a/src/engine/net/client/handlers/AbandonAssetMsgHandler.java b/src/engine/net/client/handlers/AbandonAssetMsgHandler.java index 00010919..6281fce3 100644 --- a/src/engine/net/client/handlers/AbandonAssetMsgHandler.java +++ b/src/engine/net/client/handlers/AbandonAssetMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.mbEnums; import engine.mbEnums.BuildingGroup; @@ -48,7 +47,7 @@ public class AbandonAssetMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration PlayerCharacter player; diff --git a/src/engine/net/client/handlers/AbstractChatMsgHandler.java b/src/engine/net/client/handlers/AbstractChatMsgHandler.java index 6dbfcd5f..b23f8f13 100644 --- a/src/engine/net/client/handlers/AbstractChatMsgHandler.java +++ b/src/engine/net/client/handlers/AbstractChatMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.net.Protocol; import engine.net.client.ClientConnection; @@ -26,7 +25,7 @@ public class AbstractChatMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/AbstractClientMsgHandler.java b/src/engine/net/client/handlers/AbstractClientMsgHandler.java index 3af94513..e60ee9af 100644 --- a/src/engine/net/client/handlers/AbstractClientMsgHandler.java +++ b/src/engine/net/client/handlers/AbstractClientMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; @@ -20,7 +19,7 @@ public abstract class AbstractClientMsgHandler { try { executionSucceded = _handleNetMsg(msg, (ClientConnection) msg.getOrigin()); - } catch (MsgSendException e) { + } catch (Exception e) { e.printStackTrace(); executionSucceded = false; } @@ -28,5 +27,5 @@ public abstract class AbstractClientMsgHandler { return executionSucceded; } - protected abstract boolean _handleNetMsg(ClientNetMsg msg, ClientConnection origin) throws MsgSendException; + protected abstract boolean _handleNetMsg(ClientNetMsg msg, ClientConnection origin); } diff --git a/src/engine/net/client/handlers/AcceptInviteToGuildHandler.java b/src/engine/net/client/handlers/AcceptInviteToGuildHandler.java index 4e470f03..03a36a34 100644 --- a/src/engine/net/client/handlers/AcceptInviteToGuildHandler.java +++ b/src/engine/net/client/handlers/AcceptInviteToGuildHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.mbEnums; import engine.mbEnums.GameObjectType; @@ -32,7 +31,7 @@ public class AcceptInviteToGuildHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player; AcceptInviteToGuildMsg msg; diff --git a/src/engine/net/client/handlers/AcceptSubInviteHandler.java b/src/engine/net/client/handlers/AcceptSubInviteHandler.java index 6d3d884d..b6f1cbbf 100644 --- a/src/engine/net/client/handlers/AcceptSubInviteHandler.java +++ b/src/engine/net/client/handlers/AcceptSubInviteHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DbManager; import engine.gameManager.DispatchManager; @@ -35,7 +34,7 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { AcceptSubInviteMsg msg = (AcceptSubInviteMsg) baseMsg; PlayerCharacter sourcePlayer; diff --git a/src/engine/net/client/handlers/AcceptTradeRequestMsgHandler.java b/src/engine/net/client/handlers/AcceptTradeRequestMsgHandler.java index 656aa5d2..0ae2d5b6 100644 --- a/src/engine/net/client/handlers/AcceptTradeRequestMsgHandler.java +++ b/src/engine/net/client/handlers/AcceptTradeRequestMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums; import engine.net.Dispatch; @@ -32,7 +31,7 @@ public class AcceptTradeRequestMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/ActivateNPCMsgHandler.java b/src/engine/net/client/handlers/ActivateNPCMsgHandler.java index 31aa5ccc..98c43677 100644 --- a/src/engine/net/client/handlers/ActivateNPCMsgHandler.java +++ b/src/engine/net/client/handlers/ActivateNPCMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.mbEnums; import engine.mbEnums.ItemType; @@ -26,7 +25,7 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { ActivateNPCMessage msg; PlayerCharacter player; diff --git a/src/engine/net/client/handlers/AddGoldToTradeWindowMsgHandler.java b/src/engine/net/client/handlers/AddGoldToTradeWindowMsgHandler.java index 1b7247e2..0d876bf0 100644 --- a/src/engine/net/client/handlers/AddGoldToTradeWindowMsgHandler.java +++ b/src/engine/net/client/handlers/AddGoldToTradeWindowMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums; import engine.net.Dispatch; @@ -31,7 +30,7 @@ public class AddGoldToTradeWindowMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter source = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/AddItemToTradeWindowMsgHandler.java b/src/engine/net/client/handlers/AddItemToTradeWindowMsgHandler.java index 67ea08b1..8c011387 100644 --- a/src/engine/net/client/handlers/AddItemToTradeWindowMsgHandler.java +++ b/src/engine/net/client/handlers/AddItemToTradeWindowMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums; import engine.net.Dispatch; @@ -29,7 +28,7 @@ public class AddItemToTradeWindowMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/AllianceChangeMsgHandler.java b/src/engine/net/client/handlers/AllianceChangeMsgHandler.java index 8ebc0eef..d0e51436 100644 --- a/src/engine/net/client/handlers/AllianceChangeMsgHandler.java +++ b/src/engine/net/client/handlers/AllianceChangeMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; import engine.mbEnums; @@ -97,7 +96,7 @@ public class AllianceChangeMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/AllyEnemyListMsgHandler.java b/src/engine/net/client/handlers/AllyEnemyListMsgHandler.java index 96438f27..7400c1f9 100644 --- a/src/engine/net/client/handlers/AllyEnemyListMsgHandler.java +++ b/src/engine/net/client/handlers/AllyEnemyListMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; import engine.mbEnums; @@ -46,7 +45,7 @@ public class AllyEnemyListMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/AppointGroupLeaderHandler.java b/src/engine/net/client/handlers/AppointGroupLeaderHandler.java index 53a3ceb8..e0173717 100644 --- a/src/engine/net/client/handlers/AppointGroupLeaderHandler.java +++ b/src/engine/net/client/handlers/AppointGroupLeaderHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DispatchManager; import engine.gameManager.GroupManager; @@ -30,7 +29,7 @@ public class AppointGroupLeaderHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { AppointGroupLeaderMsg msg = (AppointGroupLeaderMsg) baseMsg; PlayerCharacter source = SessionManager.getPlayerCharacter(origin); diff --git a/src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java b/src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java index 83729365..dc2842c3 100644 --- a/src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java +++ b/src/engine/net/client/handlers/ArcLoginNotifyMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.job.JobScheduler; import engine.mbEnums; @@ -25,7 +24,7 @@ public class ArcLoginNotifyMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player = SessionManager.getPlayerCharacter(origin); diff --git a/src/engine/net/client/handlers/ArcMineChangeProductionMsgHandler.java b/src/engine/net/client/handlers/ArcMineChangeProductionMsgHandler.java index cfcd644a..a232593d 100644 --- a/src/engine/net/client/handlers/ArcMineChangeProductionMsgHandler.java +++ b/src/engine/net/client/handlers/ArcMineChangeProductionMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums; import engine.mbEnums.DispatchChannel; @@ -25,7 +24,7 @@ public class ArcMineChangeProductionMsgHandler extends AbstractClientMsgHandler } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); ArcMineChangeProductionMsg changeProductionMsg = (ArcMineChangeProductionMsg) baseMsg; diff --git a/src/engine/net/client/handlers/ArcMineWindowAvailableTimeHandler.java b/src/engine/net/client/handlers/ArcMineWindowAvailableTimeHandler.java index 65ad65a9..dfdd441b 100644 --- a/src/engine/net/client/handlers/ArcMineWindowAvailableTimeHandler.java +++ b/src/engine/net/client/handlers/ArcMineWindowAvailableTimeHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.DispatchManager; import engine.mbEnums; @@ -27,7 +26,7 @@ public class ArcMineWindowAvailableTimeHandler extends AbstractClientMsgHandler } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { ArcMineWindowAvailableTimeMsg msg = (ArcMineWindowAvailableTimeMsg) baseMsg; PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/ArcOwnedMinesListHandler.java b/src/engine/net/client/handlers/ArcOwnedMinesListHandler.java index e79fcfec..966641e0 100644 --- a/src/engine/net/client/handlers/ArcOwnedMinesListHandler.java +++ b/src/engine/net/client/handlers/ArcOwnedMinesListHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums.DispatchChannel; import engine.net.Dispatch; @@ -24,7 +23,7 @@ public class ArcOwnedMinesListHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); ArcOwnedMinesListMsg msg = (ArcOwnedMinesListMsg) baseMsg; diff --git a/src/engine/net/client/handlers/ArcSiegeSpireMsgHandler.java b/src/engine/net/client/handlers/ArcSiegeSpireMsgHandler.java index d47ff138..ee4335ff 100644 --- a/src/engine/net/client/handlers/ArcSiegeSpireMsgHandler.java +++ b/src/engine/net/client/handlers/ArcSiegeSpireMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DbManager; import engine.gameManager.SessionManager; import engine.mbEnums.GameObjectType; @@ -26,7 +25,7 @@ public class ArcSiegeSpireMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player; Building spire; diff --git a/src/engine/net/client/handlers/ArcViewAssetTransactionsMsgHandler.java b/src/engine/net/client/handlers/ArcViewAssetTransactionsMsgHandler.java index 764df4cc..452dbc1f 100644 --- a/src/engine/net/client/handlers/ArcViewAssetTransactionsMsgHandler.java +++ b/src/engine/net/client/handlers/ArcViewAssetTransactionsMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; @@ -27,7 +26,7 @@ public class ArcViewAssetTransactionsMsgHandler extends AbstractClientMsgHandler } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player; ArcViewAssetTransactionsMsg msg; diff --git a/src/engine/net/client/handlers/AssetSupportMsgHandler.java b/src/engine/net/client/handlers/AssetSupportMsgHandler.java index 20d79ce7..36d87dee 100644 --- a/src/engine/net/client/handlers/AssetSupportMsgHandler.java +++ b/src/engine/net/client/handlers/AssetSupportMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.DispatchManager; import engine.gameManager.NPCManager; @@ -123,7 +122,7 @@ public class AssetSupportMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/AttackCmdMsgHandler.java b/src/engine/net/client/handlers/AttackCmdMsgHandler.java index 2fec2344..9aa79684 100644 --- a/src/engine/net/client/handlers/AttackCmdMsgHandler.java +++ b/src/engine/net/client/handlers/AttackCmdMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.CombatManager; import engine.mbEnums; @@ -26,7 +25,7 @@ public class AttackCmdMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/BanishUnbanishHandler.java b/src/engine/net/client/handlers/BanishUnbanishHandler.java index a0d0d2da..649a995e 100644 --- a/src/engine/net/client/handlers/BanishUnbanishHandler.java +++ b/src/engine/net/client/handlers/BanishUnbanishHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DbManager; import engine.gameManager.DispatchManager; @@ -35,7 +34,7 @@ public class BanishUnbanishHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { BanishUnbanishMsg msg = (BanishUnbanishMsg) baseMsg; Dispatch dispatch; diff --git a/src/engine/net/client/handlers/BreakFealtyHandler.java b/src/engine/net/client/handlers/BreakFealtyHandler.java index cc78e6b3..ce83e9f4 100644 --- a/src/engine/net/client/handlers/BreakFealtyHandler.java +++ b/src/engine/net/client/handlers/BreakFealtyHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.mbEnums; import engine.mbEnums.GameObjectType; @@ -32,7 +31,7 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { BreakFealtyMsg bfm; PlayerCharacter player; diff --git a/src/engine/net/client/handlers/ChangeAltitudeHandler.java b/src/engine/net/client/handlers/ChangeAltitudeHandler.java index f026373a..2be34d3a 100644 --- a/src/engine/net/client/handlers/ChangeAltitudeHandler.java +++ b/src/engine/net/client/handlers/ChangeAltitudeHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums.DispatchChannel; import engine.net.client.ClientConnection; @@ -30,7 +29,7 @@ public class ChangeAltitudeHandler extends AbstractClientMsgHandler { @Override protected boolean _handleNetMsg(ClientNetMsg baseMsg, - ClientConnection origin) throws MsgSendException { + ClientConnection origin) { ChangeAltitudeMsg msg = (ChangeAltitudeMsg) baseMsg; diff --git a/src/engine/net/client/handlers/ChangeGuildLeaderHandler.java b/src/engine/net/client/handlers/ChangeGuildLeaderHandler.java index 72895909..1dfbeffb 100644 --- a/src/engine/net/client/handlers/ChangeGuildLeaderHandler.java +++ b/src/engine/net/client/handlers/ChangeGuildLeaderHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DbManager; import engine.gameManager.DispatchManager; @@ -33,7 +32,7 @@ public class ChangeGuildLeaderHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { ChangeGuildLeaderMsg msg; PlayerCharacter sourcePlayer; diff --git a/src/engine/net/client/handlers/ChangeRankHandler.java b/src/engine/net/client/handlers/ChangeRankHandler.java index c4134804..5b53e654 100644 --- a/src/engine/net/client/handlers/ChangeRankHandler.java +++ b/src/engine/net/client/handlers/ChangeRankHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DbManager; import engine.gameManager.DispatchManager; @@ -32,7 +31,7 @@ public class ChangeRankHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { ChangeRankMsg msg; PlayerCharacter sourcePlayer; diff --git a/src/engine/net/client/handlers/ChannelMuteMsgHandler.java b/src/engine/net/client/handlers/ChannelMuteMsgHandler.java index 93a509b8..f889ba1a 100644 --- a/src/engine/net/client/handlers/ChannelMuteMsgHandler.java +++ b/src/engine/net/client/handlers/ChannelMuteMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DbManager; import engine.gameManager.GuildManager; @@ -41,7 +40,7 @@ public class ChannelMuteMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { return true; } diff --git a/src/engine/net/client/handlers/CityChoiceMsgHandler.java b/src/engine/net/client/handlers/CityChoiceMsgHandler.java index 6790caf6..284b6e2e 100644 --- a/src/engine/net/client/handlers/CityChoiceMsgHandler.java +++ b/src/engine/net/client/handlers/CityChoiceMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.GuildManager; import engine.mbEnums; @@ -27,7 +26,7 @@ public class CityChoiceMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); Dispatch dispatch; diff --git a/src/engine/net/client/handlers/CityDataHandler.java b/src/engine/net/client/handlers/CityDataHandler.java index 9d4419d7..e175910a 100644 --- a/src/engine/net/client/handlers/CityDataHandler.java +++ b/src/engine/net/client/handlers/CityDataHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; import engine.gameManager.ZoneManager; @@ -29,7 +28,7 @@ public class CityDataHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { boolean updateCities = false; Session playerSession; diff --git a/src/engine/net/client/handlers/ClaimAssetMsgHandler.java b/src/engine/net/client/handlers/ClaimAssetMsgHandler.java index 94ac6999..7ab2f3e0 100644 --- a/src/engine/net/client/handlers/ClaimAssetMsgHandler.java +++ b/src/engine/net/client/handlers/ClaimAssetMsgHandler.java @@ -11,7 +11,6 @@ package engine.net.client.handlers; import engine.db.archive.CityRecord; import engine.db.archive.DataWarehouse; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.mbEnums; import engine.mbEnums.BuildingGroup; @@ -44,7 +43,7 @@ public class ClaimAssetMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration this.claimLock.writeLock().lock(); diff --git a/src/engine/net/client/handlers/ClaimGuildTreeMsgHandler.java b/src/engine/net/client/handlers/ClaimGuildTreeMsgHandler.java index 6073e0a3..b3dfebe7 100644 --- a/src/engine/net/client/handlers/ClaimGuildTreeMsgHandler.java +++ b/src/engine/net/client/handlers/ClaimGuildTreeMsgHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.ChatManager; import engine.gameManager.DispatchManager; @@ -44,7 +43,7 @@ public class ClaimGuildTreeMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration this.claimLock.writeLock().lock(); diff --git a/src/engine/net/client/handlers/ClientAdminCommandMsgHandler.java b/src/engine/net/client/handlers/ClientAdminCommandMsgHandler.java index 5c62e843..d9e27220 100644 --- a/src/engine/net/client/handlers/ClientAdminCommandMsgHandler.java +++ b/src/engine/net/client/handlers/ClientAdminCommandMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DevCmdManager; import engine.gameManager.SessionManager; import engine.mbEnums; @@ -58,7 +57,7 @@ public class ClientAdminCommandMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/ClientLoginInfoMsgHandler.java b/src/engine/net/client/handlers/ClientLoginInfoMsgHandler.java index da26e4c4..0a6a1ecd 100644 --- a/src/engine/net/client/handlers/ClientLoginInfoMsgHandler.java +++ b/src/engine/net/client/handlers/ClientLoginInfoMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ConfigManager; import engine.gameManager.DbManager; import engine.gameManager.SessionManager; @@ -30,7 +29,7 @@ public class ClientLoginInfoMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/CloseTradeWindowMsgHandler.java b/src/engine/net/client/handlers/CloseTradeWindowMsgHandler.java index 9027f52e..08b2a873 100644 --- a/src/engine/net/client/handlers/CloseTradeWindowMsgHandler.java +++ b/src/engine/net/client/handlers/CloseTradeWindowMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums; import engine.net.Dispatch; @@ -25,7 +24,7 @@ public class CloseTradeWindowMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter source = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/CommitNewCharacterMsgHandler.java b/src/engine/net/client/handlers/CommitNewCharacterMsgHandler.java index 319025b9..c99a4366 100644 --- a/src/engine/net/client/handlers/CommitNewCharacterMsgHandler.java +++ b/src/engine/net/client/handlers/CommitNewCharacterMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.SessionManager; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; @@ -25,7 +24,7 @@ public class CommitNewCharacterMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { if (origin.getAccount() == null) return true; diff --git a/src/engine/net/client/handlers/CommitToTradeMsgHandler.java b/src/engine/net/client/handlers/CommitToTradeMsgHandler.java index fa38e74a..851410f6 100644 --- a/src/engine/net/client/handlers/CommitToTradeMsgHandler.java +++ b/src/engine/net/client/handlers/CommitToTradeMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.CloseTradeWindowMsg; @@ -25,7 +24,7 @@ public class CommitToTradeMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter source = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/DeleteCharacterMsgHandler.java b/src/engine/net/client/handlers/DeleteCharacterMsgHandler.java index 0dad25c3..087d6ecf 100644 --- a/src/engine/net/client/handlers/DeleteCharacterMsgHandler.java +++ b/src/engine/net/client/handlers/DeleteCharacterMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.SessionManager; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; @@ -27,7 +26,7 @@ public class DeleteCharacterMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/DeleteItemMsgHandler.java b/src/engine/net/client/handlers/DeleteItemMsgHandler.java index c2c0fabc..c6216c1b 100644 --- a/src/engine/net/client/handlers/DeleteItemMsgHandler.java +++ b/src/engine/net/client/handlers/DeleteItemMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums.DispatchChannel; import engine.net.Dispatch; @@ -26,7 +25,7 @@ public class DeleteItemMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/DestroyBuildingHandler.java b/src/engine/net/client/handlers/DestroyBuildingHandler.java index dc42d6cb..5fa1be62 100644 --- a/src/engine/net/client/handlers/DestroyBuildingHandler.java +++ b/src/engine/net/client/handlers/DestroyBuildingHandler.java @@ -1,7 +1,6 @@ package engine.net.client.handlers; import engine.InterestManagement.WorldGrid; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.mbEnums; import engine.mbEnums.BuildingGroup; @@ -24,7 +23,7 @@ public class DestroyBuildingHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter pc = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/DisbandGroupHandler.java b/src/engine/net/client/handlers/DisbandGroupHandler.java index bc589418..71bb3706 100644 --- a/src/engine/net/client/handlers/DisbandGroupHandler.java +++ b/src/engine/net/client/handlers/DisbandGroupHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.GroupManager; import engine.gameManager.SessionManager; import engine.net.client.ClientConnection; @@ -25,7 +24,7 @@ public class DisbandGroupHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter source = SessionManager.getPlayerCharacter(origin); if (source == null) { diff --git a/src/engine/net/client/handlers/DisbandGuildHandler.java b/src/engine/net/client/handlers/DisbandGuildHandler.java index 890c6e7e..a321b105 100644 --- a/src/engine/net/client/handlers/DisbandGuildHandler.java +++ b/src/engine/net/client/handlers/DisbandGuildHandler.java @@ -12,7 +12,6 @@ package engine.net.client.handlers; import engine.InterestManagement.WorldGrid; import engine.db.archive.DataWarehouse; import engine.db.archive.GuildRecord; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DbManager; import engine.gameManager.DispatchManager; @@ -36,7 +35,7 @@ public class DisbandGuildHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player; Guild guild; diff --git a/src/engine/net/client/handlers/DismissGuildHandler.java b/src/engine/net/client/handlers/DismissGuildHandler.java index 889cf161..05bca998 100644 --- a/src/engine/net/client/handlers/DismissGuildHandler.java +++ b/src/engine/net/client/handlers/DismissGuildHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.mbEnums; import engine.mbEnums.GameObjectType; @@ -32,7 +31,7 @@ public class DismissGuildHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { DismissGuildMsg dismissMsg; PlayerCharacter player; diff --git a/src/engine/net/client/handlers/DoorTryOpenMsgHandler.java b/src/engine/net/client/handlers/DoorTryOpenMsgHandler.java index 8792cad9..fe2eb0bc 100644 --- a/src/engine/net/client/handlers/DoorTryOpenMsgHandler.java +++ b/src/engine/net/client/handlers/DoorTryOpenMsgHandler.java @@ -1,7 +1,6 @@ package engine.net.client.handlers; import engine.InterestManagement.WorldGrid; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.DispatchManager; import engine.mbEnums; @@ -32,7 +31,7 @@ public class DoorTryOpenMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/FormationFollowHandler.java b/src/engine/net/client/handlers/FormationFollowHandler.java index 263420a3..223ef54c 100644 --- a/src/engine/net/client/handlers/FormationFollowHandler.java +++ b/src/engine/net/client/handlers/FormationFollowHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.GroupManager; import engine.gameManager.SessionManager; @@ -27,8 +26,7 @@ public class FormationFollowHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) - throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { FormationFollowMsg msg = (FormationFollowMsg) baseMsg; PlayerCharacter source = SessionManager.getPlayerCharacter(origin); diff --git a/src/engine/net/client/handlers/FriendAcceptHandler.java b/src/engine/net/client/handlers/FriendAcceptHandler.java index 9bdac146..3912cf88 100644 --- a/src/engine/net/client/handlers/FriendAcceptHandler.java +++ b/src/engine/net/client/handlers/FriendAcceptHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; @@ -57,7 +56,7 @@ public class FriendAcceptHandler extends AbstractClientMsgHandler { @Override protected boolean _handleNetMsg(ClientNetMsg baseMsg, - ClientConnection origin) throws MsgSendException { + ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/FriendDeclineHandler.java b/src/engine/net/client/handlers/FriendDeclineHandler.java index 82ebb7d2..41f33c2b 100644 --- a/src/engine/net/client/handlers/FriendDeclineHandler.java +++ b/src/engine/net/client/handlers/FriendDeclineHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; import engine.mbEnums.DispatchChannel; @@ -42,7 +41,7 @@ public class FriendDeclineHandler extends AbstractClientMsgHandler { @Override protected boolean _handleNetMsg(ClientNetMsg baseMsg, - ClientConnection origin) throws MsgSendException { + ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/FriendRequestHandler.java b/src/engine/net/client/handlers/FriendRequestHandler.java index a671fbd6..1856ba63 100644 --- a/src/engine/net/client/handlers/FriendRequestHandler.java +++ b/src/engine/net/client/handlers/FriendRequestHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; @@ -47,7 +46,7 @@ public class FriendRequestHandler extends AbstractClientMsgHandler { @Override protected boolean _handleNetMsg(ClientNetMsg baseMsg, - ClientConnection origin) throws MsgSendException { + ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/FurnitureHandler.java b/src/engine/net/client/handlers/FurnitureHandler.java index 4c3f73ce..048835c7 100644 --- a/src/engine/net/client/handlers/FurnitureHandler.java +++ b/src/engine/net/client/handlers/FurnitureHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums.DispatchChannel; import engine.net.Dispatch; @@ -26,7 +25,7 @@ public class FurnitureHandler extends AbstractClientMsgHandler { @Override protected boolean _handleNetMsg(ClientNetMsg baseMsg, - ClientConnection origin) throws MsgSendException { + ClientConnection origin) { FurnitureMsg msg = (FurnitureMsg) baseMsg; diff --git a/src/engine/net/client/handlers/GameServerIPRequestMsgHandler.java b/src/engine/net/client/handlers/GameServerIPRequestMsgHandler.java index ce8f4796..26c800ea 100644 --- a/src/engine/net/client/handlers/GameServerIPRequestMsgHandler.java +++ b/src/engine/net/client/handlers/GameServerIPRequestMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.SessionManager; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; @@ -30,7 +29,7 @@ public class GameServerIPRequestMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { Session session = SessionManager.getSession(origin); diff --git a/src/engine/net/client/handlers/GoldFromVaultMsgHandler.java b/src/engine/net/client/handlers/GoldFromVaultMsgHandler.java index 5a12150f..79b27839 100644 --- a/src/engine/net/client/handlers/GoldFromVaultMsgHandler.java +++ b/src/engine/net/client/handlers/GoldFromVaultMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.GoldFromVaultMsg; @@ -22,7 +21,7 @@ public class GoldFromVaultMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/GoldToVaultMsgHandler.java b/src/engine/net/client/handlers/GoldToVaultMsgHandler.java index caef99df..def28fba 100644 --- a/src/engine/net/client/handlers/GoldToVaultMsgHandler.java +++ b/src/engine/net/client/handlers/GoldToVaultMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.GoldToVaultMsg; @@ -22,7 +21,7 @@ public class GoldToVaultMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/GroupInviteHandler.java b/src/engine/net/client/handlers/GroupInviteHandler.java index 4e79b6c7..a6936209 100644 --- a/src/engine/net/client/handlers/GroupInviteHandler.java +++ b/src/engine/net/client/handlers/GroupInviteHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ConfigManager; import engine.gameManager.DispatchManager; import engine.gameManager.GroupManager; @@ -60,7 +59,7 @@ public class GroupInviteHandler extends AbstractClientMsgHandler { @Override protected boolean _handleNetMsg(ClientNetMsg baseMsg, - ClientConnection origin) throws MsgSendException { + ClientConnection origin) { GroupInviteMsg msg = (GroupInviteMsg) baseMsg; PlayerCharacter source = SessionManager.getPlayerCharacter(origin); diff --git a/src/engine/net/client/handlers/GroupInviteResponseHandler.java b/src/engine/net/client/handlers/GroupInviteResponseHandler.java index 321f0686..13875bf4 100644 --- a/src/engine/net/client/handlers/GroupInviteResponseHandler.java +++ b/src/engine/net/client/handlers/GroupInviteResponseHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DispatchManager; import engine.gameManager.GroupManager; @@ -34,7 +33,7 @@ public class GroupInviteResponseHandler extends AbstractClientMsgHandler { @Override protected boolean _handleNetMsg(ClientNetMsg baseMsg, - ClientConnection origin) throws MsgSendException { + ClientConnection origin) { GroupInviteResponseMsg msg = (GroupInviteResponseMsg) baseMsg; diff --git a/src/engine/net/client/handlers/GroupUpdateHandler.java b/src/engine/net/client/handlers/GroupUpdateHandler.java index f3593b19..c37ee021 100644 --- a/src/engine/net/client/handlers/GroupUpdateHandler.java +++ b/src/engine/net/client/handlers/GroupUpdateHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; @@ -21,7 +20,7 @@ public class GroupUpdateHandler extends AbstractClientMsgHandler { @Override protected boolean _handleNetMsg(ClientNetMsg baseMsg, - ClientConnection origin) throws MsgSendException { + ClientConnection origin) { //GroupUpdateMsg msg = (GroupUpdateMsg) baseMsg; // not sure what to do with these as we spend our time sending them diff --git a/src/engine/net/client/handlers/GuildControlHandler.java b/src/engine/net/client/handlers/GuildControlHandler.java index e5d88fd0..d36af18b 100644 --- a/src/engine/net/client/handlers/GuildControlHandler.java +++ b/src/engine/net/client/handlers/GuildControlHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; import engine.mbEnums; @@ -31,7 +30,7 @@ public class GuildControlHandler extends AbstractClientMsgHandler { // TODO Don't think this protocolMsg (0x3235E5EA) is actually player history. so // take further look at it. @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { GuildControlMsg msg = (GuildControlMsg) baseMsg; Dispatch dispatch; diff --git a/src/engine/net/client/handlers/GuildCreationCloseHandler.java b/src/engine/net/client/handlers/GuildCreationCloseHandler.java index 955ddb06..1be1145a 100644 --- a/src/engine/net/client/handlers/GuildCreationCloseHandler.java +++ b/src/engine/net/client/handlers/GuildCreationCloseHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; @@ -20,7 +19,7 @@ public class GuildCreationCloseHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // GuildCreationCloseMsg msg = (GuildCreationCloseMsg) baseMsg; // origin.sendMsg(msg); return true; diff --git a/src/engine/net/client/handlers/GuildCreationFinalizeHandler.java b/src/engine/net/client/handlers/GuildCreationFinalizeHandler.java index cdc035f5..02bc10a3 100644 --- a/src/engine/net/client/handlers/GuildCreationFinalizeHandler.java +++ b/src/engine/net/client/handlers/GuildCreationFinalizeHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.mbEnums; import engine.mbEnums.DispatchChannel; @@ -34,7 +33,7 @@ public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player; GuildCreationFinalizeMsg msg; diff --git a/src/engine/net/client/handlers/GuildCreationOptionsHandler.java b/src/engine/net/client/handlers/GuildCreationOptionsHandler.java index b8ef6e39..3a28f003 100644 --- a/src/engine/net/client/handlers/GuildCreationOptionsHandler.java +++ b/src/engine/net/client/handlers/GuildCreationOptionsHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums; import engine.net.Dispatch; @@ -25,7 +24,7 @@ public class GuildCreationOptionsHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { GuildCreationOptionsMsg msg = (GuildCreationOptionsMsg) baseMsg; PlayerCharacter sourcePlayer = origin.getPlayerCharacter(); Dispatch dispatch; diff --git a/src/engine/net/client/handlers/GuildInfoHandler.java b/src/engine/net/client/handlers/GuildInfoHandler.java index 6ff45f2f..291871ad 100644 --- a/src/engine/net/client/handlers/GuildInfoHandler.java +++ b/src/engine/net/client/handlers/GuildInfoHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; import engine.mbEnums; @@ -27,7 +26,7 @@ public class GuildInfoHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { GuildInfoMsg msg = (GuildInfoMsg) baseMsg; Dispatch dispatch; diff --git a/src/engine/net/client/handlers/GuildListHandler.java b/src/engine/net/client/handlers/GuildListHandler.java index 349d278a..928a21ef 100644 --- a/src/engine/net/client/handlers/GuildListHandler.java +++ b/src/engine/net/client/handlers/GuildListHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; @@ -20,7 +19,7 @@ public class GuildListHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // GuildListMsg msg = (GuildListMsg) baseMsg; // GuildListMsg msg = new GuildListMsg(origin); diff --git a/src/engine/net/client/handlers/GuildTreeStatusMsgHandler.java b/src/engine/net/client/handlers/GuildTreeStatusMsgHandler.java index 6033e7ac..bd2432a9 100644 --- a/src/engine/net/client/handlers/GuildTreeStatusMsgHandler.java +++ b/src/engine/net/client/handlers/GuildTreeStatusMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; @@ -27,7 +26,7 @@ public class GuildTreeStatusMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { GuildTreeStatusMsg msg = (GuildTreeStatusMsg) baseMsg; diff --git a/src/engine/net/client/handlers/GuildUnknownHandler.java b/src/engine/net/client/handlers/GuildUnknownHandler.java index ad0c8051..da473e45 100644 --- a/src/engine/net/client/handlers/GuildUnknownHandler.java +++ b/src/engine/net/client/handlers/GuildUnknownHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; @@ -20,7 +19,7 @@ public class GuildUnknownHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // GuildUnknownMsg msg = (GuildUnknownMsg) baseMsg; return true; } diff --git a/src/engine/net/client/handlers/HirelingServiceMsgHandler.java b/src/engine/net/client/handlers/HirelingServiceMsgHandler.java index d5754395..fe328e9d 100644 --- a/src/engine/net/client/handlers/HirelingServiceMsgHandler.java +++ b/src/engine/net/client/handlers/HirelingServiceMsgHandler.java @@ -10,7 +10,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; @@ -31,7 +30,7 @@ public class HirelingServiceMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player; HirelingServiceMsg msg; diff --git a/src/engine/net/client/handlers/IgnoreMsgHandler.java b/src/engine/net/client/handlers/IgnoreMsgHandler.java index 3b40cbd3..15bc63df 100644 --- a/src/engine/net/client/handlers/IgnoreMsgHandler.java +++ b/src/engine/net/client/handlers/IgnoreMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DbManager; import engine.net.client.ClientConnection; @@ -24,7 +23,7 @@ public class IgnoreMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/InvalidTradeRequestMsgHandler.java b/src/engine/net/client/handlers/InvalidTradeRequestMsgHandler.java index ee8225df..9c99e544 100644 --- a/src/engine/net/client/handlers/InvalidTradeRequestMsgHandler.java +++ b/src/engine/net/client/handlers/InvalidTradeRequestMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums; import engine.net.Dispatch; @@ -24,7 +23,7 @@ public class InvalidTradeRequestMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/InviteToGuildHandler.java b/src/engine/net/client/handlers/InviteToGuildHandler.java index 159439da..dbe5e68b 100644 --- a/src/engine/net/client/handlers/InviteToGuildHandler.java +++ b/src/engine/net/client/handlers/InviteToGuildHandler.java @@ -10,7 +10,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.mbEnums; import engine.mbEnums.GameObjectType; @@ -30,7 +29,7 @@ public class InviteToGuildHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { InviteToGuildMsg msg; PlayerCharacter sourcePlayer; PlayerCharacter targetPlayer; diff --git a/src/engine/net/client/handlers/InviteToSubHandler.java b/src/engine/net/client/handlers/InviteToSubHandler.java index e0340462..65551bb9 100644 --- a/src/engine/net/client/handlers/InviteToSubHandler.java +++ b/src/engine/net/client/handlers/InviteToSubHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.mbEnums; import engine.mbEnums.GameObjectType; @@ -33,7 +32,7 @@ public class InviteToSubHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter source; PlayerCharacter target; diff --git a/src/engine/net/client/handlers/ItemFromVaultMsgHandler.java b/src/engine/net/client/handlers/ItemFromVaultMsgHandler.java index 4fa57ee3..9267a51d 100644 --- a/src/engine/net/client/handlers/ItemFromVaultMsgHandler.java +++ b/src/engine/net/client/handlers/ItemFromVaultMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DispatchManager; import engine.mbEnums; @@ -42,7 +41,7 @@ public class ItemFromVaultMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/ItemProductionMsgHandler.java b/src/engine/net/client/handlers/ItemProductionMsgHandler.java index 8f47f442..f24735f0 100644 --- a/src/engine/net/client/handlers/ItemProductionMsgHandler.java +++ b/src/engine/net/client/handlers/ItemProductionMsgHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.loot.WorkOrder; import engine.mbEnums; @@ -37,7 +36,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/ItemToVaultMsgHandler.java b/src/engine/net/client/handlers/ItemToVaultMsgHandler.java index cd09a2da..29c3bcfe 100644 --- a/src/engine/net/client/handlers/ItemToVaultMsgHandler.java +++ b/src/engine/net/client/handlers/ItemToVaultMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DispatchManager; import engine.mbEnums; @@ -42,7 +41,7 @@ public class ItemToVaultMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { ItemToVaultMsg msg = (ItemToVaultMsg) baseMsg; PlayerCharacter player = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/KeepAliveServerClientHandler.java b/src/engine/net/client/handlers/KeepAliveServerClientHandler.java index b82f7cec..8fdfe3c9 100644 --- a/src/engine/net/client/handlers/KeepAliveServerClientHandler.java +++ b/src/engine/net/client/handlers/KeepAliveServerClientHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums.DispatchChannel; import engine.net.Dispatch; @@ -24,7 +23,7 @@ public class KeepAliveServerClientHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/LeaveGroupHandler.java b/src/engine/net/client/handlers/LeaveGroupHandler.java index 4797a660..b9cd8bde 100644 --- a/src/engine/net/client/handlers/LeaveGroupHandler.java +++ b/src/engine/net/client/handlers/LeaveGroupHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.GroupManager; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; @@ -22,7 +21,7 @@ public class LeaveGroupHandler extends AbstractClientMsgHandler { @Override protected boolean _handleNetMsg(ClientNetMsg baseMsg, - ClientConnection origin) throws MsgSendException { + ClientConnection origin) { GroupManager.LeaveGroup(origin); return true; } diff --git a/src/engine/net/client/handlers/LeaveGuildHandler.java b/src/engine/net/client/handlers/LeaveGuildHandler.java index c1688651..81ec0eab 100644 --- a/src/engine/net/client/handlers/LeaveGuildHandler.java +++ b/src/engine/net/client/handlers/LeaveGuildHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.mbEnums; import engine.mbEnums.GuildHistoryType; @@ -29,7 +28,7 @@ public class LeaveGuildHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { LeaveGuildMsg msg = (LeaveGuildMsg) baseMsg; Dispatch dispatch; diff --git a/src/engine/net/client/handlers/LeaveWorldMsgHandler.java b/src/engine/net/client/handlers/LeaveWorldMsgHandler.java index 7efca5ab..f3731332 100644 --- a/src/engine/net/client/handlers/LeaveWorldMsgHandler.java +++ b/src/engine/net/client/handlers/LeaveWorldMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; @@ -19,7 +18,7 @@ public class LeaveWorldMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { origin.disconnect(); diff --git a/src/engine/net/client/handlers/LockUnlockDoorMsgHandler.java b/src/engine/net/client/handlers/LockUnlockDoorMsgHandler.java index 0e620b8b..842c3ff1 100644 --- a/src/engine/net/client/handlers/LockUnlockDoorMsgHandler.java +++ b/src/engine/net/client/handlers/LockUnlockDoorMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; @@ -29,7 +28,7 @@ public class LockUnlockDoorMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declarations diff --git a/src/engine/net/client/handlers/LoginToGameServerMsgHandler.java b/src/engine/net/client/handlers/LoginToGameServerMsgHandler.java index 1f973f34..0d18947c 100644 --- a/src/engine/net/client/handlers/LoginToGameServerMsgHandler.java +++ b/src/engine/net/client/handlers/LoginToGameServerMsgHandler.java @@ -1,7 +1,6 @@ package engine.net.client.handlers; import engine.InterestManagement.WorldGrid; -import engine.exception.MsgSendException; import engine.gameManager.DbManager; import engine.gameManager.SessionManager; import engine.mbEnums; @@ -30,7 +29,7 @@ public class LoginToGameServerMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { LoginToGameServerMsg msg = (LoginToGameServerMsg) baseMsg; diff --git a/src/engine/net/client/handlers/LootMsgHandler.java b/src/engine/net/client/handlers/LootMsgHandler.java index 688792fd..94e37ccd 100644 --- a/src/engine/net/client/handlers/LootMsgHandler.java +++ b/src/engine/net/client/handlers/LootMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DispatchManager; import engine.gameManager.GroupManager; @@ -30,7 +29,7 @@ public class LootMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/LootWindowRequestMsgHandler.java b/src/engine/net/client/handlers/LootWindowRequestMsgHandler.java index dba534b6..f472188a 100644 --- a/src/engine/net/client/handlers/LootWindowRequestMsgHandler.java +++ b/src/engine/net/client/handlers/LootWindowRequestMsgHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; import engine.InterestManagement.WorldGrid; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums; import engine.mbEnums.DispatchChannel; @@ -32,7 +31,7 @@ public class LootWindowRequestMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/MOTDCommitHandler.java b/src/engine/net/client/handlers/MOTDCommitHandler.java index 0d9f27a1..02abc7a2 100644 --- a/src/engine/net/client/handlers/MOTDCommitHandler.java +++ b/src/engine/net/client/handlers/MOTDCommitHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; @@ -29,7 +28,7 @@ public class MOTDCommitHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { MOTDCommitMsg msg = (MOTDCommitMsg) baseMsg; Dispatch dispatch; diff --git a/src/engine/net/client/handlers/MOTDEditHandler.java b/src/engine/net/client/handlers/MOTDEditHandler.java index 20f0244f..cd1d2727 100644 --- a/src/engine/net/client/handlers/MOTDEditHandler.java +++ b/src/engine/net/client/handlers/MOTDEditHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; import engine.mbEnums; @@ -30,7 +29,7 @@ public class MOTDEditHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { MOTDMsg msg = (MOTDMsg) baseMsg; Dispatch dispatch; diff --git a/src/engine/net/client/handlers/ManageCityAssetMsgHandler.java b/src/engine/net/client/handlers/ManageCityAssetMsgHandler.java index d7b8f564..ec3782d3 100644 --- a/src/engine/net/client/handlers/ManageCityAssetMsgHandler.java +++ b/src/engine/net/client/handlers/ManageCityAssetMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; @@ -54,7 +53,7 @@ public class ManageCityAssetMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { ManageCityAssetsMsg msg; PlayerCharacter player; diff --git a/src/engine/net/client/handlers/MerchantMsgHandler.java b/src/engine/net/client/handlers/MerchantMsgHandler.java index 92ee287a..8ee903ee 100644 --- a/src/engine/net/client/handlers/MerchantMsgHandler.java +++ b/src/engine/net/client/handlers/MerchantMsgHandler.java @@ -1,7 +1,6 @@ package engine.net.client.handlers; import engine.InterestManagement.RealmMap; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.job.JobScheduler; import engine.jobs.TeleportJob; @@ -361,7 +360,7 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/MineWindowChangeHandler.java b/src/engine/net/client/handlers/MineWindowChangeHandler.java index 1b3e66dc..82492549 100644 --- a/src/engine/net/client/handlers/MineWindowChangeHandler.java +++ b/src/engine/net/client/handlers/MineWindowChangeHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.ChatManager; import engine.gameManager.DbManager; @@ -39,7 +38,7 @@ public class MineWindowChangeHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = SessionManager.getPlayerCharacter(origin); ArcMineWindowChangeMsg mineWindowChangeMsg = (ArcMineWindowChangeMsg) baseMsg; diff --git a/src/engine/net/client/handlers/MinionTrainingMsgHandler.java b/src/engine/net/client/handlers/MinionTrainingMsgHandler.java index 98cc58d0..145361d0 100644 --- a/src/engine/net/client/handlers/MinionTrainingMsgHandler.java +++ b/src/engine/net/client/handlers/MinionTrainingMsgHandler.java @@ -1,7 +1,6 @@ package engine.net.client.handlers; import engine.InterestManagement.WorldGrid; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.mbEnums; import engine.mbEnums.DispatchChannel; @@ -24,7 +23,7 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { MinionTrainingMessage minionMsg = (MinionTrainingMessage) baseMsg; diff --git a/src/engine/net/client/handlers/ModifyStatMsgHandler.java b/src/engine/net/client/handlers/ModifyStatMsgHandler.java index c8001eda..02edbc89 100644 --- a/src/engine/net/client/handlers/ModifyStatMsgHandler.java +++ b/src/engine/net/client/handlers/ModifyStatMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ModifyStatMsg; @@ -22,7 +21,7 @@ public class ModifyStatMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/MoveToPointHandler.java b/src/engine/net/client/handlers/MoveToPointHandler.java index a1e3b077..b6dcfa32 100644 --- a/src/engine/net/client/handlers/MoveToPointHandler.java +++ b/src/engine/net/client/handlers/MoveToPointHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.MovementManager; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; @@ -24,7 +23,7 @@ public class MoveToPointHandler extends AbstractClientMsgHandler { @Override protected boolean _handleNetMsg(ClientNetMsg baseMsg, - ClientConnection origin) throws MsgSendException { + ClientConnection origin) { MoveToPointMsg msg = (MoveToPointMsg) baseMsg; PlayerCharacter pc = origin.getPlayerCharacter(); if (pc == null) diff --git a/src/engine/net/client/handlers/ObjectActionMsgHandler.java b/src/engine/net/client/handlers/ObjectActionMsgHandler.java index 5cc7874a..688c56ce 100644 --- a/src/engine/net/client/handlers/ObjectActionMsgHandler.java +++ b/src/engine/net/client/handlers/ObjectActionMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.math.Bounds; import engine.math.Vector3fImmutable; @@ -31,7 +30,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration ObjectActionMsg msg; diff --git a/src/engine/net/client/handlers/OpenFriendsCondemnListMsgHandler.java b/src/engine/net/client/handlers/OpenFriendsCondemnListMsgHandler.java index 3242eb95..0b005200 100644 --- a/src/engine/net/client/handlers/OpenFriendsCondemnListMsgHandler.java +++ b/src/engine/net/client/handlers/OpenFriendsCondemnListMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.DbManager; import engine.gameManager.DispatchManager; @@ -31,7 +30,7 @@ public class OpenFriendsCondemnListMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player = SessionManager.getPlayerCharacter(origin); Building sourceBuilding; diff --git a/src/engine/net/client/handlers/OrderNPCMsgHandler.java b/src/engine/net/client/handlers/OrderNPCMsgHandler.java index c649e52a..b03c28f7 100644 --- a/src/engine/net/client/handlers/OrderNPCMsgHandler.java +++ b/src/engine/net/client/handlers/OrderNPCMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.DbManager; import engine.gameManager.DispatchManager; @@ -355,7 +354,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declarations diff --git a/src/engine/net/client/handlers/PerformActionMsgHandler.java b/src/engine/net/client/handlers/PerformActionMsgHandler.java index 325bc3a6..06b5c837 100644 --- a/src/engine/net/client/handlers/PerformActionMsgHandler.java +++ b/src/engine/net/client/handlers/PerformActionMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.PowersManager; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; @@ -21,7 +20,7 @@ public class PerformActionMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PerformActionMsg msg = (PerformActionMsg) baseMsg; PowersManager.usePower(msg, origin, false); // Wtf ? diff --git a/src/engine/net/client/handlers/PetAttackMsgHandler.java b/src/engine/net/client/handlers/PetAttackMsgHandler.java index 3a5a5d2f..e6aff796 100644 --- a/src/engine/net/client/handlers/PetAttackMsgHandler.java +++ b/src/engine/net/client/handlers/PetAttackMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.mbEnums; import engine.net.client.ClientConnection; @@ -24,7 +23,7 @@ public class PetAttackMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/PetCmdMsgHandler.java b/src/engine/net/client/handlers/PetCmdMsgHandler.java index 4a0ac067..0eb03a0b 100644 --- a/src/engine/net/client/handlers/PetCmdMsgHandler.java +++ b/src/engine/net/client/handlers/PetCmdMsgHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; import engine.InterestManagement.WorldGrid; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; @@ -25,7 +24,7 @@ public class PetCmdMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/PetitionReceivedMsgHandler.java b/src/engine/net/client/handlers/PetitionReceivedMsgHandler.java index 0b9b926e..ed29d388 100644 --- a/src/engine/net/client/handlers/PetitionReceivedMsgHandler.java +++ b/src/engine/net/client/handlers/PetitionReceivedMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DbManager; import engine.gameManager.DispatchManager; import engine.mbEnums; @@ -22,7 +21,7 @@ public class PetitionReceivedMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg msg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg msg, ClientConnection origin) { if (msg == null) return true; diff --git a/src/engine/net/client/handlers/PlaceAssetMsgHandler.java b/src/engine/net/client/handlers/PlaceAssetMsgHandler.java index abfab260..e1a5df7c 100644 --- a/src/engine/net/client/handlers/PlaceAssetMsgHandler.java +++ b/src/engine/net/client/handlers/PlaceAssetMsgHandler.java @@ -5,7 +5,6 @@ import engine.InterestManagement.RealmMap; import engine.InterestManagement.WorldGrid; import engine.db.archive.CityRecord; import engine.db.archive.DataWarehouse; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.math.Bounds; import engine.math.Vector3fImmutable; @@ -299,7 +298,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/PromptRecallMsgHandler.java b/src/engine/net/client/handlers/PromptRecallMsgHandler.java index 7b52431a..40d9d750 100644 --- a/src/engine/net/client/handlers/PromptRecallMsgHandler.java +++ b/src/engine/net/client/handlers/PromptRecallMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.SessionManager; import engine.math.Vector3fImmutable; import engine.net.client.ClientConnection; @@ -27,7 +26,7 @@ public class PromptRecallMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable assignment diff --git a/src/engine/net/client/handlers/RandomMsgHandler.java b/src/engine/net/client/handlers/RandomMsgHandler.java index 7408ab95..d6ef646f 100644 --- a/src/engine/net/client/handlers/RandomMsgHandler.java +++ b/src/engine/net/client/handlers/RandomMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums.DispatchChannel; import engine.net.client.ClientConnection; @@ -26,7 +25,7 @@ public class RandomMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/RecommendNationMsgHandler.java b/src/engine/net/client/handlers/RecommendNationMsgHandler.java index 412020c9..461138c9 100644 --- a/src/engine/net/client/handlers/RecommendNationMsgHandler.java +++ b/src/engine/net/client/handlers/RecommendNationMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.SessionManager; import engine.mbEnums.AllianceType; @@ -55,7 +54,7 @@ public class RecommendNationMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/RecvSummonsMsgHandler.java b/src/engine/net/client/handlers/RecvSummonsMsgHandler.java index 41bfe313..684b5a05 100644 --- a/src/engine/net/client/handlers/RecvSummonsMsgHandler.java +++ b/src/engine/net/client/handlers/RecvSummonsMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.job.JobContainer; import engine.job.JobScheduler; @@ -31,7 +30,7 @@ public class RecvSummonsMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/RefineMsgHandler.java b/src/engine/net/client/handlers/RefineMsgHandler.java index 48867cee..a379b13e 100644 --- a/src/engine/net/client/handlers/RefineMsgHandler.java +++ b/src/engine/net/client/handlers/RefineMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums; import engine.net.Dispatch; @@ -29,7 +28,7 @@ public class RefineMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/RefinerScreenMsgHandler.java b/src/engine/net/client/handlers/RefinerScreenMsgHandler.java index 4156b4cf..704d09d3 100644 --- a/src/engine/net/client/handlers/RefinerScreenMsgHandler.java +++ b/src/engine/net/client/handlers/RefinerScreenMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums; import engine.net.Dispatch; @@ -25,7 +24,7 @@ public class RefinerScreenMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/RemoveFriendHandler.java b/src/engine/net/client/handlers/RemoveFriendHandler.java index be283106..e993c21e 100644 --- a/src/engine/net/client/handlers/RemoveFriendHandler.java +++ b/src/engine/net/client/handlers/RemoveFriendHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums.DispatchChannel; import engine.net.Dispatch; @@ -43,7 +42,7 @@ public class RemoveFriendHandler extends AbstractClientMsgHandler { @Override protected boolean _handleNetMsg(ClientNetMsg baseMsg, - ClientConnection origin) throws MsgSendException { + ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/RemoveFromGroupHandler.java b/src/engine/net/client/handlers/RemoveFromGroupHandler.java index 1c722ce2..bc56df47 100644 --- a/src/engine/net/client/handlers/RemoveFromGroupHandler.java +++ b/src/engine/net/client/handlers/RemoveFromGroupHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DispatchManager; import engine.gameManager.GroupManager; @@ -33,7 +32,7 @@ public class RemoveFromGroupHandler extends AbstractClientMsgHandler { @Override protected boolean _handleNetMsg(ClientNetMsg baseMsg, - ClientConnection origin) throws MsgSendException { + ClientConnection origin) { // Declar member variables diff --git a/src/engine/net/client/handlers/RepairBuildingMsgHandler.java b/src/engine/net/client/handlers/RepairBuildingMsgHandler.java index 851877c4..bcc32aa3 100644 --- a/src/engine/net/client/handlers/RepairBuildingMsgHandler.java +++ b/src/engine/net/client/handlers/RepairBuildingMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; @@ -81,7 +80,7 @@ public class RepairBuildingMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/RepairMsgHandler.java b/src/engine/net/client/handlers/RepairMsgHandler.java index 65966fd6..1337ee93 100644 --- a/src/engine/net/client/handlers/RepairMsgHandler.java +++ b/src/engine/net/client/handlers/RepairMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DbManager; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; @@ -30,7 +29,7 @@ public class RepairMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player = SessionManager.getPlayerCharacter(origin); Dispatch dispatch; diff --git a/src/engine/net/client/handlers/RequestBallListHandler.java b/src/engine/net/client/handlers/RequestBallListHandler.java index 62667f90..1859712d 100644 --- a/src/engine/net/client/handlers/RequestBallListHandler.java +++ b/src/engine/net/client/handlers/RequestBallListHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.RequestBallListMessage; @@ -28,7 +27,7 @@ public class RequestBallListHandler extends AbstractClientMsgHandler { @Override protected boolean _handleNetMsg(ClientNetMsg baseMsg, - ClientConnection origin) throws MsgSendException { + ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/RequestEnterWorldHandler.java b/src/engine/net/client/handlers/RequestEnterWorldHandler.java index d90a5682..b86abad8 100644 --- a/src/engine/net/client/handlers/RequestEnterWorldHandler.java +++ b/src/engine/net/client/handlers/RequestEnterWorldHandler.java @@ -5,7 +5,6 @@ import engine.InterestManagement.WorldGrid; import engine.db.archive.CharacterRecord; import engine.db.archive.DataWarehouse; import engine.db.archive.PvpRecord; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; import engine.math.Vector3fImmutable; @@ -34,7 +33,7 @@ public class RequestEnterWorldHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { RequestEnterWorldMsg msg; diff --git a/src/engine/net/client/handlers/RequestGuildListHandler.java b/src/engine/net/client/handlers/RequestGuildListHandler.java index 5df004c0..24657c9d 100644 --- a/src/engine/net/client/handlers/RequestGuildListHandler.java +++ b/src/engine/net/client/handlers/RequestGuildListHandler.java @@ -10,7 +10,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; import engine.mbEnums; @@ -30,7 +29,7 @@ public class RequestGuildListHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { Dispatch dispatch; // get PlayerCharacter of person accepting invite diff --git a/src/engine/net/client/handlers/RespawnMsgHandler.java b/src/engine/net/client/handlers/RespawnMsgHandler.java index 3ffb9df0..b6c94cd6 100644 --- a/src/engine/net/client/handlers/RespawnMsgHandler.java +++ b/src/engine/net/client/handlers/RespawnMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.MovementManager; import engine.job.JobScheduler; @@ -30,7 +29,7 @@ public class RespawnMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/SendBallEntryHandler.java b/src/engine/net/client/handlers/SendBallEntryHandler.java index 8b96302d..15991fc7 100644 --- a/src/engine/net/client/handlers/SendBallEntryHandler.java +++ b/src/engine/net/client/handlers/SendBallEntryHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.SendBallEntryMessage; @@ -28,7 +27,7 @@ public class SendBallEntryHandler extends AbstractClientMsgHandler { @Override protected boolean _handleNetMsg(ClientNetMsg baseMsg, - ClientConnection origin) throws MsgSendException { + ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/SendSummonsMsgHandler.java b/src/engine/net/client/handlers/SendSummonsMsgHandler.java index 3718e470..0216086f 100644 --- a/src/engine/net/client/handlers/SendSummonsMsgHandler.java +++ b/src/engine/net/client/handlers/SendSummonsMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.ConfigManager; import engine.gameManager.SessionManager; @@ -28,7 +27,7 @@ public class SendSummonsMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/ServerInfoMsgHandler.java b/src/engine/net/client/handlers/ServerInfoMsgHandler.java index b40cb1f7..09fcbaa7 100644 --- a/src/engine/net/client/handlers/ServerInfoMsgHandler.java +++ b/src/engine/net/client/handlers/ServerInfoMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ServerInfoMsg; @@ -24,7 +23,7 @@ public class ServerInfoMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/SetCombatModeMsgHandler.java b/src/engine/net/client/handlers/SetCombatModeMsgHandler.java index a7ad7215..a17550ce 100644 --- a/src/engine/net/client/handlers/SetCombatModeMsgHandler.java +++ b/src/engine/net/client/handlers/SetCombatModeMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums; import engine.net.client.ClientConnection; @@ -25,7 +24,7 @@ public class SetCombatModeMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/ShowMsgHandler.java b/src/engine/net/client/handlers/ShowMsgHandler.java index 0c31a346..ef6c8e64 100644 --- a/src/engine/net/client/handlers/ShowMsgHandler.java +++ b/src/engine/net/client/handlers/ShowMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums; import engine.mbEnums.DispatchChannel; @@ -28,7 +27,7 @@ public class ShowMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/SocialMsgHandler.java b/src/engine/net/client/handlers/SocialMsgHandler.java index ca7cbd39..4232666f 100644 --- a/src/engine/net/client/handlers/SocialMsgHandler.java +++ b/src/engine/net/client/handlers/SocialMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums.DispatchChannel; import engine.net.client.ClientConnection; @@ -24,7 +23,7 @@ public class SocialMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/StuckMsgHandler.java b/src/engine/net/client/handlers/StuckMsgHandler.java index 390dbaa4..cadd5ad8 100644 --- a/src/engine/net/client/handlers/StuckMsgHandler.java +++ b/src/engine/net/client/handlers/StuckMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.job.JobContainer; import engine.job.JobScheduler; import engine.jobs.StuckJob; @@ -26,7 +25,7 @@ public class StuckMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/SwearInGuildHandler.java b/src/engine/net/client/handlers/SwearInGuildHandler.java index e82d1d65..9b220436 100644 --- a/src/engine/net/client/handlers/SwearInGuildHandler.java +++ b/src/engine/net/client/handlers/SwearInGuildHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.mbEnums; import engine.mbEnums.GameObjectType; @@ -35,7 +34,7 @@ public class SwearInGuildHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player; SwearInGuildMsg swearInMsg; Guild targetGuild; diff --git a/src/engine/net/client/handlers/SwearInHandler.java b/src/engine/net/client/handlers/SwearInHandler.java index f9995b4f..470007b9 100644 --- a/src/engine/net/client/handlers/SwearInHandler.java +++ b/src/engine/net/client/handlers/SwearInHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; @@ -31,7 +30,7 @@ public class SwearInHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { SwearInMsg msg = (SwearInMsg) baseMsg; Dispatch dispatch; diff --git a/src/engine/net/client/handlers/TargetObjectMsgHandler.java b/src/engine/net/client/handlers/TargetObjectMsgHandler.java index abef7a1e..c40dec90 100644 --- a/src/engine/net/client/handlers/TargetObjectMsgHandler.java +++ b/src/engine/net/client/handlers/TargetObjectMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.SessionManager; import engine.mbEnums; import engine.net.client.ClientConnection; @@ -23,7 +22,7 @@ public class TargetObjectMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { TargetObjectMsg msg = (TargetObjectMsg) baseMsg; diff --git a/src/engine/net/client/handlers/TaxCityMsgHandler.java b/src/engine/net/client/handlers/TaxCityMsgHandler.java index dc155ab8..8e6fe9af 100644 --- a/src/engine/net/client/handlers/TaxCityMsgHandler.java +++ b/src/engine/net/client/handlers/TaxCityMsgHandler.java @@ -1,7 +1,6 @@ package engine.net.client.handlers; import engine.InterestManagement.RealmMap; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.DispatchManager; import engine.mbEnums; @@ -124,7 +123,7 @@ public class TaxCityMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/TaxResourcesMsgHandler.java b/src/engine/net/client/handlers/TaxResourcesMsgHandler.java index e5e33207..93a96bd7 100644 --- a/src/engine/net/client/handlers/TaxResourcesMsgHandler.java +++ b/src/engine/net/client/handlers/TaxResourcesMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; @@ -47,7 +46,7 @@ public class TaxResourcesMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/ToggleCombatMsgHandler.java b/src/engine/net/client/handlers/ToggleCombatMsgHandler.java index fe0766fb..18317ec1 100644 --- a/src/engine/net/client/handlers/ToggleCombatMsgHandler.java +++ b/src/engine/net/client/handlers/ToggleCombatMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums; import engine.net.client.ClientConnection; @@ -25,7 +24,7 @@ public class ToggleCombatMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/ToggleGroupSplitHandler.java b/src/engine/net/client/handlers/ToggleGroupSplitHandler.java index 68e6079a..8731eabf 100644 --- a/src/engine/net/client/handlers/ToggleGroupSplitHandler.java +++ b/src/engine/net/client/handlers/ToggleGroupSplitHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.GroupManager; import engine.gameManager.SessionManager; @@ -27,7 +26,7 @@ public class ToggleGroupSplitHandler extends AbstractClientMsgHandler { @Override protected boolean _handleNetMsg(ClientNetMsg baseMsg, - ClientConnection origin) throws MsgSendException { + ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/ToggleLfgRecruitingMsgHandler.java b/src/engine/net/client/handlers/ToggleLfgRecruitingMsgHandler.java index 33735b0c..e58283d1 100644 --- a/src/engine/net/client/handlers/ToggleLfgRecruitingMsgHandler.java +++ b/src/engine/net/client/handlers/ToggleLfgRecruitingMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums.DispatchChannel; import engine.net.client.ClientConnection; @@ -25,7 +24,7 @@ public class ToggleLfgRecruitingMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/ToggleSitStandMsgHandler.java b/src/engine/net/client/handlers/ToggleSitStandMsgHandler.java index 9ffcfcfc..6aa6f5ec 100644 --- a/src/engine/net/client/handlers/ToggleSitStandMsgHandler.java +++ b/src/engine/net/client/handlers/ToggleSitStandMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums.DispatchChannel; import engine.net.client.ClientConnection; @@ -25,7 +24,7 @@ public class ToggleSitStandMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/TrackWindowMsgHandler.java b/src/engine/net/client/handlers/TrackWindowMsgHandler.java index 0643be71..7886a7b1 100644 --- a/src/engine/net/client/handlers/TrackWindowMsgHandler.java +++ b/src/engine/net/client/handlers/TrackWindowMsgHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; import engine.InterestManagement.WorldGrid; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DispatchManager; import engine.gameManager.PowersManager; @@ -39,7 +38,7 @@ public class TrackWindowMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/TradeRequestMsgHandler.java b/src/engine/net/client/handlers/TradeRequestMsgHandler.java index cdccb92d..b89c7601 100644 --- a/src/engine/net/client/handlers/TradeRequestMsgHandler.java +++ b/src/engine/net/client/handlers/TradeRequestMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DispatchManager; import engine.mbEnums; @@ -26,7 +25,7 @@ public class TradeRequestMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { TradeRequestMsg msg = (TradeRequestMsg) baseMsg; diff --git a/src/engine/net/client/handlers/TrainMsgHandler.java b/src/engine/net/client/handlers/TrainMsgHandler.java index f5eb5bcc..6ac192fc 100644 --- a/src/engine/net/client/handlers/TrainMsgHandler.java +++ b/src/engine/net/client/handlers/TrainMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.mbEnums; import engine.net.Dispatch; @@ -31,7 +30,7 @@ public class TrainMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { TrainMsg msg = (TrainMsg) baseMsg; origin.getPlayerCharacter().recalculate(); diff --git a/src/engine/net/client/handlers/TrainerInfoMsgHandler.java b/src/engine/net/client/handlers/TrainerInfoMsgHandler.java index ca2dc160..fdc8ff26 100644 --- a/src/engine/net/client/handlers/TrainerInfoMsgHandler.java +++ b/src/engine/net/client/handlers/TrainerInfoMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums; import engine.net.Dispatch; @@ -25,7 +24,7 @@ public class TrainerInfoMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/TransferAssetMsgHandler.java b/src/engine/net/client/handlers/TransferAssetMsgHandler.java index 8ff28b36..666637df 100644 --- a/src/engine/net/client/handlers/TransferAssetMsgHandler.java +++ b/src/engine/net/client/handlers/TransferAssetMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.ChatManager; import engine.mbEnums; @@ -25,7 +24,7 @@ public class TransferAssetMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { TransferAssetMsg transferAssetMsg = (TransferAssetMsg) baseMsg; diff --git a/src/engine/net/client/handlers/TransferGoldToFromBuildingMsgHandler.java b/src/engine/net/client/handlers/TransferGoldToFromBuildingMsgHandler.java index 628615b8..c5c0c72a 100644 --- a/src/engine/net/client/handlers/TransferGoldToFromBuildingMsgHandler.java +++ b/src/engine/net/client/handlers/TransferGoldToFromBuildingMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; @@ -31,7 +30,7 @@ public class TransferGoldToFromBuildingMsgHandler extends AbstractClientMsgHandl } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player; Building building; diff --git a/src/engine/net/client/handlers/TransferItemFromBankMsgHandler.java b/src/engine/net/client/handlers/TransferItemFromBankMsgHandler.java index 8abbf5f8..03c35ed5 100644 --- a/src/engine/net/client/handlers/TransferItemFromBankMsgHandler.java +++ b/src/engine/net/client/handlers/TransferItemFromBankMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.NPCManager; import engine.mbEnums; @@ -29,7 +28,7 @@ public class TransferItemFromBankMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); Dispatch dispatch; diff --git a/src/engine/net/client/handlers/TransferItemFromEquipToInventoryHandler.java b/src/engine/net/client/handlers/TransferItemFromEquipToInventoryHandler.java index c684f9ab..c68cfaec 100644 --- a/src/engine/net/client/handlers/TransferItemFromEquipToInventoryHandler.java +++ b/src/engine/net/client/handlers/TransferItemFromEquipToInventoryHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums; import engine.mbEnums.DispatchChannel; @@ -29,7 +28,7 @@ public class TransferItemFromEquipToInventoryHandler extends AbstractClientMsgHa } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/TransferItemFromInventoryToEquipHandler.java b/src/engine/net/client/handlers/TransferItemFromInventoryToEquipHandler.java index 502e3663..4beca823 100644 --- a/src/engine/net/client/handlers/TransferItemFromInventoryToEquipHandler.java +++ b/src/engine/net/client/handlers/TransferItemFromInventoryToEquipHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.ChatManager; import engine.gameManager.DispatchManager; import engine.mbEnums; @@ -32,7 +31,7 @@ public class TransferItemFromInventoryToEquipHandler extends AbstractClientMsgHa } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); TransferItemFromInventoryToEquipMsg transferMsg = (TransferItemFromInventoryToEquipMsg) baseMsg; diff --git a/src/engine/net/client/handlers/TransferItemToBankMsgHandler.java b/src/engine/net/client/handlers/TransferItemToBankMsgHandler.java index 845590e7..c0506356 100644 --- a/src/engine/net/client/handlers/TransferItemToBankMsgHandler.java +++ b/src/engine/net/client/handlers/TransferItemToBankMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.NPCManager; import engine.mbEnums; @@ -30,7 +29,7 @@ public class TransferItemToBankMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); Dispatch dispatch; diff --git a/src/engine/net/client/handlers/UncommitToTradeMsgHandler.java b/src/engine/net/client/handlers/UncommitToTradeMsgHandler.java index 890fa69c..3c9e6e5e 100644 --- a/src/engine/net/client/handlers/UncommitToTradeMsgHandler.java +++ b/src/engine/net/client/handlers/UncommitToTradeMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.UncommitToTradeMsg; @@ -24,7 +23,7 @@ public class UncommitToTradeMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter source = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/UpdateFriendStatusHandler.java b/src/engine/net/client/handlers/UpdateFriendStatusHandler.java index 42048230..8a4020c0 100644 --- a/src/engine/net/client/handlers/UpdateFriendStatusHandler.java +++ b/src/engine/net/client/handlers/UpdateFriendStatusHandler.java @@ -9,7 +9,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; import engine.mbEnums.DispatchChannel; @@ -65,7 +64,7 @@ public class UpdateFriendStatusHandler extends AbstractClientMsgHandler { @Override protected boolean _handleNetMsg(ClientNetMsg baseMsg, - ClientConnection origin) throws MsgSendException { + ClientConnection origin) { PlayerCharacter player = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/UpdateStateMsgHandler.java b/src/engine/net/client/handlers/UpdateStateMsgHandler.java index 9ae6dfb5..b15143d1 100644 --- a/src/engine/net/client/handlers/UpdateStateMsgHandler.java +++ b/src/engine/net/client/handlers/UpdateStateMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; import engine.mbEnums.DispatchChannel; @@ -25,7 +24,7 @@ public class UpdateStateMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { UpdateStateMsg msg = (UpdateStateMsg) baseMsg; diff --git a/src/engine/net/client/handlers/UpgradeAssetMsgHandler.java b/src/engine/net/client/handlers/UpgradeAssetMsgHandler.java index d8ca1f48..b56d404e 100644 --- a/src/engine/net/client/handlers/UpgradeAssetMsgHandler.java +++ b/src/engine/net/client/handlers/UpgradeAssetMsgHandler.java @@ -1,6 +1,5 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.BuildingManager; import engine.gameManager.DbManager; import engine.gameManager.DispatchManager; @@ -32,7 +31,7 @@ public class UpgradeAssetMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/UseCharterMsgHandler.java b/src/engine/net/client/handlers/UseCharterMsgHandler.java index 469b02f9..3557f5e6 100644 --- a/src/engine/net/client/handlers/UseCharterMsgHandler.java +++ b/src/engine/net/client/handlers/UseCharterMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums.DispatchChannel; import engine.net.Dispatch; @@ -23,7 +22,7 @@ public class UseCharterMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { UseCharterMsg msg = (UseCharterMsg) baseMsg; msg.setUnknown02(1); diff --git a/src/engine/net/client/handlers/VendorBuyMsgHandler.java b/src/engine/net/client/handlers/VendorBuyMsgHandler.java index 3130329e..a5805eb6 100644 --- a/src/engine/net/client/handlers/VendorBuyMsgHandler.java +++ b/src/engine/net/client/handlers/VendorBuyMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DbManager; import engine.gameManager.SessionManager; import engine.mbEnums; @@ -43,7 +42,7 @@ public class VendorBuyMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { // Member variable declaration diff --git a/src/engine/net/client/handlers/VendorBuyWindowMsgHandler.java b/src/engine/net/client/handlers/VendorBuyWindowMsgHandler.java index 08dd84f5..f716a84f 100644 --- a/src/engine/net/client/handlers/VendorBuyWindowMsgHandler.java +++ b/src/engine/net/client/handlers/VendorBuyWindowMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; import engine.mbEnums.DispatchChannel; @@ -28,7 +27,7 @@ public class VendorBuyWindowMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter sourcePlayer = SessionManager.getPlayerCharacter(origin); Dispatch dispatch; diff --git a/src/engine/net/client/handlers/VendorDialogMsgHandler.java b/src/engine/net/client/handlers/VendorDialogMsgHandler.java index 947b0d16..70ef5ec3 100644 --- a/src/engine/net/client/handlers/VendorDialogMsgHandler.java +++ b/src/engine/net/client/handlers/VendorDialogMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.math.Vector3fImmutable; import engine.mbEnums; @@ -237,7 +236,7 @@ public class VendorDialogMsgHandler extends AbstractClientMsgHandler { return false; } - private static boolean finishMessage(VendorDialogMsg msg, ClientConnection origin) throws MsgSendException { + private static boolean finishMessage(VendorDialogMsg msg, ClientConnection origin) { msg.updateMessage(4, 0); Dispatch dispatch = Dispatch.borrow(origin.getPlayerCharacter(), msg); DispatchManager.dispatchMsgDispatch(dispatch, DispatchChannel.SECONDARY); @@ -522,7 +521,7 @@ public class VendorDialogMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = SessionManager.getPlayerCharacter(origin); VendorDialogMsg msg = (VendorDialogMsg) baseMsg; diff --git a/src/engine/net/client/handlers/VendorSellMsgHandler.java b/src/engine/net/client/handlers/VendorSellMsgHandler.java index b837398d..5d1e2948 100644 --- a/src/engine/net/client/handlers/VendorSellMsgHandler.java +++ b/src/engine/net/client/handlers/VendorSellMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; import engine.mbEnums; @@ -30,7 +29,7 @@ public class VendorSellMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter pc = origin.getPlayerCharacter(); PlayerCharacter player = SessionManager.getPlayerCharacter(origin); diff --git a/src/engine/net/client/handlers/VendorSellWindowMsgHandler.java b/src/engine/net/client/handlers/VendorSellWindowMsgHandler.java index f0c0c5c8..ae4208f0 100644 --- a/src/engine/net/client/handlers/VendorSellWindowMsgHandler.java +++ b/src/engine/net/client/handlers/VendorSellWindowMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.gameManager.SessionManager; import engine.mbEnums.DispatchChannel; @@ -29,7 +28,7 @@ public class VendorSellWindowMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = SessionManager.getPlayerCharacter(origin); Dispatch dispatch; diff --git a/src/engine/net/client/handlers/VersionInfoMsgHandler.java b/src/engine/net/client/handlers/VersionInfoMsgHandler.java index de094e71..c876b5f6 100644 --- a/src/engine/net/client/handlers/VersionInfoMsgHandler.java +++ b/src/engine/net/client/handlers/VersionInfoMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.login.VersionInfoMsg; @@ -23,7 +22,7 @@ public class VersionInfoMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); String cMajorVer; diff --git a/src/engine/net/client/handlers/ViewResourcesMsgHandler.java b/src/engine/net/client/handlers/ViewResourcesMsgHandler.java index 05939ad0..23e0c6a7 100644 --- a/src/engine/net/client/handlers/ViewResourcesMsgHandler.java +++ b/src/engine/net/client/handlers/ViewResourcesMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.gameManager.DispatchManager; import engine.mbEnums.DispatchChannel; import engine.net.Dispatch; @@ -27,7 +26,7 @@ public class ViewResourcesMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { PlayerCharacter playerCharacter = origin.getPlayerCharacter(); diff --git a/src/engine/net/client/handlers/WhoRequestMsgHandler.java b/src/engine/net/client/handlers/WhoRequestMsgHandler.java index d5e323a8..0e25c5b2 100644 --- a/src/engine/net/client/handlers/WhoRequestMsgHandler.java +++ b/src/engine/net/client/handlers/WhoRequestMsgHandler.java @@ -8,7 +8,6 @@ package engine.net.client.handlers; -import engine.exception.MsgSendException; import engine.net.client.ClientConnection; import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ErrorPopupMsg; @@ -23,7 +22,7 @@ public class WhoRequestMsgHandler extends AbstractClientMsgHandler { } @Override - protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { + protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) { WhoRequestMsg msg = (WhoRequestMsg) baseMsg; diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index bd314996..c56010c2 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -16,7 +16,6 @@ import engine.InterestManagement.WorldGrid; import engine.db.archive.CharacterRecord; import engine.db.archive.DataWarehouse; import engine.db.archive.PvpRecord; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.job.JobContainer; import engine.job.JobScheduler; @@ -4851,7 +4850,7 @@ public class PlayerCharacter extends AbstractCharacter { try { MovementManager.movement(moveToMsg, this); - } catch (MsgSendException e) { + } catch (Exception e) { // TODO Auto-generated catch block Logger.error("Player.MoveTo", this.getName() + " tripped error " + e.getMessage()); } diff --git a/src/engine/powers/effectmodifiers/HealthEffectModifier.java b/src/engine/powers/effectmodifiers/HealthEffectModifier.java index 09e53c6b..63be4cae 100644 --- a/src/engine/powers/effectmodifiers/HealthEffectModifier.java +++ b/src/engine/powers/effectmodifiers/HealthEffectModifier.java @@ -232,7 +232,7 @@ public class HealthEffectModifier extends AbstractEffectModifier { // CombatMessageMsg cmm = new CombatMessageMsg(null, 0, awo, 15); // try { // DispatchMessage.sendToAllInRange(ac, cmm); - // } catch (MsgSendException e) { + // } catch (Exception e) { // Logger.error("MobCorpseSendError", e); // } // } diff --git a/src/engine/server/world/WorldServer.java b/src/engine/server/world/WorldServer.java index f9d7324a..d265b6f0 100644 --- a/src/engine/server/world/WorldServer.java +++ b/src/engine/server/world/WorldServer.java @@ -14,7 +14,6 @@ import engine.InterestManagement.WorldGrid; import engine.db.archive.DataWarehouse; import engine.db.handlers.dbNPCHandler; import engine.db.handlers.dbRuneBaseHandler; -import engine.exception.MsgSendException; import engine.gameManager.*; import engine.job.JobContainer; import engine.job.JobScheduler; @@ -613,7 +612,7 @@ public class WorldServer { try { if (group != null) GroupManager.LeaveGroup(player); - } catch (MsgSendException e) { + } catch (Exception e) { Logger.error(e.toString()); }