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

Fix respawn immunity ending when hitting teammate (#742)

Browse source
This commit is contained in:
realOneplustwo 2021-01-20 10:09:55 -08:00 committed by GitHub
parent 62cedd9267
commit ec36999fa3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
mods/ctf/ctf_respawn_immunity/init.lua
View file

@ -45,17 +45,19 @@ minetest.register_on_punchplayer(function(player, hitter,
local pteam = ctf.player(pname).team
local hteam = ctf.player(hname).team
if player and ctf_respawn_immunity.is_immune(player) and pteam ~= hteam then
minetest.chat_send_player(hname, minetest.colorize("#EE8822", pname ..
" just respawned or joined," .. " and is immune to attacks!"))
return true
end
if pteam ~= hteam then
if player and ctf_respawn_immunity.is_immune(player) then
minetest.chat_send_player(hname, minetest.colorize("#EE8822", pname ..
" just respawned or joined," .. " and is immune to attacks!"))
return true
end
if hitter and ctf_respawn_immunity.is_immune(hitter) then
minetest.chat_send_player(hname, minetest.colorize("#FF8C00",
"Your immunity has ended because you attacked a player"))
immune_players[hname] = nil
ctf_respawn_immunity.update_effects(hitter)
if hitter and ctf_respawn_immunity.is_immune(hitter) then
minetest.chat_send_player(hname, minetest.colorize("#FF8C00",
"Your immunity has ended because you attacked a player"))
immune_players[hname] = nil
ctf_respawn_immunity.update_effects(hitter)
end
end
end)