forked from MagicBane/Server
fix location desync caused by power casting
This commit is contained in:
@@ -107,6 +107,9 @@ public enum MovementManager {
|
|||||||
// ((Mob)toMove).updateLocation();
|
// ((Mob)toMove).updateLocation();
|
||||||
// get start and end locations for the move
|
// get start and end locations for the move
|
||||||
Vector3fImmutable startLocation = new Vector3fImmutable(msg.getStartLat(), msg.getStartAlt(), msg.getStartLon());
|
Vector3fImmutable startLocation = new Vector3fImmutable(msg.getStartLat(), msg.getStartAlt(), msg.getStartLon());
|
||||||
|
//if(toMove.isMoving()){
|
||||||
|
// startLocation = toMove.getMovementLoc();
|
||||||
|
//}
|
||||||
Vector3fImmutable endLocation = new Vector3fImmutable(msg.getEndLat(), msg.getEndAlt(), msg.getEndLon());
|
Vector3fImmutable endLocation = new Vector3fImmutable(msg.getEndLat(), msg.getEndAlt(), msg.getEndLon());
|
||||||
|
|
||||||
// if (toMove.getObjectType() == GameObjectType.PlayerCharacter)
|
// if (toMove.getObjectType() == GameObjectType.PlayerCharacter)
|
||||||
|
|||||||
@@ -172,8 +172,8 @@ public enum PowersManager {
|
|||||||
if(!pc.isFlying() && powersBaseByToken.get(msg.getPowerUsedID()) != null && powersBaseByToken.get(msg.getPowerUsedID()).isSpell) //cant be sitting if flying
|
if(!pc.isFlying() && powersBaseByToken.get(msg.getPowerUsedID()) != null && powersBaseByToken.get(msg.getPowerUsedID()).isSpell) //cant be sitting if flying
|
||||||
CombatManager.toggleSit(false,origin);
|
CombatManager.toggleSit(false,origin);
|
||||||
|
|
||||||
if(pc.isMoving())
|
//if(pc.isMoving())
|
||||||
pc.stopMovement(pc.getMovementLoc());
|
//pc.stopMovement(pc.getMovementLoc());
|
||||||
if(msg.getPowerUsedID() != 421084024 && origin.getPlayerCharacter().getPromotionClassID() != 2513) {
|
if(msg.getPowerUsedID() != 421084024 && origin.getPlayerCharacter().getPromotionClassID() != 2513) {
|
||||||
if (!origin.getPlayerCharacter().getPowers().containsKey(msg.getPowerUsedID())) {
|
if (!origin.getPlayerCharacter().getPowers().containsKey(msg.getPowerUsedID())) {
|
||||||
Logger.error(origin.getPlayerCharacter().getFirstName() + " attempted to cast a power they do not have");
|
Logger.error(origin.getPlayerCharacter().getFirstName() + " attempted to cast a power they do not have");
|
||||||
|
|||||||
Reference in New Issue
Block a user