minetest/capturetheflag
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix ranged kill detection (#667)

Browse source
This commit is contained in:
LoneWolfHT 2020-07-02 12:22:15 -07:00 committed by GitHub
parent ab709bb0a4
commit e76dcf0563
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
mods/ctf/ctf_events/init.lua
View file

@ -121,14 +121,13 @@ function ctf_events.update_all()
end end
ctf.register_on_killedplayer(function(victim, killer, stack, tool_caps) ctf.register_on_killedplayer(function(victim, killer, stack, tool_caps)
local sname = stack:get_name()
local type = "sword" local type = "sword"
if tool_caps.damage_groups.grenade then if tool_caps.damage_groups.grenade then
type = "grenade" type = "grenade"
elseif tool_caps.damage_groups.rocket then elseif tool_caps.damage_groups.rocket then
type = "rocket" type = "rocket"
elseif sname:sub(1, 8) == "shooter:" then elseif tool_caps.damage_groups.ranged then
type = "bullet" type = "bullet"
end end

2
mods/pvp/shooter

@ -1 +1 @@
Subproject commit bc0fc7f43c58853d05c86b9254ed52a0b8a3390c Subproject commit d7f6dc7c06110ca7f1eead0b15b6630d7466c649