merge upstream
This commit is contained in:
commit
f3be63d874
697 changed files with 8307 additions and 2471 deletions
|
@ -92,7 +92,7 @@ minetest.register_tool("fire:flint_and_steel", {
|
|||
on_use = function(itemstack, user, pointed_thing)
|
||||
local sound_pos = pointed_thing.above or user:get_pos()
|
||||
minetest.sound_play("fire_flint_and_steel",
|
||||
{pos = sound_pos, gain = 0.5, max_hear_distance = 8}, true)
|
||||
{pos = sound_pos, gain = 0.2, max_hear_distance = 8}, true)
|
||||
local player_name = user:get_player_name()
|
||||
if pointed_thing.type == "node" then
|
||||
local node_under = minetest.get_node(pointed_thing.under).name
|
||||
|
@ -111,11 +111,10 @@ minetest.register_tool("fire:flint_and_steel", {
|
|||
minetest.set_node(pointed_thing.above, {name = "fire:basic_flame"})
|
||||
end
|
||||
end
|
||||
if not (creative and creative.is_enabled_for
|
||||
and creative.is_enabled_for(player_name)) then
|
||||
if not minetest.is_creative_enabled(player_name) then
|
||||
-- Wear tool
|
||||
local wdef = itemstack:get_definition()
|
||||
itemstack:add_wear(1000)
|
||||
itemstack:add_wear_by_uses(66)
|
||||
|
||||
-- Tool break sound
|
||||
if itemstack:get_count() == 0 and wdef.sound and wdef.sound.breaks then
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue