resume hacking and reviving and upgrading after interruption (#375)

This commit is contained in:
Fate-JH 2020-04-18 19:40:50 -04:00 committed by GitHub
parent 2800d4da0d
commit 16fcb2b927
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -4198,7 +4198,6 @@ class WorldSessionActor extends Actor
continent.Population ! Zone.Population.Release(avatar) continent.Population ! Zone.Population.Release(avatar)
player.VehicleSeated match { player.VehicleSeated match {
case None => case None =>
log.info("not in vehicle")
PrepareToTurnPlayerIntoCorpse(player, continent) PrepareToTurnPlayerIntoCorpse(player, continent)
case Some(_) => case Some(_) =>
@ -4852,7 +4851,8 @@ class WorldSessionActor extends Actor
trigger.Companion = None trigger.Companion = None
case _ => ; case _ => ;
} }
progressBarUpdate.cancel //TODO independent action? progressBarUpdate.cancel
progressBarValue = None
case msg@EmoteMsg(avatar_guid, emote) => case msg@EmoteMsg(avatar_guid, emote) =>
log.info("Emote: " + msg) log.info("Emote: " + msg)
@ -6195,6 +6195,8 @@ class WorldSessionActor extends Actor
sendResponse(TargetingInfoMessage(targetInfo)) sendResponse(TargetingInfoMessage(targetInfo))
case msg @ ActionCancelMessage(u1, u2, u3) => case msg @ ActionCancelMessage(u1, u2, u3) =>
log.info("Cancelled: "+msg) log.info("Cancelled: "+msg)
progressBarUpdate.cancel
progressBarValue = None
case default => log.error(s"Unhandled GamePacket $pkt") case default => log.error(s"Unhandled GamePacket $pkt")
} }