forked from MagicBane/Server
move to point handler revert
This commit is contained in:
@@ -28,33 +28,9 @@ public class MoveToPointHandler extends AbstractClientMsgHandler {
|
|||||||
protected boolean _handleNetMsg(ClientNetMsg baseMsg,
|
protected boolean _handleNetMsg(ClientNetMsg baseMsg,
|
||||||
ClientConnection origin) throws MsgSendException {
|
ClientConnection origin) throws MsgSendException {
|
||||||
MoveToPointMsg msg = (MoveToPointMsg) baseMsg;
|
MoveToPointMsg msg = (MoveToPointMsg) baseMsg;
|
||||||
|
PlayerCharacter pc = origin.getPlayerCharacter();
|
||||||
PlayerCharacter pc = (origin != null) ? (origin.getPlayerCharacter()) : null;
|
if(pc == null)
|
||||||
if (pc == null)
|
|
||||||
return false;
|
|
||||||
if (msg.getInitiatedFromAttack() == 1) {
|
|
||||||
//move message was initiated by an attack message
|
|
||||||
Enum.GameObjectType combatTargetType = pc.combatTarget.getObjectType();
|
|
||||||
if (combatTargetType.equals(Enum.GameObjectType.NPC)) {
|
|
||||||
msg.clearTarget();
|
|
||||||
pc.setCombatTarget(null);
|
|
||||||
origin.sendMsg(msg);
|
|
||||||
} else if (combatTargetType.equals(Enum.GameObjectType.Building)) {
|
|
||||||
Building targetBuilding = BuildingManager.getBuilding(pc.combatTarget.getObjectUUID());
|
|
||||||
if (targetBuilding != null) {
|
|
||||||
if (!targetBuilding.isVulnerable() || targetBuilding.getRank() < 0) {
|
|
||||||
msg.clearTarget();
|
|
||||||
pc.setCombatTarget(null);
|
|
||||||
origin.sendMsg(msg);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
msg.setEndCoord(pc.loc);
|
|
||||||
origin.sendMsg(msg);
|
|
||||||
return true;
|
return true;
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
MovementManager.movement(msg, pc);
|
MovementManager.movement(msg, pc);
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
Reference in New Issue
Block a user