Removed custom exception candy

This commit is contained in:
2024-05-12 13:42:11 -04:00
parent 634f1478ce
commit f8180a7000
153 changed files with 156 additions and 339 deletions
@@ -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);
}
}
+2 -3
View File
@@ -8,7 +8,6 @@
package engine.gameManager; package engine.gameManager;
import engine.exception.MsgSendException;
import engine.mbEnums; import engine.mbEnums;
import engine.net.Dispatch; import engine.net.Dispatch;
import engine.net.client.ClientConnection; 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); PlayerCharacter source = SessionManager.getPlayerCharacter(origin);
LeaveGroup(source); LeaveGroup(source);
} }
public static void LeaveGroup(PlayerCharacter source) throws MsgSendException { public static void LeaveGroup(PlayerCharacter source) {
if (source == null) if (source == null)
return; return;
+2 -3
View File
@@ -9,7 +9,6 @@
package engine.gameManager; package engine.gameManager;
import engine.InterestManagement.InterestManager; import engine.InterestManagement.InterestManager;
import engine.exception.MsgSendException;
import engine.math.Bounds; import engine.math.Bounds;
import engine.math.Vector3f; import engine.math.Vector3f;
import engine.math.Vector3fImmutable; import engine.math.Vector3fImmutable;
@@ -60,7 +59,7 @@ public enum MovementManager {
* target upon each move, unless something has set the firstHitCombatTarget * target upon each move, unless something has set the firstHitCombatTarget
* Also used to determine the size of a monster's hitbox * 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 // check for stun/root
if (!toMove.isAlive()) if (!toMove.isAlive())
@@ -348,7 +347,7 @@ public enum MovementManager {
// Handle formation movement in group // 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 // get forward vector
Vector3f faceDir = new Vector3f(pc.getFaceDir().x, 0, pc.getFaceDir().z).normalize(); Vector3f faceDir = new Vector3f(pc.getFaceDir().x, 0, pc.getFaceDir().z).normalize();
// get perpendicular vector // get perpendicular vector
@@ -9,7 +9,6 @@
package engine.mobileAI.utilities; package engine.mobileAI.utilities;
import engine.exception.MsgSendException;
import engine.gameManager.MovementManager; import engine.gameManager.MovementManager;
import engine.math.Vector3fImmutable; import engine.math.Vector3fImmutable;
import engine.mbEnums; import engine.mbEnums;
@@ -253,7 +252,7 @@ public class MovementUtilities {
try { try {
MovementManager.movement(msg, agent); MovementManager.movement(msg, agent);
} catch (MsgSendException e) { } catch (Exception e) {
// TODO Figure out how we want to handle the msg send exception // TODO Figure out how we want to handle the msg send exception
e.printStackTrace(); e.printStackTrace();
} }
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.*; import engine.gameManager.*;
import engine.mbEnums; import engine.mbEnums;
import engine.mbEnums.BuildingGroup; import engine.mbEnums.BuildingGroup;
@@ -48,7 +47,7 @@ public class AbandonAssetMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declaration // Member variable declaration
PlayerCharacter player; PlayerCharacter player;
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.net.Protocol; import engine.net.Protocol;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
@@ -26,7 +25,7 @@ public class AbstractChatMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter playerCharacter = origin.getPlayerCharacter(); PlayerCharacter playerCharacter = origin.getPlayerCharacter();
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
@@ -20,7 +19,7 @@ public abstract class AbstractClientMsgHandler {
try { try {
executionSucceded = _handleNetMsg(msg, (ClientConnection) msg.getOrigin()); executionSucceded = _handleNetMsg(msg, (ClientConnection) msg.getOrigin());
} catch (MsgSendException e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
executionSucceded = false; executionSucceded = false;
} }
@@ -28,5 +27,5 @@ public abstract class AbstractClientMsgHandler {
return executionSucceded; return executionSucceded;
} }
protected abstract boolean _handleNetMsg(ClientNetMsg msg, ClientConnection origin) throws MsgSendException; protected abstract boolean _handleNetMsg(ClientNetMsg msg, ClientConnection origin);
} }
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.*; import engine.gameManager.*;
import engine.mbEnums; import engine.mbEnums;
import engine.mbEnums.GameObjectType; import engine.mbEnums.GameObjectType;
@@ -32,7 +31,7 @@ public class AcceptInviteToGuildHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter player; PlayerCharacter player;
AcceptInviteToGuildMsg msg; AcceptInviteToGuildMsg msg;
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
@@ -35,7 +34,7 @@ public class AcceptSubInviteHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
AcceptSubInviteMsg msg = (AcceptSubInviteMsg) baseMsg; AcceptSubInviteMsg msg = (AcceptSubInviteMsg) baseMsg;
PlayerCharacter sourcePlayer; PlayerCharacter sourcePlayer;
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums; import engine.mbEnums;
import engine.net.Dispatch; import engine.net.Dispatch;
@@ -32,7 +31,7 @@ public class AcceptTradeRequestMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declaration // Member variable declaration
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.*; import engine.gameManager.*;
import engine.mbEnums; import engine.mbEnums;
import engine.mbEnums.ItemType; import engine.mbEnums.ItemType;
@@ -26,7 +25,7 @@ public class ActivateNPCMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
ActivateNPCMessage msg; ActivateNPCMessage msg;
PlayerCharacter player; PlayerCharacter player;
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums; import engine.mbEnums;
import engine.net.Dispatch; import engine.net.Dispatch;
@@ -31,7 +30,7 @@ public class AddGoldToTradeWindowMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter source = origin.getPlayerCharacter(); PlayerCharacter source = origin.getPlayerCharacter();
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums; import engine.mbEnums;
import engine.net.Dispatch; import engine.net.Dispatch;
@@ -29,7 +28,7 @@ public class AddItemToTradeWindowMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declaration // Member variable declaration
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
import engine.mbEnums; import engine.mbEnums;
@@ -97,7 +96,7 @@ public class AllianceChangeMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declaration // Member variable declaration
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
import engine.mbEnums; import engine.mbEnums;
@@ -46,7 +45,7 @@ public class AllyEnemyListMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declaration // Member variable declaration
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.GroupManager; import engine.gameManager.GroupManager;
@@ -30,7 +29,7 @@ public class AppointGroupLeaderHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
AppointGroupLeaderMsg msg = (AppointGroupLeaderMsg) baseMsg; AppointGroupLeaderMsg msg = (AppointGroupLeaderMsg) baseMsg;
PlayerCharacter source = SessionManager.getPlayerCharacter(origin); PlayerCharacter source = SessionManager.getPlayerCharacter(origin);
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.*; import engine.gameManager.*;
import engine.job.JobScheduler; import engine.job.JobScheduler;
import engine.mbEnums; import engine.mbEnums;
@@ -25,7 +24,7 @@ public class ArcLoginNotifyMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter player = SessionManager.getPlayerCharacter(origin); PlayerCharacter player = SessionManager.getPlayerCharacter(origin);
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums; import engine.mbEnums;
import engine.mbEnums.DispatchChannel; import engine.mbEnums.DispatchChannel;
@@ -25,7 +24,7 @@ public class ArcMineChangeProductionMsgHandler extends AbstractClientMsgHandler
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter playerCharacter = origin.getPlayerCharacter(); PlayerCharacter playerCharacter = origin.getPlayerCharacter();
ArcMineChangeProductionMsg changeProductionMsg = (ArcMineChangeProductionMsg) baseMsg; ArcMineChangeProductionMsg changeProductionMsg = (ArcMineChangeProductionMsg) baseMsg;
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums; import engine.mbEnums;
@@ -27,7 +26,7 @@ public class ArcMineWindowAvailableTimeHandler extends AbstractClientMsgHandler
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
ArcMineWindowAvailableTimeMsg msg = (ArcMineWindowAvailableTimeMsg) baseMsg; ArcMineWindowAvailableTimeMsg msg = (ArcMineWindowAvailableTimeMsg) baseMsg;
PlayerCharacter playerCharacter = origin.getPlayerCharacter(); PlayerCharacter playerCharacter = origin.getPlayerCharacter();
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums.DispatchChannel; import engine.mbEnums.DispatchChannel;
import engine.net.Dispatch; import engine.net.Dispatch;
@@ -24,7 +23,7 @@ public class ArcOwnedMinesListHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter playerCharacter = origin.getPlayerCharacter(); PlayerCharacter playerCharacter = origin.getPlayerCharacter();
ArcOwnedMinesListMsg msg = (ArcOwnedMinesListMsg) baseMsg; ArcOwnedMinesListMsg msg = (ArcOwnedMinesListMsg) baseMsg;
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
import engine.mbEnums.GameObjectType; import engine.mbEnums.GameObjectType;
@@ -26,7 +25,7 @@ public class ArcSiegeSpireMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter player; PlayerCharacter player;
Building spire; Building spire;
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
@@ -27,7 +26,7 @@ public class ArcViewAssetTransactionsMsgHandler extends AbstractClientMsgHandler
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter player; PlayerCharacter player;
ArcViewAssetTransactionsMsg msg; ArcViewAssetTransactionsMsg msg;
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.NPCManager; import engine.gameManager.NPCManager;
@@ -123,7 +122,7 @@ public class AssetSupportMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declaration // Member variable declaration
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.gameManager.CombatManager; import engine.gameManager.CombatManager;
import engine.mbEnums; import engine.mbEnums;
@@ -26,7 +25,7 @@ public class AttackCmdMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter playerCharacter = origin.getPlayerCharacter(); PlayerCharacter playerCharacter = origin.getPlayerCharacter();
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
@@ -35,7 +34,7 @@ public class BanishUnbanishHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
BanishUnbanishMsg msg = (BanishUnbanishMsg) baseMsg; BanishUnbanishMsg msg = (BanishUnbanishMsg) baseMsg;
Dispatch dispatch; Dispatch dispatch;
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.*; import engine.gameManager.*;
import engine.mbEnums; import engine.mbEnums;
import engine.mbEnums.GameObjectType; import engine.mbEnums.GameObjectType;
@@ -32,7 +31,7 @@ public class BreakFealtyHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
BreakFealtyMsg bfm; BreakFealtyMsg bfm;
PlayerCharacter player; PlayerCharacter player;
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums.DispatchChannel; import engine.mbEnums.DispatchChannel;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
@@ -30,7 +29,7 @@ public class ChangeAltitudeHandler extends AbstractClientMsgHandler {
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, protected boolean _handleNetMsg(ClientNetMsg baseMsg,
ClientConnection origin) throws MsgSendException { ClientConnection origin) {
ChangeAltitudeMsg msg = (ChangeAltitudeMsg) baseMsg; ChangeAltitudeMsg msg = (ChangeAltitudeMsg) baseMsg;
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
@@ -33,7 +32,7 @@ public class ChangeGuildLeaderHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
ChangeGuildLeaderMsg msg; ChangeGuildLeaderMsg msg;
PlayerCharacter sourcePlayer; PlayerCharacter sourcePlayer;
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
@@ -32,7 +31,7 @@ public class ChangeRankHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
ChangeRankMsg msg; ChangeRankMsg msg;
PlayerCharacter sourcePlayer; PlayerCharacter sourcePlayer;
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
import engine.gameManager.GuildManager; import engine.gameManager.GuildManager;
@@ -41,7 +40,7 @@ public class ChannelMuteMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
return true; return true;
} }
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.GuildManager; import engine.gameManager.GuildManager;
import engine.mbEnums; import engine.mbEnums;
@@ -27,7 +26,7 @@ public class CityChoiceMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter player = origin.getPlayerCharacter(); PlayerCharacter player = origin.getPlayerCharacter();
Dispatch dispatch; Dispatch dispatch;
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
import engine.gameManager.ZoneManager; import engine.gameManager.ZoneManager;
@@ -29,7 +28,7 @@ public class CityDataHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
boolean updateCities = false; boolean updateCities = false;
Session playerSession; Session playerSession;
@@ -11,7 +11,6 @@ package engine.net.client.handlers;
import engine.db.archive.CityRecord; import engine.db.archive.CityRecord;
import engine.db.archive.DataWarehouse; import engine.db.archive.DataWarehouse;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.mbEnums; import engine.mbEnums;
import engine.mbEnums.BuildingGroup; import engine.mbEnums.BuildingGroup;
@@ -44,7 +43,7 @@ public class ClaimAssetMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declaration // Member variable declaration
this.claimLock.writeLock().lock(); this.claimLock.writeLock().lock();
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
@@ -44,7 +43,7 @@ public class ClaimGuildTreeMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declaration // Member variable declaration
this.claimLock.writeLock().lock(); this.claimLock.writeLock().lock();
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DevCmdManager; import engine.gameManager.DevCmdManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
import engine.mbEnums; import engine.mbEnums;
@@ -58,7 +57,7 @@ public class ClientAdminCommandMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter player = origin.getPlayerCharacter(); PlayerCharacter player = origin.getPlayerCharacter();
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ConfigManager; import engine.gameManager.ConfigManager;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
@@ -30,7 +29,7 @@ public class ClientLoginInfoMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter playerCharacter = origin.getPlayerCharacter(); PlayerCharacter playerCharacter = origin.getPlayerCharacter();
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums; import engine.mbEnums;
import engine.net.Dispatch; import engine.net.Dispatch;
@@ -25,7 +24,7 @@ public class CloseTradeWindowMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter source = origin.getPlayerCharacter(); PlayerCharacter source = origin.getPlayerCharacter();
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
@@ -25,7 +24,7 @@ public class CommitNewCharacterMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
if (origin.getAccount() == null) if (origin.getAccount() == null)
return true; return true;
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.CloseTradeWindowMsg; import engine.net.client.msg.CloseTradeWindowMsg;
@@ -25,7 +24,7 @@ public class CommitToTradeMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter source = origin.getPlayerCharacter(); PlayerCharacter source = origin.getPlayerCharacter();
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
@@ -27,7 +26,7 @@ public class DeleteCharacterMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declaration // Member variable declaration
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums.DispatchChannel; import engine.mbEnums.DispatchChannel;
import engine.net.Dispatch; import engine.net.Dispatch;
@@ -26,7 +25,7 @@ public class DeleteItemMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter player = origin.getPlayerCharacter(); PlayerCharacter player = origin.getPlayerCharacter();
@@ -1,7 +1,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.InterestManagement.WorldGrid; import engine.InterestManagement.WorldGrid;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.mbEnums; import engine.mbEnums;
import engine.mbEnums.BuildingGroup; import engine.mbEnums.BuildingGroup;
@@ -24,7 +23,7 @@ public class DestroyBuildingHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter pc = origin.getPlayerCharacter(); PlayerCharacter pc = origin.getPlayerCharacter();
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.GroupManager; import engine.gameManager.GroupManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
@@ -25,7 +24,7 @@ public class DisbandGroupHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter source = SessionManager.getPlayerCharacter(origin); PlayerCharacter source = SessionManager.getPlayerCharacter(origin);
if (source == null) { if (source == null) {
@@ -12,7 +12,6 @@ package engine.net.client.handlers;
import engine.InterestManagement.WorldGrid; import engine.InterestManagement.WorldGrid;
import engine.db.archive.DataWarehouse; import engine.db.archive.DataWarehouse;
import engine.db.archive.GuildRecord; import engine.db.archive.GuildRecord;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
@@ -36,7 +35,7 @@ public class DisbandGuildHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter player; PlayerCharacter player;
Guild guild; Guild guild;
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.*; import engine.gameManager.*;
import engine.mbEnums; import engine.mbEnums;
import engine.mbEnums.GameObjectType; import engine.mbEnums.GameObjectType;
@@ -32,7 +31,7 @@ public class DismissGuildHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
DismissGuildMsg dismissMsg; DismissGuildMsg dismissMsg;
PlayerCharacter player; PlayerCharacter player;
@@ -1,7 +1,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.InterestManagement.WorldGrid; import engine.InterestManagement.WorldGrid;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums; import engine.mbEnums;
@@ -32,7 +31,7 @@ public class DoorTryOpenMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declaration // Member variable declaration
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.GroupManager; import engine.gameManager.GroupManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
@@ -27,8 +26,7 @@ public class FormationFollowHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
throws MsgSendException {
FormationFollowMsg msg = (FormationFollowMsg) baseMsg; FormationFollowMsg msg = (FormationFollowMsg) baseMsg;
PlayerCharacter source = SessionManager.getPlayerCharacter(origin); PlayerCharacter source = SessionManager.getPlayerCharacter(origin);
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
@@ -57,7 +56,7 @@ public class FriendAcceptHandler extends AbstractClientMsgHandler {
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, protected boolean _handleNetMsg(ClientNetMsg baseMsg,
ClientConnection origin) throws MsgSendException { ClientConnection origin) {
PlayerCharacter player = origin.getPlayerCharacter(); PlayerCharacter player = origin.getPlayerCharacter();
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
import engine.mbEnums.DispatchChannel; import engine.mbEnums.DispatchChannel;
@@ -42,7 +41,7 @@ public class FriendDeclineHandler extends AbstractClientMsgHandler {
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, protected boolean _handleNetMsg(ClientNetMsg baseMsg,
ClientConnection origin) throws MsgSendException { ClientConnection origin) {
PlayerCharacter player = origin.getPlayerCharacter(); PlayerCharacter player = origin.getPlayerCharacter();
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
@@ -47,7 +46,7 @@ public class FriendRequestHandler extends AbstractClientMsgHandler {
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, protected boolean _handleNetMsg(ClientNetMsg baseMsg,
ClientConnection origin) throws MsgSendException { ClientConnection origin) {
PlayerCharacter player = origin.getPlayerCharacter(); PlayerCharacter player = origin.getPlayerCharacter();
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums.DispatchChannel; import engine.mbEnums.DispatchChannel;
import engine.net.Dispatch; import engine.net.Dispatch;
@@ -26,7 +25,7 @@ public class FurnitureHandler extends AbstractClientMsgHandler {
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, protected boolean _handleNetMsg(ClientNetMsg baseMsg,
ClientConnection origin) throws MsgSendException { ClientConnection origin) {
FurnitureMsg msg = (FurnitureMsg) baseMsg; FurnitureMsg msg = (FurnitureMsg) baseMsg;
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
@@ -30,7 +29,7 @@ public class GameServerIPRequestMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
Session session = SessionManager.getSession(origin); Session session = SessionManager.getSession(origin);
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.GoldFromVaultMsg; import engine.net.client.msg.GoldFromVaultMsg;
@@ -22,7 +21,7 @@ public class GoldFromVaultMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter player = origin.getPlayerCharacter(); PlayerCharacter player = origin.getPlayerCharacter();
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.GoldToVaultMsg; import engine.net.client.msg.GoldToVaultMsg;
@@ -22,7 +21,7 @@ public class GoldToVaultMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter player = origin.getPlayerCharacter(); PlayerCharacter player = origin.getPlayerCharacter();
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ConfigManager; import engine.gameManager.ConfigManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.GroupManager; import engine.gameManager.GroupManager;
@@ -60,7 +59,7 @@ public class GroupInviteHandler extends AbstractClientMsgHandler {
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, protected boolean _handleNetMsg(ClientNetMsg baseMsg,
ClientConnection origin) throws MsgSendException { ClientConnection origin) {
GroupInviteMsg msg = (GroupInviteMsg) baseMsg; GroupInviteMsg msg = (GroupInviteMsg) baseMsg;
PlayerCharacter source = SessionManager.getPlayerCharacter(origin); PlayerCharacter source = SessionManager.getPlayerCharacter(origin);
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.GroupManager; import engine.gameManager.GroupManager;
@@ -34,7 +33,7 @@ public class GroupInviteResponseHandler extends AbstractClientMsgHandler {
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, protected boolean _handleNetMsg(ClientNetMsg baseMsg,
ClientConnection origin) throws MsgSendException { ClientConnection origin) {
GroupInviteResponseMsg msg = (GroupInviteResponseMsg) baseMsg; GroupInviteResponseMsg msg = (GroupInviteResponseMsg) baseMsg;
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
@@ -21,7 +20,7 @@ public class GroupUpdateHandler extends AbstractClientMsgHandler {
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, protected boolean _handleNetMsg(ClientNetMsg baseMsg,
ClientConnection origin) throws MsgSendException { ClientConnection origin) {
//GroupUpdateMsg msg = (GroupUpdateMsg) baseMsg; //GroupUpdateMsg msg = (GroupUpdateMsg) baseMsg;
// not sure what to do with these as we spend our time sending them // not sure what to do with these as we spend our time sending them
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
import engine.mbEnums; import engine.mbEnums;
@@ -31,7 +30,7 @@ public class GuildControlHandler extends AbstractClientMsgHandler {
// TODO Don't think this protocolMsg (0x3235E5EA) is actually player history. so // TODO Don't think this protocolMsg (0x3235E5EA) is actually player history. so
// take further look at it. // take further look at it.
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
GuildControlMsg msg = (GuildControlMsg) baseMsg; GuildControlMsg msg = (GuildControlMsg) baseMsg;
Dispatch dispatch; Dispatch dispatch;
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
@@ -20,7 +19,7 @@ public class GuildCreationCloseHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// GuildCreationCloseMsg msg = (GuildCreationCloseMsg) baseMsg; // GuildCreationCloseMsg msg = (GuildCreationCloseMsg) baseMsg;
// origin.sendMsg(msg); // origin.sendMsg(msg);
return true; return true;
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.*; import engine.gameManager.*;
import engine.mbEnums; import engine.mbEnums;
import engine.mbEnums.DispatchChannel; import engine.mbEnums.DispatchChannel;
@@ -34,7 +33,7 @@ public class GuildCreationFinalizeHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter player; PlayerCharacter player;
GuildCreationFinalizeMsg msg; GuildCreationFinalizeMsg msg;
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums; import engine.mbEnums;
import engine.net.Dispatch; import engine.net.Dispatch;
@@ -25,7 +24,7 @@ public class GuildCreationOptionsHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
GuildCreationOptionsMsg msg = (GuildCreationOptionsMsg) baseMsg; GuildCreationOptionsMsg msg = (GuildCreationOptionsMsg) baseMsg;
PlayerCharacter sourcePlayer = origin.getPlayerCharacter(); PlayerCharacter sourcePlayer = origin.getPlayerCharacter();
Dispatch dispatch; Dispatch dispatch;
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
import engine.mbEnums; import engine.mbEnums;
@@ -27,7 +26,7 @@ public class GuildInfoHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
GuildInfoMsg msg = (GuildInfoMsg) baseMsg; GuildInfoMsg msg = (GuildInfoMsg) baseMsg;
Dispatch dispatch; Dispatch dispatch;
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
@@ -20,7 +19,7 @@ public class GuildListHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// GuildListMsg msg = (GuildListMsg) baseMsg; // GuildListMsg msg = (GuildListMsg) baseMsg;
// GuildListMsg msg = new GuildListMsg(origin); // GuildListMsg msg = new GuildListMsg(origin);
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
@@ -27,7 +26,7 @@ public class GuildTreeStatusMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
GuildTreeStatusMsg msg = (GuildTreeStatusMsg) baseMsg; GuildTreeStatusMsg msg = (GuildTreeStatusMsg) baseMsg;
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
@@ -20,7 +19,7 @@ public class GuildUnknownHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// GuildUnknownMsg msg = (GuildUnknownMsg) baseMsg; // GuildUnknownMsg msg = (GuildUnknownMsg) baseMsg;
return true; return true;
} }
@@ -10,7 +10,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
@@ -31,7 +30,7 @@ public class HirelingServiceMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter player; PlayerCharacter player;
HirelingServiceMsg msg; HirelingServiceMsg msg;
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
@@ -24,7 +23,7 @@ public class IgnoreMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter playerCharacter = origin.getPlayerCharacter(); PlayerCharacter playerCharacter = origin.getPlayerCharacter();
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums; import engine.mbEnums;
import engine.net.Dispatch; import engine.net.Dispatch;
@@ -24,7 +23,7 @@ public class InvalidTradeRequestMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter playerCharacter = origin.getPlayerCharacter(); PlayerCharacter playerCharacter = origin.getPlayerCharacter();
@@ -10,7 +10,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.*; import engine.gameManager.*;
import engine.mbEnums; import engine.mbEnums;
import engine.mbEnums.GameObjectType; import engine.mbEnums.GameObjectType;
@@ -30,7 +29,7 @@ public class InviteToGuildHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
InviteToGuildMsg msg; InviteToGuildMsg msg;
PlayerCharacter sourcePlayer; PlayerCharacter sourcePlayer;
PlayerCharacter targetPlayer; PlayerCharacter targetPlayer;
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.*; import engine.gameManager.*;
import engine.mbEnums; import engine.mbEnums;
import engine.mbEnums.GameObjectType; import engine.mbEnums.GameObjectType;
@@ -33,7 +32,7 @@ public class InviteToSubHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter source; PlayerCharacter source;
PlayerCharacter target; PlayerCharacter target;
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums; import engine.mbEnums;
@@ -42,7 +41,7 @@ public class ItemFromVaultMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter player = origin.getPlayerCharacter(); PlayerCharacter player = origin.getPlayerCharacter();
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.*; import engine.gameManager.*;
import engine.loot.WorkOrder; import engine.loot.WorkOrder;
import engine.mbEnums; import engine.mbEnums;
@@ -37,7 +36,7 @@ public class ItemProductionMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declaration // Member variable declaration
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums; import engine.mbEnums;
@@ -42,7 +41,7 @@ public class ItemToVaultMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
ItemToVaultMsg msg = (ItemToVaultMsg) baseMsg; ItemToVaultMsg msg = (ItemToVaultMsg) baseMsg;
PlayerCharacter player = origin.getPlayerCharacter(); PlayerCharacter player = origin.getPlayerCharacter();
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums.DispatchChannel; import engine.mbEnums.DispatchChannel;
import engine.net.Dispatch; import engine.net.Dispatch;
@@ -24,7 +23,7 @@ public class KeepAliveServerClientHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter playerCharacter = origin.getPlayerCharacter(); PlayerCharacter playerCharacter = origin.getPlayerCharacter();
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.GroupManager; import engine.gameManager.GroupManager;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
@@ -22,7 +21,7 @@ public class LeaveGroupHandler extends AbstractClientMsgHandler {
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, protected boolean _handleNetMsg(ClientNetMsg baseMsg,
ClientConnection origin) throws MsgSendException { ClientConnection origin) {
GroupManager.LeaveGroup(origin); GroupManager.LeaveGroup(origin);
return true; return true;
} }
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.*; import engine.gameManager.*;
import engine.mbEnums; import engine.mbEnums;
import engine.mbEnums.GuildHistoryType; import engine.mbEnums.GuildHistoryType;
@@ -29,7 +28,7 @@ public class LeaveGuildHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
LeaveGuildMsg msg = (LeaveGuildMsg) baseMsg; LeaveGuildMsg msg = (LeaveGuildMsg) baseMsg;
Dispatch dispatch; Dispatch dispatch;
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
@@ -19,7 +18,7 @@ public class LeaveWorldMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
origin.disconnect(); origin.disconnect();
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
@@ -29,7 +28,7 @@ public class LockUnlockDoorMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declarations // Member variable declarations
@@ -1,7 +1,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.InterestManagement.WorldGrid; import engine.InterestManagement.WorldGrid;
import engine.exception.MsgSendException;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
import engine.mbEnums; import engine.mbEnums;
@@ -30,7 +29,7 @@ public class LoginToGameServerMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
LoginToGameServerMsg msg = (LoginToGameServerMsg) baseMsg; LoginToGameServerMsg msg = (LoginToGameServerMsg) baseMsg;
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.GroupManager; import engine.gameManager.GroupManager;
@@ -30,7 +29,7 @@ public class LootMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter player = origin.getPlayerCharacter(); PlayerCharacter player = origin.getPlayerCharacter();
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.InterestManagement.WorldGrid; import engine.InterestManagement.WorldGrid;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums; import engine.mbEnums;
import engine.mbEnums.DispatchChannel; import engine.mbEnums.DispatchChannel;
@@ -32,7 +31,7 @@ public class LootWindowRequestMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter player = origin.getPlayerCharacter(); PlayerCharacter player = origin.getPlayerCharacter();
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
@@ -29,7 +28,7 @@ public class MOTDCommitHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
MOTDCommitMsg msg = (MOTDCommitMsg) baseMsg; MOTDCommitMsg msg = (MOTDCommitMsg) baseMsg;
Dispatch dispatch; Dispatch dispatch;
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
import engine.mbEnums; import engine.mbEnums;
@@ -30,7 +29,7 @@ public class MOTDEditHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
MOTDMsg msg = (MOTDMsg) baseMsg; MOTDMsg msg = (MOTDMsg) baseMsg;
Dispatch dispatch; Dispatch dispatch;
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
@@ -54,7 +53,7 @@ public class ManageCityAssetMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
ManageCityAssetsMsg msg; ManageCityAssetsMsg msg;
PlayerCharacter player; PlayerCharacter player;
@@ -1,7 +1,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.InterestManagement.RealmMap; import engine.InterestManagement.RealmMap;
import engine.exception.MsgSendException;
import engine.gameManager.*; import engine.gameManager.*;
import engine.job.JobScheduler; import engine.job.JobScheduler;
import engine.jobs.TeleportJob; import engine.jobs.TeleportJob;
@@ -361,7 +360,7 @@ public class MerchantMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declaration // Member variable declaration
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
@@ -39,7 +38,7 @@ public class MineWindowChangeHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter playerCharacter = SessionManager.getPlayerCharacter(origin); PlayerCharacter playerCharacter = SessionManager.getPlayerCharacter(origin);
ArcMineWindowChangeMsg mineWindowChangeMsg = (ArcMineWindowChangeMsg) baseMsg; ArcMineWindowChangeMsg mineWindowChangeMsg = (ArcMineWindowChangeMsg) baseMsg;
@@ -1,7 +1,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.InterestManagement.WorldGrid; import engine.InterestManagement.WorldGrid;
import engine.exception.MsgSendException;
import engine.gameManager.*; import engine.gameManager.*;
import engine.mbEnums; import engine.mbEnums;
import engine.mbEnums.DispatchChannel; import engine.mbEnums.DispatchChannel;
@@ -24,7 +23,7 @@ public class MinionTrainingMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
MinionTrainingMessage minionMsg = (MinionTrainingMessage) baseMsg; MinionTrainingMessage minionMsg = (MinionTrainingMessage) baseMsg;
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
import engine.net.client.msg.ModifyStatMsg; import engine.net.client.msg.ModifyStatMsg;
@@ -22,7 +21,7 @@ public class ModifyStatMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter playerCharacter = origin.getPlayerCharacter(); PlayerCharacter playerCharacter = origin.getPlayerCharacter();
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.MovementManager; import engine.gameManager.MovementManager;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
@@ -24,7 +23,7 @@ public class MoveToPointHandler extends AbstractClientMsgHandler {
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, protected boolean _handleNetMsg(ClientNetMsg baseMsg,
ClientConnection origin) throws MsgSendException { ClientConnection origin) {
MoveToPointMsg msg = (MoveToPointMsg) baseMsg; MoveToPointMsg msg = (MoveToPointMsg) baseMsg;
PlayerCharacter pc = origin.getPlayerCharacter(); PlayerCharacter pc = origin.getPlayerCharacter();
if (pc == null) if (pc == null)
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.*; import engine.gameManager.*;
import engine.math.Bounds; import engine.math.Bounds;
import engine.math.Vector3fImmutable; import engine.math.Vector3fImmutable;
@@ -31,7 +30,7 @@ public class ObjectActionMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declaration // Member variable declaration
ObjectActionMsg msg; ObjectActionMsg msg;
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
@@ -31,7 +30,7 @@ public class OpenFriendsCondemnListMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter player = SessionManager.getPlayerCharacter(origin); PlayerCharacter player = SessionManager.getPlayerCharacter(origin);
Building sourceBuilding; Building sourceBuilding;
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
@@ -355,7 +354,7 @@ public class OrderNPCMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declarations // Member variable declarations
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.PowersManager; import engine.gameManager.PowersManager;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
@@ -21,7 +20,7 @@ public class PerformActionMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PerformActionMsg msg = (PerformActionMsg) baseMsg; PerformActionMsg msg = (PerformActionMsg) baseMsg;
PowersManager.usePower(msg, origin, false); // Wtf ? PowersManager.usePower(msg, origin, false); // Wtf ?
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.BuildingManager; import engine.gameManager.BuildingManager;
import engine.mbEnums; import engine.mbEnums;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
@@ -24,7 +23,7 @@ public class PetAttackMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter playerCharacter = origin.getPlayerCharacter(); PlayerCharacter playerCharacter = origin.getPlayerCharacter();
@@ -9,7 +9,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.InterestManagement.WorldGrid; import engine.InterestManagement.WorldGrid;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
import engine.net.client.msg.ClientNetMsg; import engine.net.client.msg.ClientNetMsg;
@@ -25,7 +24,7 @@ public class PetCmdMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
PlayerCharacter playerCharacter = origin.getPlayerCharacter(); PlayerCharacter playerCharacter = origin.getPlayerCharacter();
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DbManager; import engine.gameManager.DbManager;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums; import engine.mbEnums;
@@ -22,7 +21,7 @@ public class PetitionReceivedMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg msg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg msg, ClientConnection origin) {
if (msg == null) if (msg == null)
return true; return true;
@@ -5,7 +5,6 @@ import engine.InterestManagement.RealmMap;
import engine.InterestManagement.WorldGrid; import engine.InterestManagement.WorldGrid;
import engine.db.archive.CityRecord; import engine.db.archive.CityRecord;
import engine.db.archive.DataWarehouse; import engine.db.archive.DataWarehouse;
import engine.exception.MsgSendException;
import engine.gameManager.*; import engine.gameManager.*;
import engine.math.Bounds; import engine.math.Bounds;
import engine.math.Vector3fImmutable; import engine.math.Vector3fImmutable;
@@ -299,7 +298,7 @@ public class PlaceAssetMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declaration // Member variable declaration
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
import engine.math.Vector3fImmutable; import engine.math.Vector3fImmutable;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
@@ -27,7 +26,7 @@ public class PromptRecallMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable assignment // Member variable assignment
@@ -8,7 +8,6 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.DispatchManager; import engine.gameManager.DispatchManager;
import engine.mbEnums.DispatchChannel; import engine.mbEnums.DispatchChannel;
import engine.net.client.ClientConnection; import engine.net.client.ClientConnection;
@@ -26,7 +25,7 @@ public class RandomMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declaration // Member variable declaration
@@ -1,6 +1,5 @@
package engine.net.client.handlers; package engine.net.client.handlers;
import engine.exception.MsgSendException;
import engine.gameManager.ChatManager; import engine.gameManager.ChatManager;
import engine.gameManager.SessionManager; import engine.gameManager.SessionManager;
import engine.mbEnums.AllianceType; import engine.mbEnums.AllianceType;
@@ -55,7 +54,7 @@ public class RecommendNationMsgHandler extends AbstractClientMsgHandler {
} }
@Override @Override
protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) throws MsgSendException { protected boolean _handleNetMsg(ClientNetMsg baseMsg, ClientConnection origin) {
// Member variable declaration // Member variable declaration

Some files were not shown because too many files have changed in this diff Show More