From 5abcda6d1f8ecb7a75fb5de71ec1482861999c13 Mon Sep 17 00:00:00 2001 From: Zughy <4279489-marco_a@users.noreply.gitlab.com> Date: Tue, 12 Sep 2023 11:53:16 +0200 Subject: [PATCH] Bugfix: don't get assists when people die after scoring (closes #99) | Don't print the suicide in the log if it happens after scoring --- block_league/src/game/TD/ball.lua | 1 - block_league/src/weapons/weapons.lua | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/block_league/src/game/TD/ball.lua b/block_league/src/game/TD/ball.lua index e16cefb..05855ef 100644 --- a/block_league/src/game/TD/ball.lua +++ b/block_league/src/game/TD/ball.lua @@ -314,7 +314,6 @@ end function add_point(p_name, teamID, arena) - local enemy_teamID = teamID == 1 and 2 or 1 local team = arena_lib.get_players_in_team(arena, teamID) local enemy_team = arena_lib.get_players_in_team(arena, enemy_teamID) diff --git a/block_league/src/weapons/weapons.lua b/block_league/src/weapons/weapons.lua index 27920f4..80c38a8 100644 --- a/block_league/src/weapons/weapons.lua +++ b/block_league/src/weapons/weapons.lua @@ -331,6 +331,11 @@ end function block_league.hitter_or_suicide(arena, player, dmg_rcvd_table, no_hitter_img) + -- se le armi son disabilitate (quindi o in caricamento o dopo punto o in celebrazione) non mostrare niente + if arena.weapons_disabled then + block_league.HUD_spectate_update(arena, player:get_player_name(), "alive") + return end + local last_hitter = "" local last_hitter_timestamp = 99999