Shorten lines in bucket and support nil placers

[oweals/minetest_game.git] / mods / bucket / init.lua

diff --git a/mods/bucket/init.lua b/mods/bucket/init.lua
index 5843bf77d325b532a0053cdc28719427be164bf5..3751cfe93c79436f5e5b7b32a9b40374c803d18b 100644 (file)
--- a/mods/bucket/init.lua
+++ b/mods/bucket/init.lua
@@ -18,6 +18,19 @@ minetest.register_craft({
 bucket = {}
 bucket.liquids = {}
 
+local function check_protection(pos, name, text)
+       if minetest.is_protected(pos, name) then
+               minetest.log("action", (name ~= "" and name or "A mod")
+                       .. " tried to " .. text
+                       .. " at protected position "
+                       .. minetest.pos_to_string(pos)
+                       .. " with a bucket")
+               minetest.record_protection_violation(pos, name)
+               return true
+       end
+       return false
+end
+
 -- Register a new liquid
 --   source = name of the source node
 --   flowing = name of the flowing node
@@ -44,10 +57,30 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
                                if pointed_thing.type ~= "node" then
                                        return
                                end
+                               
+                               -- Call on_rightclick if the pointed node defines it
+                               if user and not user:get_player_control().sneak then
+                                       local n = minetest.get_node(pointed_thing.under)
+                                       local nn = n.name
+                                       local ndef = minetest.registered_nodes[nn]
+                                       if ndef and ndef.on_rightclick then
+                                               return ndef.on_rightclick(
+                                                       pointed_thing.under,
+                                                       n, user,
+                                                       itemstack) or itemstack
+                                       end
+                               end
 
                                local place_liquid = function(pos, node, source, flowing, fullness)
-                                       if math.floor(fullness/128) == 1 or (not minetest.setting_getbool("liquid_finite")) then
-                                               minetest.add_node(pos, {name=source, param2=fullness})
+                                       if check_protection(pos,
+                                                       user and user:get_player_name() or "",
+                                                       "place "..source) then
+                                               return
+                                       end
+                                       if math.floor(fullness/128) == 1 or
+                                               not minetest.setting_getbool("liquid_finite") then
+                                               minetest.add_node(pos, {name=source,
+                                                               param2=fullness})
                                                return
                                        elseif node.name == flowing then
                                                fullness = fullness + node.param2
@@ -56,9 +89,11 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
                                        end
 
                                        if fullness >= LIQUID_MAX then
-                                               minetest.add_node(pos, {name=source, param2=LIQUID_MAX})
+                                               minetest.add_node(pos, {name=source,
+                                                               param2=LIQUID_MAX})
                                        else
-                                               minetest.add_node(pos, {name=flowing, param2=fullness})
+                                               minetest.add_node(pos, {name=flowing,
+                                                               param2=fullness})
                                        end
                                end
 
@@ -69,13 +104,16 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
 
                                if minetest.registered_nodes[node.name].buildable_to then
                                        -- buildable; replace the node
-                                       place_liquid(pointed_thing.under, node, source, flowing, fullness)
+                                       place_liquid(pointed_thing.under, node,
+                                                       source, flowing, fullness)
                                else
                                        -- not buildable to; place the liquid above
                                        -- check if the node above can be replaced
                                        local node = minetest.get_node(pointed_thing.above)
                                        if minetest.registered_nodes[node.name].buildable_to then
-                                               place_liquid(pointed_thing.above, node, source, flowing, fullness)
+                                               place_liquid(pointed_thing.above,
+                                                               node, source,
+                                                               flowing, fullness)
                                        else
                                                -- do not remove the bucket with the liquid
                                                return
@@ -100,13 +138,23 @@ minetest.register_craftitem("bucket:bucket_empty", {
                -- Check if pointing to a liquid source
                node = minetest.get_node(pointed_thing.under)
                liquiddef = bucket.liquids[node.name]
-               if liquiddef ~= nil and liquiddef.itemname ~= nil and (node.name == liquiddef.source or
-                       (node.name == liquiddef.flowing and minetest.setting_getbool("liquid_finite"))) then
+               if liquiddef ~= nil and liquiddef.itemname ~= nil and
+                       (node.name == liquiddef.source or
+                       (node.name == liquiddef.flowing and
+                               minetest.setting_getbool("liquid_finite"))) then
+                       if check_protection(pointed_thing.under,
+                                       user:get_player_name(),
+                                       "take ".. node.name) then
+                               return
+                       end
 
                        minetest.add_node(pointed_thing.under, {name="air"})
 
-                       if node.name == liquiddef.source then node.param2 = LIQUID_MAX end
-                       return ItemStack({name = liquiddef.itemname, metadata = tostring(node.param2)})
+                       if node.name == liquiddef.source then
+                               node.param2 = LIQUID_MAX
+                       end
+                       return ItemStack({name = liquiddef.itemname,
+                                       metadata = tostring(node.param2)})
                end
        end,
 })