From 70b5d79c6dcb3fcbe785e3ef7c3b43b7be1b5bdc Mon Sep 17 00:00:00 2001 From: FateJH Date: Thu, 17 May 2018 22:00:19 -0400 Subject: [PATCH] better safe than sorry --- pslogin/src/main/scala/WorldSessionActor.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pslogin/src/main/scala/WorldSessionActor.scala b/pslogin/src/main/scala/WorldSessionActor.scala index b66a2f385..c3c73fdbe 100644 --- a/pslogin/src/main/scala/WorldSessionActor.scala +++ b/pslogin/src/main/scala/WorldSessionActor.scala @@ -1767,11 +1767,13 @@ class WorldSessionActor extends Actor with MDCContextAware { CSRZone.read(traveler, msg) match { case (true, zone, pos) => if(player.isAlive) { - player.Die //die to suspend position client-driven change updates + player.Die //die to suspend client-driven position change updates + PlayerActionsToCancel() player.Position = pos traveler.zone = zone continent.Population ! Zone.Population.Release(avatar) continent.Population ! Zone.Population.Leave(avatar) + avatarService ! AvatarServiceMessage(continent.Id, AvatarAction.ObjectDelete(player.GUID, player.GUID)) taskResolver ! TaskBeforeZoneChange(GUIDTask.UnregisterAvatar(player)(continent.GUID), zone) } @@ -1781,6 +1783,7 @@ class WorldSessionActor extends Actor with MDCContextAware { CSRWarp.read(traveler, msg) match { case (true, pos) => if(player.isAlive) { + PlayerActionsToCancel() sendResponse(PlayerStateShiftMessage(ShiftState(0, pos, player.Orientation.z, None))) player.Position = pos }