From ec703a39738fefb60817f5659f76f8e683f8d301 Mon Sep 17 00:00:00 2001
From: historia <[not public]>
Date: Mon, 5 Oct 2026 17:39:06 -0400
Subject: fix: admin undo/redo failure, video poker cabinet ids, room ref
 behavior

---
 internal/world/room.go | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'internal/world/room.go')

diff --git a/internal/world/room.go b/internal/world/room.go
index e200f32..9b9bef7 100644
--- a/internal/world/room.go
+++ b/internal/world/room.go
@@ -171,6 +171,13 @@ func (ro *RoomObject) UnmarshalYAML(value *yaml.Node) error {
 		ro.Local = &def
 		return nil
 	}
+	// A reference entry (no name/description) that also carries behavior
+	// fields silently loses them at runtime, because the loader always uses
+	// the object file. Reject it instead of discarding authored behavior.
+	if def.RemovalItem != "" || len(def.OnUse) > 0 || def.Steal != nil ||
+		def.Gather != nil || def.Talk != nil || def.Safespot != nil {
+		return fmt.Errorf("room object entry %q cannot carry behavior (on_use/gather/talk/steal/removal_item/safespot); define it in objects/%s.yaml or give the entry a name", ref.ID, ref.ID)
+	}
 	ro.ID = ref.ID
 	ro.HiddenOverride = ref.Hidden
 	return nil
-- 
cgit v1.2.3