mirror of
https://github.com/sys4-fr/server-nalc.git
synced 2025-06-28 06:11:47 +02:00
Fix [buckets] w/ acid or sand, make [death_message] work w/ aliases
This commit is contained in:
@ -3,7 +3,6 @@
|
||||
|
||||
minetest.register_alias("bucket", "bucket:bucket_empty")
|
||||
minetest.register_alias("bucket_water", "bucket:bucket_water")
|
||||
minetest.register_alias("bucket_acid", "bucket:bucket_acid")
|
||||
minetest.register_alias("bucket_lava", "bucket:bucket_lava")
|
||||
|
||||
minetest.register_craft({
|
||||
@ -53,6 +52,7 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
|
||||
stack_max = 1,
|
||||
liquids_pointable = true,
|
||||
groups = groups,
|
||||
|
||||
on_place = function(itemstack, user, pointed_thing)
|
||||
-- Must be pointing to node
|
||||
if pointed_thing.type ~= "node" then
|
||||
@ -60,10 +60,8 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
|
||||
end
|
||||
|
||||
local node = minetest.get_node_or_nil(pointed_thing.under)
|
||||
local ndef
|
||||
if node then
|
||||
ndef = minetest.registered_nodes[node.name]
|
||||
end
|
||||
local ndef = node and minetest.registered_nodes[node.name]
|
||||
|
||||
-- Call on_rightclick if the pointed node defines it
|
||||
if ndef and ndef.on_rightclick and
|
||||
user and not user:get_player_control().sneak then
|
||||
@ -106,8 +104,6 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
|
||||
end
|
||||
end
|
||||
|
||||
-- Empty Bucket code by Casimir.
|
||||
|
||||
minetest.register_craftitem("bucket:bucket_empty", {
|
||||
description = "Empty Bucket",
|
||||
inventory_image = "bucket.png",
|
||||
@ -145,7 +141,7 @@ minetest.register_craftitem("bucket:bucket_empty", {
|
||||
else
|
||||
local pos = user:getpos()
|
||||
pos.y = math.floor(pos.y + 0.5)
|
||||
core.add_item(pos, liquiddef.itemname)
|
||||
minetest.add_item(pos, liquiddef.itemname)
|
||||
end
|
||||
|
||||
-- set to return empty buckets minus 1
|
||||
@ -186,24 +182,6 @@ bucket.register_liquid(
|
||||
"Lava Bucket"
|
||||
)
|
||||
|
||||
bucket.register_liquid(
|
||||
"default:acid_source",
|
||||
"default:acid_flowing",
|
||||
"bucket:bucket_acid",
|
||||
"bucket_acid.png",
|
||||
"Acid Bucket",
|
||||
{not_in_creative_inventory = 1}
|
||||
)
|
||||
|
||||
bucket.register_liquid(
|
||||
"default:sand_source",
|
||||
"default:sand_flowing",
|
||||
"bucket:bucket_sand",
|
||||
"bucket_sand.png",
|
||||
"Sand Bucket",
|
||||
{not_in_creative_inventory = 1}
|
||||
)
|
||||
|
||||
minetest.register_craft({
|
||||
type = "fuel",
|
||||
recipe = "bucket:bucket_lava",
|
||||
@ -211,11 +189,3 @@ minetest.register_craft({
|
||||
replacements = {{"bucket:bucket_lava", "bucket:bucket_empty"}},
|
||||
})
|
||||
|
||||
minetest.register_craft({
|
||||
output = "bucket:bucket_sand",
|
||||
recipe = {
|
||||
{"group:sand"},
|
||||
{"group:sand"},
|
||||
{"bucket:bucket_water"},
|
||||
},
|
||||
})
|
||||
|
Binary file not shown.
Before Width: | Height: | Size: 216 B |
Binary file not shown.
Before Width: | Height: | Size: 250 B |
Reference in New Issue
Block a user