From 99bb09def656e001c60017dcfa2a3ab94cdbdd29 Mon Sep 17 00:00:00 2001 From: ANAND Date: Wed, 10 Jul 2019 15:49:33 +0530 Subject: [PATCH] ctf_events: Fix grenade kills not being detected (#428) --- mods/ctf/ctf_events/init.lua | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/mods/ctf/ctf_events/init.lua b/mods/ctf/ctf_events/init.lua index 4b79e82..591d439 100644 --- a/mods/ctf/ctf_events/init.lua +++ b/mods/ctf/ctf_events/init.lua @@ -120,20 +120,17 @@ function ctf_events.update_all() end end -ctf.register_on_killedplayer(function(victim, killer, stack) +ctf.register_on_killedplayer(function(victim, killer, stack, tool_caps) local sname = stack:get_name() - local tool_caps = stack:get_tool_capabilities() local type = "sword" - if sname:sub(1, 8) == "shooter:" then - if sname == "shooter:grenade" then + if sname == "" then + if tool_caps.damage_groups.grenade then type = "grenade" - else - type = "bullet" end + elseif sname:sub(1, 8) == "shooter:" then + type = "bullet" end - if tool_caps.damage_groups.grenade then - type = "grenade" - end + ctf_events.post("kill_" .. type, killer, victim) ctf_events.update_all() end)