From c8612a69e47b1c22ef76822b9a98d9816527eb8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?=
 <34514239+appgurueu@users.noreply.github.com>
Date: Fri, 16 Apr 2021 19:09:16 +0200
Subject: [PATCH] Fix bounties being shown to the same team on join (#865)

* Fix bounties being shown to the same team on join

* Fix submodules
---
 mods/ctf/ctf_bounties/init.lua | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/mods/ctf/ctf_bounties/init.lua b/mods/ctf/ctf_bounties/init.lua
index 8da0251..5badf14 100644
--- a/mods/ctf/ctf_bounties/init.lua
+++ b/mods/ctf/ctf_bounties/init.lua
@@ -2,7 +2,11 @@ local bountied_player = nil
 local bounty_score = 0
 
 local function announce(name)
-	local tcolor = ctf_colors.get_color(ctf.player(bountied_player))
+	local bountied = ctf.player(bountied_player)
+	if ctf.player(name).team == bountied.team then
+		return
+	end
+	local tcolor = ctf_colors.get_color(bountied)
 	minetest.chat_send_player(name,
 			minetest.colorize("#fff326", "The next person to kill ") ..
 			minetest.colorize(tcolor.css, bountied_player) ..
@@ -14,10 +18,7 @@ end
 local function announce_all()
 	if bountied_player then
 		for _, player in pairs(minetest.get_connected_players()) do
-			local pname = player:get_player_name()
-			if ctf.player(pname).team ~= ctf.player(bountied_player).team then
-				announce(pname)
-			end
+			announce(player:get_player_name())
 		end
 	end
 end