From 8bc5c3e56848ebe9842a093145d4391d0eb70531 Mon Sep 17 00:00:00 2001
From: Thomas <72444570+Applevangelist@users.noreply.github.com>
Date: Tue, 11 Aug 2026 13:24:38 +0200
Subject: [PATCH] Update Scenery.lua

#SCENERY - return nil on register when no underlying object found
---
 Moose Development/Moose/Wrapper/Scenery.lua | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Moose Development/Moose/Wrapper/Scenery.lua b/Moose Development/Moose/Wrapper/Scenery.lua
index ea1f8f8f0..b9fa735a4 100644
--- a/Moose Development/Moose/Wrapper/Scenery.lua	
+++ b/Moose Development/Moose/Wrapper/Scenery.lua	
@@ -61,9 +61,19 @@ function SCENERY:Register( SceneryName, SceneryObject, SceneryZone )
   end
   
   if _SCENERY[ID] then return _SCENERY[ID] end
+
+  if SceneryObject == nil and SceneryZone == nil then return nil end -- no object to attach to
     
   local self = BASE:Inherit( self, POSITIONABLE:New( SceneryName ) )
-  
+
+  if SceneryObject == nil and SceneryZone ~= nil then
+    SceneryObject = self:FindByZoneName(SceneryZone)
+    if SceneryObject==nil then 
+        self=nil 
+        return nil 
+    end
+  end
+    
   self.SceneryName = tostring(SceneryName)
   self.ID = ID
   self.SceneryObject = SceneryObject