diff --git a/mods/ctf/ctf_events/init.lua b/mods/ctf/ctf_events/init.lua
index 6e3723b..1de37df 100644
--- a/mods/ctf/ctf_events/init.lua
+++ b/mods/ctf/ctf_events/init.lua
@@ -121,14 +121,13 @@ function ctf_events.update_all()
 end
 
 ctf.register_on_killedplayer(function(victim, killer, stack, tool_caps)
-	local sname = stack:get_name()
 	local type = "sword"
 
 	if tool_caps.damage_groups.grenade then
 		type = "grenade"
 	elseif tool_caps.damage_groups.rocket then
 		type = "rocket"
-	elseif sname:sub(1, 8) == "shooter:" then
+	elseif tool_caps.damage_groups.ranged then
 		type = "bullet"
 	end
 
diff --git a/mods/pvp/shooter b/mods/pvp/shooter
index bc0fc7f..d7f6dc7 160000
--- a/mods/pvp/shooter
+++ b/mods/pvp/shooter
@@ -1 +1 @@
-Subproject commit bc0fc7f43c58853d05c86b9254ed52a0b8a3390c
+Subproject commit d7f6dc7c06110ca7f1eead0b15b6630d7466c649