sixam/minetest
Template
2
0
Fork 0
mirror of https://github.com/luanti-org/minetest_game.git synced 2025-06-06 22:04:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Put the node definition search where it belongs

Browse source 
When people just want to get water, it could be a bit of an annoyance to search every time you punch water. Now you only search if the node isn't liquid.
This commit is contained in:
C1ffisme 2016-04-14 09:18:14 -05:00
parent c01f86ff02
commit f17dc13630
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
mods/bucket/init.lua
View file

@ -119,7 +119,6 @@ minetest.register_craftitem("bucket:bucket_empty", {
local node = minetest.get_node(pointed_thing.under)
local liquiddef = bucket.liquids[node.name]
local item_count = user:get_wielded_item():get_count()
local node_def = minetest.registered_nodes[node.name]
if liquiddef ~= nil
and liquiddef.itemname ~= nil
@ -154,14 +153,17 @@ minetest.register_craftitem("bucket:bucket_empty", {
minetest.add_node(pointed_thing.under, {name="air"})
return ItemStack(giving_back)
elseif node_def then
-- Buckets will run a node's on_punch function if it is not liquid.
if node_def.on_punch then
node_def.on_punch(
pointed_thing.under,
minetest.get_node(pointed_thing.under),
user,
pointed_thing)
else
local node_def = minetest.registered_nodes[node.name]
if node_def then
-- Buckets will run a node's on_punch function if it is not liquid.
if node_def.on_punch then
node_def.on_punch(
pointed_thing.under,
minetest.get_node(pointed_thing.under),
user,
pointed_thing)
end
end
end
end,