Add private messaging with /msg

[minetest.git] / builtin / item_entity.lua

diff --git a/builtin/item_entity.lua b/builtin/item_entity.lua
index 8657e64af822e9b5ad1ff6c0e4598827a4fb3edd..50ce7eafedc3b8212079dfac4e4941796ef0a54a 100644 (file)
--- a/builtin/item_entity.lua
+++ b/builtin/item_entity.lua
@@ -41,17 +41,17 @@ minetest.register_entity("__builtin:item", {
                prop = {
                        is_visible = true,
                        visual = "sprite",
-                       textures = {"unknown_item.png"},
-                       visual_size = {x=0.50, y=0.50}
+                       textures = {"unknown_item.png"}
                }
-               if item_type == "node" then
+               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}
                        prop.visual_size = {x=0.20, y=0.20}
                        prop.automatic_rotate = math.pi * 0.25
-               elseif item_texture and item_texture ~= "" then
-                       prop.visual = "sprite"
-                       prop.textures = {item_texture}
                end
                self.object:set_properties(prop)
        end,
@@ -84,8 +84,9 @@ minetest.register_entity("__builtin:item", {
                local p = self.object:getpos()
                p.y = p.y - 0.3
                local nn = minetest.env:get_node(p).name
-               -- If node is not registered or node is walkably solid
-               if not minetest.registered_nodes[nn] or minetest.registered_nodes[nn].walkable then
+               -- 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})
@@ -108,7 +109,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,