From e9070ee1344907ba39819d17a7826455fe4d3a5a Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Mon, 24 Jul 2017 19:53:03 +0200
Subject: [PATCH] Fix fire charge death message

---
 mods/HUD/mcl_death_messages/init.lua        | 12 ++++++++++--
 mods/ITEMS/REDSTONE/mcl_dispensers/init.lua |  1 +
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/mods/HUD/mcl_death_messages/init.lua b/mods/HUD/mcl_death_messages/init.lua
index 5959ad88c9..903e02f095 100644
--- a/mods/HUD/mcl_death_messages/init.lua
+++ b/mods/HUD/mcl_death_messages/init.lua
@@ -36,6 +36,9 @@ local msgs = {
 		"%s was burned to death by a blaze's fireball.",
 		"%s was killed by a fireball from a blaze.",
 	},
+	["fire_charge"] = {
+		"%s was hit by a fire charge.",
+	},
 	["ghast_fireball"] = {
 		"A ghast scared %s to death.",
 		"%s has been fireballed by a ghast.",
@@ -63,7 +66,6 @@ mobkills = {
 	["mobs_mc:ocelot"] = "%s was killed by an ocelot.",
 	["mobs_mc:ender_dragon"] = "%s was killed by an ender dragon.",
 	["mobs_mc:wither"] = "%s was killed by a wither.",
-	["mobs_mc:blaze"] = "%s was killed by a blaze.",
 	["mobs_mc:enderman"] = "%s was killed by an enderman.",
 	["mobs_mc:endermite"] = "%s was killed by an endermite.",
 	["mobs_mc:ghast"] = "%s was killed by a ghast.",
@@ -150,6 +152,8 @@ minetest.register_on_dieplayer(function(player)
 					msg = dmsg("blaze_fireball", name)
 				elseif last_damages[name].hittertype == "ghast_fireball" then
 					msg = dmsg("ghast_fireball", name)
+				elseif last_damages[name].hittertype == "fire_charge" then
+					msg = dmsg("fire_charge", name)
 				-- Custom death message
 				elseif last_damages[name].custom then
 					msg = last_damages[name].message
@@ -196,7 +200,11 @@ minetest.register_on_punchplayer(function(player, hitter)
 		end
 	-- Blaze fireball
 	elseif hitter:get_luaentity().name == "mobs_mc:blaze_fireball" then
-		hittertype = "blaze_fireball"
+		if hitter:get_luaentity()._shot_from_dispenser then
+			hittertype = "fire_charge"
+		else
+			hittertype = "blaze_fireball"
+		end
 	-- Ghast fireball
 	elseif hitter:get_luaentity().name == "mobs_monster:fireball" then
 		hittertype = "ghast_fireball"
diff --git a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
index 87032d607d..79f392cef0 100644
--- a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
+++ b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
@@ -106,6 +106,7 @@ local dispenserdef = {
 					local shootpos = vector.add(pos, vector.multiply(dropdir, 0.51))
 					local fireball = minetest.add_entity(shootpos, "mobs_mc:blaze_fireball")
 					local ent = fireball:get_luaentity()
+					ent._shot_from_dispenser = true
 					local v = ent.velocity or 1
 					fireball:setvelocity(vector.multiply(dropdir, v))
 					ent.switch = 1