From ad96df191b262aad311e28cba26d18316590bf28 Mon Sep 17 00:00:00 2001
From: Warr1024 <warr1024@gmail.com>
Date: Sat, 5 Oct 2019 09:46:57 -0400
Subject: Merge pull request #8166 from Warr1024/fix7020

Fix (or workaround?) for 'Falling nodes with node inventory cause crash when unloaded'
---
 builtin/game/falling.lua | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'builtin')

diff --git a/builtin/game/falling.lua b/builtin/game/falling.lua
index df213e304..950d6b56f 100644
--- a/builtin/game/falling.lua
+++ b/builtin/game/falling.lua
@@ -22,7 +22,18 @@ core.register_entity(":__builtin:falling_node", {
 
 	set_node = function(self, node, meta)
 		self.node = node
-		self.meta = meta or {}
+		meta = meta or {}
+		if type(meta.to_table) == "function" then
+			meta = meta:to_table()
+		end
+		for _, list in pairs(meta.inventory or {}) do
+			for i, stack in pairs(list) do
+				if type(stack) == "userdata" then
+					list[i] = stack:to_string()
+				end
+			end
+		end
+		self.meta = meta
 		self.object:set_properties({
 			is_visible = true,
 			textures = {node.name},
-- 
cgit v1.2.3