zughy-friends-minetest
/
arena_lib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CRASHFIX: players in different arenas can now hit themselves (with no damage). Same for when one is in an arena and the other is not

master
Zughy 2022-01-10 14:15:10 +01:00
parent ebef57c7b8
commit 12b344a59a
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/player_manager.lua
View File

@ -54,18 +54,26 @@ end)
minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities, dir, damage)
local target_name = player:get_player_name()
local t_name = player:get_player_name()
local p_name = hitter:get_player_name()
local arena = arena_lib.get_arena_by_player(p_name)
local t_arena = arena_lib.get_arena_by_player(t_name)
local p_arena = arena_lib.get_arena_by_player(p_name)
if arena_lib.is_player_spectating(p_name) then
-- se nessuno dei due è perlomeno in coda, lascio spazio agli altri eventuali on_punchplayer
if not p_arena and not t_arena then
return
end
-- se uno è in partita e l'altro no, annullo
if ((p_arena and p_arena.in_game) and not (t_arena and t_arena.in_game)) or
((t_arena and t_arena.in_game) and not (p_arena and p_arena.in_game)) then
return true
end
if arena and arena.in_game and arena.players[p_name].teamID and arena.players[p_name].teamID == arena.players[target_name].teamID then
-- se sono nella stessa partita e nella stessa squadra, annullo
if p_arena.players[t_name] and p_arena.players[p_name].teamID and p_arena.players[p_name].teamID == p_arena.players[t_name].teamID then
return true
end
end)