Don't end respawn immunity on hitting team-mates (#404)

This commit is contained in:
ANAND 2019-04-12 15:22:32 +05:30 committed by GitHub
parent fea07d8ae8
commit dc850acd9d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 8 deletions

View file

@ -36,18 +36,24 @@ 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 not player or not hitter then
return false
end
local pname = player:get_player_name()
local hname = hitter:get_player_name()
if player and respawn_immunity.is_immune(player) then if player and respawn_immunity.is_immune(player) then
minetest.chat_send_player(hitter:get_player_name(), minetest.chat_send_player(hname, minetest.colorize("FF8C77", pname ..
player:get_player_name() .. " just respawned or joined, and is immune to attacks!"))
" just respawned or joined, and is immune to attacks!")
return true return true
end end
if hitter and respawn_immunity.is_immune(hitter) then if hitter and respawn_immunity.is_immune(hitter) and
minetest.chat_send_player(hitter:get_player_name(), ctf.player(hname).team ~= ctf.player(pname).team then
minetest.colorize("#FF8C00", minetest.chat_send_player(hname, minetest.colorize("#FF8C00",
"Your immunity has ended because you attacked a player")) "Your immunity has ended because you attacked a player"))
immune_players[hitter:get_player_name()] = nil immune_players[hname] = nil
respawn_immunity.update_effects(hitter) respawn_immunity.update_effects(hitter)
end end
end) end)

View file

@ -0,0 +1,2 @@
name = ctf_respawn_immunity
depends = ctf

View file

@ -1 +0,0 @@
ctf