Builtin/../falling.lua: Code optimisation

[minetest.git] / builtin / game / item_entity.lua

diff --git a/builtin/game/item_entity.lua b/builtin/game/item_entity.lua
index d848fd8551a1884237518317f5bc9a671d0bc387..be158c119b24ccdf5df6e27fc4fefaf412fb7e5a 100644 (file)
--- a/builtin/game/item_entity.lua
+++ b/builtin/game/item_entity.lua
@@ -4,11 +4,14 @@ function core.spawn_item(pos, item)
        -- Take item in any format
        local stack = ItemStack(item)
        local obj = core.add_entity(pos, "__builtin:item")
-       obj:get_luaentity():set_item(stack:to_string())
+       -- Don't use obj if it couldn't be added to the map.
+       if obj then
+               obj:get_luaentity():set_item(stack:to_string())
+       end
        return obj
 end
 
--- If item_entity_ttl is not set, enity will have default life time 
+-- If item_entity_ttl is not set, enity will have default life time
 -- Setting it to -1 disables the feature
 
 local time_to_live = tonumber(core.setting_get("item_entity_ttl"))
@@ -71,7 +74,8 @@ core.register_entity(":__builtin:item", {
                return core.serialize({
                        itemstring = self.itemstring,
                        always_collect = self.always_collect,
-                       age = self.age
+                       age = self.age,
+                       dropped_by = self.dropped_by
                })
        end,
 
@@ -81,11 +85,12 @@ core.register_entity(":__builtin:item", {
                        if data and type(data) == "table" then
                                self.itemstring = data.itemstring
                                self.always_collect = data.always_collect
-                               if data.age then 
+                               if data.age then
                                        self.age = data.age + dtime_s
                                else
                                        self.age = dtime_s
                                end
+                               self.dropped_by = data.dropped_by
                        end
                else
                        self.itemstring = staticdata
@@ -155,7 +160,17 @@ core.register_entity(":__builtin:item", {
                end
                local p = self.object:getpos()
                p.y = p.y - 0.5
-               local nn = core.get_node(p).name
+               local node = core.get_node_or_nil(p)
+               local in_unloaded = (node == nil)
+               if in_unloaded then
+                       -- Don't infinetly fall into unloaded map
+                       self.object:setvelocity({x = 0, y = 0, z = 0})
+                       self.object:setacceleration({x = 0, y = 0, z = 0})
+                       self.physical_state = false
+                       self.object:set_properties({physical = false})
+                       return
+               end
+               local nn = node.name
                -- If node is not registered or node is walkably solid and resting on nodebox
                local v = self.object:getvelocity()
                if not core.registered_nodes[nn] or core.registered_nodes[nn].walkable and v.y == 0 then
@@ -187,9 +202,10 @@ core.register_entity(":__builtin:item", {
        end,
 
        on_punch = function(self, hitter)
-               if self.itemstring ~= '' then
-                       local left = hitter:get_inventory():add_item("main", self.itemstring)
-                       if not left:is_empty() then
+               local inv = hitter:get_inventory()
+               if inv and self.itemstring ~= '' then
+                       local left = inv:add_item("main", self.itemstring)
+                       if left and not left:is_empty() then
                                self.itemstring = left:to_string()
                                return
                        end