Skip to content

Commit

Permalink
Save metainfo for falling nodes
Browse files Browse the repository at this point in the history
  • Loading branch information
vladtcvs authored and sofar committed Mar 12, 2017
1 parent ff80696 commit 7a4878c
Showing 1 changed file with 25 additions and 8 deletions.
33 changes: 25 additions & 8 deletions builtin/game/falling.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,33 @@ core.register_entity(":__builtin:falling_node", {
},

node = {},
meta = {},

set_node = function(self, node)
set_node = function(self, node, meta)
self.node = node
self.meta = meta or {}
self.object:set_properties({
is_visible = true,
textures = {node.name},
})
end,

get_staticdata = function(self)
return core.serialize(self.node)
local ds = {
node = self.node,
meta = self.meta,
}
return core.serialize(ds)
end,

on_activate = function(self, staticdata)
self.object:set_armor_groups({immortal = 1})

local node = core.deserialize(staticdata)
if node then
self:set_node(node)
local ds = core.deserialize(staticdata)
if ds and ds.node then
self:set_node(ds.node, ds.meta)
elseif ds then
self:set_node(ds)
elseif staticdata ~= "" then
self:set_node({name = staticdata})
end
Expand Down Expand Up @@ -98,6 +106,10 @@ core.register_entity(":__builtin:falling_node", {
-- Create node and remove entity
if core.registered_nodes[self.node.name] then
core.add_node(np, self.node)
if self.meta then
local meta = core.get_meta(np)
meta:from_table(self.meta)
end
end
self.object:remove()
core.check_for_falling(np)
Expand All @@ -111,10 +123,10 @@ core.register_entity(":__builtin:falling_node", {
end
})

local function spawn_falling_node(p, node)
local function spawn_falling_node(p, node, meta)
local obj = core.add_entity(p, "__builtin:falling_node")
if obj then
obj:get_luaentity():set_node(node)
obj:get_luaentity():set_node(node, meta)
end
end

Expand Down Expand Up @@ -189,8 +201,13 @@ function core.check_single_for_falling(p)

(not d_bottom.walkable or d_bottom.buildable_to) then
n.level = core.get_node_level(p)
local meta = core.get_meta(p)
local metatable = {}
if meta ~= nil then
metatable = meta:to_table()
end
core.remove_node(p)
spawn_falling_node(p, n)
spawn_falling_node(p, n, metatable)
return true
end
end
Expand Down

0 comments on commit 7a4878c

Please sign in to comment.