Dumpster-Studios/fire_plus-cd2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a few bugs

Browse Source
This commit is contained in:
LoneWolfHT 2019-02-01 18:32:02 -08:00
parent 0a962d003e
commit ebb7410e0c
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
init.lua
View File

@ -25,11 +25,11 @@ local function make_registration()
return(registerfunc) return(registerfunc)
end end
minetest.register_on_player_hpchange(function(player, hp_change) minetest.register_on_player_hpchange(function(player)
local pos = player:get_pos() local pos = player:get_pos()
local node = minetest.get_node(pos) local node = minetest.get_node(pos)
for id, string in ipairs(fire_plus.ignition_nodes) do for _, string in ipairs(fire_plus.ignition_nodes) do
if node.name:find(string) then if node.name:find(string) then
fire_plus.burnplayer(player) fire_plus.burnplayer(player)
break break
@ -56,8 +56,8 @@ fire_plus.on_burn = make_registration()
function fire_plus.get_burn_dmg(player) function fire_plus.get_burn_dmg(player)
local dmg = 1 local dmg = 1
for id, func in ipairs(callbacks) do for _, func in ipairs(callbacks) do
local rval = callbacks[k](player) local rval = func(player)
if type(rval) == "number" then if type(rval) == "number" then
dmg = rval dmg = rval
@ -101,11 +101,11 @@ function fire_plus.burnplayer(player)
local pos = player:get_pos() local pos = player:get_pos()
local pname = player:get_player_name() local pname = player:get_player_name()
local name = minetest.get_node(pos).name local nodename = minetest.get_node(pos).name
local remove_burn = false local remove_burn = false
for id, string in ipairs(fire_plus.put_outs) do for _, string in ipairs(fire_plus.put_outs) do
if name:find(string) then if nodename:find(string) then
remove_burn = true remove_burn = true
break break
end end
@ -118,8 +118,8 @@ function fire_plus.burnplayer(player)
firesound[pname] = nil firesound[pname] = nil
minetest.sound_play("fire_extinguish_flame", { minetest.sound_play("fire_extinguish_flame", {
to_player = pname, to_player = pname,
gain = 1.0, gain = 1.0,
}) })
return return
@ -134,7 +134,7 @@ function fire_plus.burnplayer(player)
end end
if tntpos then if tntpos then
tnt.boom(tntpos, {radius = tnt_radius, damage_radius = tnt_radius}) tnt.boom(tntpos, {radius = fire_plus.tnt_explode_radius, damage_radius = fire_plus.tnt_explode_radius})
end end
minetest.add_particlespawner({ minetest.add_particlespawner({
@ -161,8 +161,6 @@ function fire_plus.burnplayer(player)
return return
end end
local name = player:get_player_name()
if firehud[name] then if firehud[name] then
player:hud_remove(firehud[name]) player:hud_remove(firehud[name])
firehud[name] = nil firehud[name] = nil
@ -175,11 +173,11 @@ function fire_plus.burnplayer(player)
end) end)
end end
minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_ca, dir, dmg) minetest.register_on_punchplayer(function(player, hitter, _, tool_ca, _, dmg)
if hitter:is_player() and tool_ca.damage_groups.burns == 1 and if hitter:is_player() and tool_ca.damage_groups.burns == 1 and
(player:get_hp()-dmg) > 0 then (player:get_hp()-dmg) > 0 then
fire_plus.burnplayer(player) fire_plus.burnplayer(player)
end end
return(false) return(false)
end) end)