PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-12 23:14:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

better safe than sorry

Browse source
This commit is contained in:
FateJH 2018-05-17 22:00:19 -04:00
parent 0b15837436
commit 70b5d79c6d
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
pslogin/src/main/scala/WorldSessionActor.scala
View file

@ -1767,11 +1767,13 @@ class WorldSessionActor extends Actor with MDCContextAware {
CSRZone.read(traveler, msg) match { CSRZone.read(traveler, msg) match {
case (true, zone, pos) => case (true, zone, pos) =>
if(player.isAlive) { 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 player.Position = pos
traveler.zone = zone traveler.zone = zone
continent.Population ! Zone.Population.Release(avatar) continent.Population ! Zone.Population.Release(avatar)
continent.Population ! Zone.Population.Leave(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) taskResolver ! TaskBeforeZoneChange(GUIDTask.UnregisterAvatar(player)(continent.GUID), zone)
} }
@ -1781,6 +1783,7 @@ class WorldSessionActor extends Actor with MDCContextAware {
CSRWarp.read(traveler, msg) match { CSRWarp.read(traveler, msg) match {
case (true, pos) => case (true, pos) =>
if(player.isAlive) { if(player.isAlive) {
PlayerActionsToCancel()
sendResponse(PlayerStateShiftMessage(ShiftState(0, pos, player.Orientation.z, None))) sendResponse(PlayerStateShiftMessage(ShiftState(0, pos, player.Orientation.z, None)))
player.Position = pos player.Position = pos
} }