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

Fix ctf_respawn_delay bug (#880)

Browse source
This commit is contained in:
savilli 2021-05-09 01:40:17 +02:00 committed by GitHub
parent 69d5c40c73
commit c642f49d1a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,8 +8,7 @@ local RESPAWN_MESSAGE = "Respawning in "
minetest.register_on_dieplayer(function(player, reason) minetest.register_on_dieplayer(function(player, reason)
local pname = player:get_player_name() local pname = player:get_player_name()
if ctf_match.is_in_build_time() or (reason.type == "punch" and reason.object and if ctf_match.is_in_build_time() or ctf_respawn_delay.players[pname] then -- what is dead may never die
reason.object:is_player() and reason.object:get_player_name() == pname) then
return return
end end

5
mods/ctf/ctf_traps/init.lua
View file

@ -63,7 +63,10 @@ minetest.register_node("ctf_traps:damage_cobble", {
if placerobj then if placerobj then
digger:punch(placerobj, 10, {damage_groups = {fleshy = 7}}, vector.new(0, 1, 0)) digger:punch(placerobj, 10, {damage_groups = {fleshy = 7}}, vector.new(0, 1, 0))
else else
digger:set_hp(digger:get_hp() - 7) local hp = digger:get_hp()
if hp > 0 then
digger:set_hp(hp - 7)
end
end end
minetest.remove_node(pos) minetest.remove_node(pos)