diff options
Diffstat (limited to 'internal/game/cmd_stop.go')
| -rw-r--r-- | internal/game/cmd_stop.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/internal/game/cmd_stop.go b/internal/game/cmd_stop.go index 7a403f1..bfd8fd4 100644 --- a/internal/game/cmd_stop.go +++ b/internal/game/cmd_stop.go @@ -1,13 +1,14 @@ package game import ( + "thehouseoficarus/internal/combat" "thehouseoficarus/internal/net" ) func (g *Game) executeStop(sess *net.Session, args []string, rawInput string) { p := sess.Player - as, ok := p.ActionState.(*ActionState) - if !ok || as == nil || as.Type == "" { + ss, _ := g.safespot.Get(p.Name) + if p.Action == nil && p.BackgroundAction == nil && combat.GetCombat(p.Name) == nil && p.MoveTicks == 0 && len(p.WalkSequence) == 0 && !ss.Active { sess.WriteLine("You're not doing anything.") return } |