Improve testSerializeJsonString unit tests

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

diff --git a/builtin/game/item_entity.lua b/builtin/game/item_entity.lua
index a85eba977b585608a0a30ce1c8a742b4435735ae..53f98a7c73c126e9905ef340d3af4038d0bfaea7 100644 (file)
--- a/builtin/game/item_entity.lua
+++ b/builtin/game/item_entity.lua
@@ -27,8 +27,6 @@ core.register_entity(":__builtin:item", {
                visual = "wielditem",
                visual_size = {x = 0.4, y = 0.4},
                textures = {""},
-               spritediv = {x = 1, y = 1},
-               initial_sprite_basepos = {x = 0, y = 0},
                is_visible = false,
        },
 
@@ -56,23 +54,25 @@ core.register_entity(":__builtin:item", {
                local max_count = stack:get_stack_max()
                local count = math.min(stack:get_count(), max_count)
                local size = 0.2 + 0.1 * (count / max_count) ^ (1 / 3)
-               local coll_height = size * 0.75
-               local def = core.registered_nodes[itemname]
-               local glow = def and math.floor(def.light_source / 2 + 0.5)
+               local def = core.registered_items[itemname]
+               local glow = def and def.light_source and
+                       math.floor(def.light_source / 2 + 0.5)
 
+               local size_bias = 1e-3 * math.random() -- small random bias to counter Z-fighting
+               local c = {-size, -size, -size, size, size, size}
                self.object:set_properties({
                        is_visible = true,
                        visual = "wielditem",
                        textures = {itemname},
-                       visual_size = {x = size, y = size},
-                       collisionbox = {-size, -coll_height, -size,
-                               size, coll_height, size},
-                       selectionbox = {-size, -size, -size, size, size, size},
+                       visual_size = {x = size + size_bias, y = size + size_bias},
+                       collisionbox = c,
                        automatic_rotate = math.pi * 0.5 * 0.2 / size,
                        wield_item = self.itemstring,
                        glow = glow,
                })
 
+               -- cache for usage in on_step
+               self._collisionbox = c
        end,
 
        get_staticdata = function(self)
@@ -97,6 +97,7 @@ core.register_entity(":__builtin:item", {
                self.object:set_armor_groups({immortal = 1})
                self.object:set_velocity({x = 0, y = 2, z = 0})
                self.object:set_acceleration({x = 0, y = -gravity, z = 0})
+               self._collisionbox = self.initial_properties.collisionbox
                self:set_item()
        end,
 
@@ -167,7 +168,7 @@ core.register_entity(":__builtin:item", {
                local pos = self.object:get_pos()
                local node = core.get_node_or_nil({
                        x = pos.x,
-                       y = pos.y + self.object:get_properties().collisionbox[2] - 0.05,
+                       y = pos.y + self._collisionbox[2] - 0.05,
                        z = pos.z
                })
                -- Delete in 'ignore' nodes
@@ -180,7 +181,7 @@ core.register_entity(":__builtin:item", {
                if self.force_out then
                        -- This code runs after the entity got a push from the is_stuck code.
                        -- It makes sure the entity is entirely outside the solid node
-                       local c = self.object:get_properties().collisionbox
+                       local c = self._collisionbox
                        local s = self.force_out_start
                        local f = self.force_out
                        local ok = (f.x > 0 and pos.x + c[1] > s.x + 0.5) or
@@ -200,7 +201,9 @@ core.register_entity(":__builtin:item", {
                        return -- Don't do anything
                end
 
-               assert(moveresult)
+               assert(moveresult,
+                       "Collision info missing, this is caused by an out-of-date/buggy mod or game")
+
                if not moveresult.collides then
                        -- future TODO: items should probably decelerate in air
                        return