From eeb45a9580000d12be4bb176976d694cc10f1aa8 Mon Sep 17 00:00:00 2001 From: Zughy <4279489-marco_a@users.noreply.gitlab.com> Date: Thu, 13 Jul 2023 00:08:40 +0200 Subject: [PATCH] Sort few lines from previous commit --- src/weapons/weapons.lua | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/weapons/weapons.lua b/src/weapons/weapons.lua index 052e8b2..dd2d4b1 100644 --- a/src/weapons/weapons.lua +++ b/src/weapons/weapons.lua @@ -219,6 +219,22 @@ function block_league.kill(arena, weapon, player, target) block_league.sound_play("bl_kill", p_name) if t_name ~= p_name then + -- informo dell'uccisione + block_league.HUD_kill_update(p_name, S("YOU'VE KILLED @1", t_name)) + minetest.chat_send_player(t_name, minetest.colorize("#d7ded7", S("You've been killed by @1", minetest.colorize("#eea160", p_name)))) + + if arena_lib.is_player_spectated(p_name) then + for sp_name, _ in pairs(arena_lib.get_player_spectators(p_name)) do + block_league.HUD_kill_update(sp_name, S("@1 HAS KILLED @2", p_name, t_name)) + end + end + + if arena_lib.is_player_spectated(t_name) then + for sp_name, _ in pairs(arena_lib.get_player_spectators(t_name)) do + minetest.chat_send_player(sp_name, minetest.colorize("#d7ded7", S("@1 has been killed by @2", minetest.colorize("#eea160", t_name), minetest.colorize("#eea160", p_name)))) + end + end + local dmg_table = arena.players[t_name].dmg_received local a_dmg = 0 local a_name @@ -244,22 +260,6 @@ function block_league.kill(arena, weapon, player, target) end end - -- informo dell'uccisione - block_league.HUD_kill_update(p_name, S("YOU'VE KILLED @1", t_name)) - minetest.chat_send_player(t_name, minetest.colorize("#d7ded7", S("You've been killed by @1", minetest.colorize("#eea160", p_name)))) - - if arena_lib.is_player_spectated(p_name) then - for sp_name, _ in pairs(arena_lib.get_player_spectators(p_name)) do - block_league.HUD_kill_update(sp_name, S("@1 HAS KILLED @2", p_name, t_name)) - end - end - - if arena_lib.is_player_spectated(t_name) then - for sp_name, _ in pairs(arena_lib.get_player_spectators(t_name)) do - minetest.chat_send_player(sp_name, minetest.colorize("#d7ded7", S("@1 has been killed by @2", minetest.colorize("#eea160", t_name), minetest.colorize("#eea160", p_name)))) - end - end - local p_stats = arena.players[p_name] local a_stats = a_name and arena.players[a_name] or {points = 0} -- tabella fantoccio per non far crashare sotto local team_id = p_stats.teamID