MT-CTF/ctf_pvp_engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pass wielded to on_killedplayer callbacks instead of hard-coded type

Browse Source
This commit is contained in:
ClobberXD 2018-12-31 18:06:26 +05:30 committed by rubenwardy
parent d341978b90
commit 1c373b663b
1 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ctf/teams.lua
View File

@ -467,38 +467,28 @@ end)
minetest.register_on_punchplayer(function(player, hitter, minetest.register_on_punchplayer(function(player, hitter,
time_from_last_punch, tool_capabilities, dir, damage) time_from_last_punch, tool_capabilities, dir, damage)
if player and hitter then if player and hitter then
local to = ctf.player(player:get_player_name()) local pname = player:get_player_name()
local from = ctf.player(hitter:get_player_name()) local hname = hitter:get_player_name()
if dead_players[player:get_player_name()] then local to = ctf.player(pname)
local from = ctf.player(hname)
if dead_players[pname] then
return return
end end
if to.team == from.team and to.team ~= "" and to.team ~= nil and to.name ~= from.name then if to.team == from.team and to.team ~= "" and to.team ~= nil and to.name ~= from.name then
minetest.chat_send_player(hitter:get_player_name(), player:get_player_name() .. " is on your team!") minetest.chat_send_player(hname, pname .. " is on your team!")
if not ctf.setting("friendly_fire") then if not ctf.setting("friendly_fire") then
return true return true
end end
end end
if player:get_hp() - damage <= 0 then if player:get_hp() - damage <= 0 then
dead_players[player:get_player_name()] = true dead_players[pname] = true
local wielded = hitter:get_wielded_item() local wielded = hitter:get_wielded_item()
local wname = wielded:get_name()
print(wname)
local type = "sword"
if wname:sub(1, 8) == "shooter:" then
if wname == "shooter:grenade" then
type = "grenade"
else
type = "bullet"
end
end
if tool_capabilities.damage_groups.grenade then
type = "grenade"
end
for i = 1, #ctf.registered_on_killedplayer do for i = 1, #ctf.registered_on_killedplayer do
ctf.registered_on_killedplayer[i](player:get_player_name(), hitter:get_player_name(), type) ctf.registered_on_killedplayer[i](pname, hname, wielded)
end end
return false return false
end end