Add forceloading

[dragonfireclient.git] / builtin / item_entity.lua

diff --git a/builtin/item_entity.lua b/builtin/item_entity.lua
index ad0060b48e5f16afef20901eee7e00ee5f166d96..95affe3da0cd083002198b62ec03200aea8cfbec 100644 (file)
--- a/builtin/item_entity.lua
+++ b/builtin/item_entity.lua
@@ -3,7 +3,7 @@
 function minetest.spawn_item(pos, item)
        -- Take item in any format
        local stack = ItemStack(item)
-       local obj = minetest.env:add_entity(pos, "__builtin:item")
+       local obj = minetest.add_entity(pos, "__builtin:item")
        obj:get_luaentity():set_item(stack:to_string())
        return obj
 end
@@ -12,6 +12,7 @@ minetest.register_entity("__builtin:item", {
        initial_properties = {
                hp_max = 1,
                physical = true,
+               collide_with_objects = false,
                collisionbox = {-0.17,-0.17,-0.17, 0.17,0.17,0.17},
                visual = "sprite",
                visual_size = {x=0.5, y=0.5},
@@ -46,6 +47,7 @@ minetest.register_entity("__builtin:item", {
                if item_texture and item_texture ~= "" then
                        prop.visual = "sprite"
                        prop.textures = {item_texture}
+                       prop.visual_size = {x=0.50, y=0.50}
                else
                        prop.visual = "wielditem"
                        prop.textures = {itemname}
@@ -56,11 +58,23 @@ minetest.register_entity("__builtin:item", {
        end,
 
        get_staticdata = function(self)
-               return self.itemstring
+               --return self.itemstring
+               return minetest.serialize({
+                       itemstring = self.itemstring,
+                       always_collect = self.always_collect,
+               })
        end,
 
        on_activate = function(self, staticdata)
-               self.itemstring = staticdata
+               if string.sub(staticdata, 1, string.len("return")) == "return" then
+                       local data = minetest.deserialize(staticdata)
+                       if data and type(data) == "table" then
+                               self.itemstring = data.itemstring
+                               self.always_collect = data.always_collect
+                       end
+               else
+                       self.itemstring = staticdata
+               end
                self.object:set_armor_groups({immortal=1})
                self.object:setvelocity({x=0, y=2, z=0})
                self.object:setacceleration({x=0, y=-10, z=0})
@@ -70,8 +84,10 @@ minetest.register_entity("__builtin:item", {
        on_step = function(self, dtime)
                local p = self.object:getpos()
                p.y = p.y - 0.3
-               local nn = minetest.env:get_node(p).name
-               if minetest.registered_nodes[nn].walkable then
+               local nn = minetest.get_node(p).name
+               -- If node is not registered or node is walkably solid and resting on nodebox
+               local v = self.object:getvelocity()
+               if not minetest.registered_nodes[nn] or minetest.registered_nodes[nn].walkable and v.y == 0 then
                        if self.physical_state then
                                self.object:setvelocity({x=0,y=0,z=0})
                                self.object:setacceleration({x=0, y=0, z=0})
@@ -94,7 +110,11 @@ minetest.register_entity("__builtin:item", {
 
        on_punch = function(self, hitter)
                if self.itemstring ~= '' then
-                       hitter:get_inventory():add_item("main", self.itemstring)
+                       local left = hitter:get_inventory():add_item("main", self.itemstring)
+                       if not left:is_empty() then
+                               self.itemstring = left:to_string()
+                               return
+                       end
                end
                self.object:remove()
        end,