From d202db00b70b19c1a2fe4fc9a3af3b6e00f0bd72 Mon Sep 17 00:00:00 2001
From: cora <coradelamouche@gmx.ch>
Date: Tue, 4 Oct 2022 11:36:43 +0200
Subject: [PATCH] Fix llama and donkey/mule drops

---
 mods/ENTITIES/mobs_mc/horse.lua | 27 ++++++++++++++++++++++++-
 mods/ENTITIES/mobs_mc/llama.lua | 36 +++++++++++++++++++++++----------
 2 files changed, 51 insertions(+), 12 deletions(-)

diff --git a/mods/ENTITIES/mobs_mc/horse.lua b/mods/ENTITIES/mobs_mc/horse.lua
index db51cee34..0632f4d33 100644
--- a/mods/ENTITIES/mobs_mc/horse.lua
+++ b/mods/ENTITIES/mobs_mc/horse.lua
@@ -34,6 +34,30 @@ local horse_extra_texture = function(horse)
 	return textures
 end
 
+
+local function get_drops(self)
+	self.drops = {}
+	table.insert(self.drops,
+		{name = "mcl_mobitems:leather",
+		chance = 1,
+		min = 0,
+		max = 2,
+		looting = "common",
+		})
+	if self._saddle then
+		table.insert(self.drops,{name = "mcl_mobitems:saddle",
+		chance = 1,
+		min = 1,
+		max = 1,})
+	end
+	if self._chest then
+		table.insert(self.drops,{name = "mcl_chests:chest",
+		chance = 1,
+		min = 1,
+		max = 1,})
+	end
+end
+
 -- Helper functions to determine equipment rules
 local can_equip_horse_armor = function(entity_id)
 	return entity_id == "mobs_mc:horse" or entity_id == "mobs_mc:skeleton_horse" or entity_id == "mobs_mc:zombie_horse"
@@ -250,7 +274,7 @@ local horse = {
 				local tex = horse_extra_texture(self)
 				self.base_texture = tex
 				self.object:set_properties({textures = self.base_texture})
-				table.insert(self.drops,{name = "mcl_chests:chest",chance=1,min=1,max=1})
+				get_drops(self)
 				return
 			elseif self._chest and clicker:get_player_control().sneak then
 				mcl_entity_invs.show_inv_form(self,clicker)
@@ -361,6 +385,7 @@ local horse = {
 				self.base_texture = tex
 				self.object:set_properties({textures = self.base_texture})
 				minetest.sound_play({name = "mcl_armor_equip_leather"}, {gain=0.5, max_hear_distance=12, pos=self.object:get_pos()}, true)
+				get_drops(self)
 
 			-- Put on horse armor if tamed
 			elseif can_equip_horse_armor(self.name) and not self.driver and not self._horse_armor
diff --git a/mods/ENTITIES/mobs_mc/llama.lua b/mods/ENTITIES/mobs_mc/llama.lua
index d5f2c4853..c050375ad 100644
--- a/mods/ENTITIES/mobs_mc/llama.lua
+++ b/mods/ENTITIES/mobs_mc/llama.lua
@@ -24,6 +24,29 @@ local carpets = {
 	unicolor_light_blue = { "mcl_wool:light_blue_carpet", "light_blue" },
 }
 
+local function get_drops(self)
+	self.drops = {}
+	table.insert(self.drops,
+		{name = "mcl_mobitems:leather",
+		chance = 1,
+		min = 0,
+		max = 2,
+		looting = "common",
+		})
+	if self.carpet then
+		table.insert(self.drops,{name = self.carpet,
+		chance = 1,
+		min = 1,
+		max = 1,})
+	end
+	if self._has_chest then
+		table.insert(self.drops,{name = "mcl_chests:chest",
+		chance = 1,
+		min = 1,
+		max = 1,})
+	end
+end
+
 mcl_mobs:register_mob("mobs_mc:llama", {
 	description = S("Llama"),
 	type = "animal",
@@ -135,7 +158,7 @@ mcl_mobs:register_mob("mobs_mc:llama", {
 			self.object:set_properties({
 				textures = self.base_texture,
 			})
-			table.insert(self.drops,{name = "mcl_chests:chest",chance=1,min=1,max=1})
+			get_drops(self)
 			return
 		elseif self._has_chest and clicker:get_player_control().sneak then
 			mcl_entity_invs.show_inv_form(self,clicker," - Strength "..math.floor(self._inv_size / 3))
@@ -164,16 +187,7 @@ mcl_mobs:register_mob("mobs_mc:llama", {
 							textures = self.base_texture,
 						})
 						self.carpet = item:get_name()
-						self.drops = {
-							{name = "mcl_mobitems:leather",
-							chance = 1,
-							min = 0,
-							max = 2,},
-							{name = item:get_name(),
-							chance = 1,
-							min = 1,
-							max = 1,},
-						}
+						get_drops(self)
 						return
 					end
 				end