From c054b27f628f23fecc505b9e09e78721738f3c4e Mon Sep 17 00:00:00 2001
From: historia <[not public]>
Date: Wed, 16 Sep 2026 13:52:58 -0400
Subject: fix: shutdown admission, recovery identity/order, rollback journal
 retention, pickup merge

---
 internal/game/cmd_get.go | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'internal/game/cmd_get.go')

diff --git a/internal/game/cmd_get.go b/internal/game/cmd_get.go
index d538afc..515d2ab 100644
--- a/internal/game/cmd_get.go
+++ b/internal/game/cmd_get.go
@@ -68,11 +68,10 @@ func (g *Game) doGet(sess *net.Session, input string) {
 		qty = available
 	}
 
-	freeSlot := p.FirstFreeSlot()
-	if freeSlot == -1 {
-		sess.WriteLine("Your inventory is full.")
-		return
-	}
+	// No premature free-slot gate here: a stackable pickup may merge into an
+	// existing stack even when every slot is occupied, so capacity is only
+	// required when a new slot is actually needed (matching doGetAll and
+	// doGetAllNamed). See TestPickupMergesIntoFullInventory.
 
 	if def != nil && def.Stackable {
 		for i := 0; i < 28; i++ {
@@ -89,7 +88,7 @@ func (g *Game) doGet(sess *net.Session, input string) {
 				return
 			}
 		}
-		freeSlot = p.FirstFreeSlot()
+		freeSlot := p.FirstFreeSlot()
 		if freeSlot == -1 {
 			sess.WriteLine("Your inventory is full.")
 			return
-- 
cgit v1.2.3