From c5560f7a2dc33e876f5fdbdb4edeb2b286bc3d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20M=C3=BCller?=
 <34514239+appgurueu@users.noreply.github.com>
Date: Thu, 1 Apr 2021 19:17:17 +0200
Subject: [PATCH] Use huds with more player notifications (#853)

---
 mods/ctf/ctf/teams.lua         |  6 +++++-
 mods/ctf/ctf_classes/medic.lua | 13 +++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/mods/ctf/ctf/teams.lua b/mods/ctf/ctf/teams.lua
index 115020a..b62469e 100644
--- a/mods/ctf/ctf/teams.lua
+++ b/mods/ctf/ctf/teams.lua
@@ -480,7 +480,11 @@ minetest.register_on_punchplayer(function(player, hitter,
 
 		if to.team == from.team and to.team ~= "" and
 				to.team ~= nil and to.name ~= from.name then
-			minetest.chat_send_player(hname, pname .. " is on your team!")
+			hud_event.new(hname, {
+				name  = "ctf:friendly_fire",
+				color = "warning",
+				value = pname .. " is on your team!",
+			})
 			if not ctf.setting("friendly_fire") then
 				return true
 			end
diff --git a/mods/ctf/ctf_classes/medic.lua b/mods/ctf/ctf_classes/medic.lua
index 985b7f6..d67fab1 100644
--- a/mods/ctf/ctf_classes/medic.lua
+++ b/mods/ctf/ctf_classes/medic.lua
@@ -99,7 +99,11 @@ minetest.override_item("ctf_bandages:bandage", {
 		if ctf.player(pname).team == ctf.player(name).team then
 			local nodename = minetest.get_node(object:get_pos()).name
 			if ctf_classes.dont_heal[pname] or nodename:find("lava") or nodename:find("water") or nodename:find("trap") then
-                                minetest.chat_send_player(name, "You can't heal player in lava, water or spikes!")
+				hud_event.new(name, {
+					name  = "ctf_classes:environment",
+					color = "warning",
+					value = "Can't heal " .. pname .. " in lava, water or spikes!",
+				})
 				return -- Can't heal players in lava/water/spikes
 			end
 
@@ -149,10 +153,15 @@ local function isdiggable(name)
 end
 
 local function paxel_stop(pname, reason)
+	local message = "Pillar digging stopped "
+	if reason then
+		message = message .. reason .. " "
+	end
+	message = message .. "- wait " .. DIG_COOLDOWN .. "s"
 	hud_event.new(pname, {
 		name  = "ctf_classes:paxel_stop",
 		color = "success",
-		value = table.concat({"Pillar digging stopped", reason or "unknown", "- wait " .. DIG_COOLDOWN .. "s"}, " "),
+		value = message,
 	})
 	diggers[pname] = minetest.after(DIG_COOLDOWN, function() diggers[pname] = nil end)
 end