slop refactor

1 files changed, 3 insertions, 4 deletions

diff --git a/internal/game/cmd_quit.go b/internal/game/cmd_quit.go
index 4599614..2740275 100644
--- a/internal/game/cmd_quit.go
+++ b/internal/game/cmd_quit.go
@@ -1,7 +1,6 @@
 package game
 
 import (
-	"thehouseoficarus/internal/combat"
 	"thehouseoficarus/internal/engine"
 	"thehouseoficarus/internal/net"
 )
@@ -13,7 +12,7 @@ func (g *Game) executeQuit(sess *net.Session, args []string, rawInput string) {
 func (g *Game) doQuit(sess *net.Session) {
 	p := sess.Player
 
-	if combat.GetCombat(p.Name) != nil {
+	if g.Combat.Get(p.Name) != nil {
 		sess.WriteLine("You can't rest during combat!")
 		return
 	}
@@ -36,8 +35,8 @@ func (g *Game) doQuit(sess *net.Session) {
 			g.cancelRest(p.Name)
 			g.AccountStore.SaveCharacter(p)
 			g.charsMu.Lock()
-		delete(g.loggedInChars, p.Name)
-		g.charsMu.Unlock()
+			delete(g.loggedInChars, p.Name)
+			g.charsMu.Unlock()
 			if g.Hub != nil {
 				g.Hub.LeaveRoom(sess)
 			}