diff options
Diffstat (limited to 'internal/game/cmd_estate_directory.go')
| -rw-r--r-- | internal/game/cmd_estate_directory.go | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/internal/game/cmd_estate_directory.go b/internal/game/cmd_estate_directory.go index 83c5b80..f29f671 100644 --- a/internal/game/cmd_estate_directory.go +++ b/internal/game/cmd_estate_directory.go @@ -205,26 +205,22 @@ func (g *Game) teleportPlayer(sess *net.Session, p *player.Player, roomID int) { } } - // A teleport changes rooms just like a walk, so it must clear any safespot - // cover: isSafespotted/safespotBlocksMelee/safespotBlocksHazard compare no - // room, so leaving the state active grants melee and hazard immunity in the - // destination and keeps the player as a phantom occupant of the old cover. - if ss, ok := g.safespot.Get(p.Name); ok { - g.forceLeaveSafespot(sess, p, &ss, "") - } + // A teleport changes rooms just like a walk: clear the safespot cover and + // every in-flight move/action/combat/sequence so no stale state follows the + // player into the destination or drags them back later (see relocatePlayer). + g.relocatePlayer(sess, p, roomID) + g.saveCharacter(p) - p.RoomID = roomID - p.Stats.RecordRoomVisit(roomID) + g.World.SeedGroundItems(p.RoomID) + g.seedRoomMobs(p.RoomID) + g.seedRoomObjects(p.RoomID) if g.Hub != nil { g.Hub.LeaveRoom(sess) g.Hub.EnterRoom(sess, p.RoomID) } - g.World.SeedGroundItems(p.RoomID) - g.seedRoomMobs(p.RoomID) - g.seedRoomObjects(p.RoomID) - g.saveCharacter(p) g.doLook(sess) g.runEnterSteps(sess, p.RoomID) + g.checkAggro(sess) g.writePrompt(sess) } |