From ddb1174042d6c45c05c0c5d6b7c2038415dc2072 Mon Sep 17 00:00:00 2001
From: Wuzzy <almikes@aol.com>
Date: Sun, 11 Jun 2017 22:53:12 +0200
Subject: [PATCH] Pumpkins and heads can now be dispensed as armor

---
 mods/ITEMS/REDSTONE/mcl_dispensers/init.lua | 31 +++++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
index e2f3cb0601..061ffcccc3 100644
--- a/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
+++ b/mods/ITEMS/REDSTONE/mcl_dispensers/init.lua
@@ -188,15 +188,6 @@ local dispenserdef = {
 						end
 					end
 
-				elseif igroups.head or igroups.shulker_box or iname == "mcl_farming:pumpkin_face" then
-					-- Place head, shulker box, or pumpkin
-					if dropnodedef.buildable_to then
-						minetest.set_node(droppos, {name = iname, param2 = node.param2})
-
-						stack:take_item()
-						inv:set_stack("main", stack_id, stack)
-					end
-
 				elseif iname == "mcl_dye:white" then
 					-- Apply bone meal, if possible
 					if dropnode.name == "air" then
@@ -239,6 +230,7 @@ local dispenserdef = {
 
 				elseif igroups.armor_head or igroups.armor_torso or igroups.armor_legs or igroups.armor_feet then
 					local armor_type, armor_slot
+					local armor_dispensed = false
 					if igroups.armor_head then
 						armor_type = "armor_head"
 						armor_slot = 2
@@ -273,6 +265,7 @@ local dispenserdef = {
 							minetest.registered_nodes["3d_armor_stand:armor_stand"].on_metadata_inventory_put(standpos)
 							stack:take_item()
 							inv:set_stack("main", stack_id, stack)
+							armor_dispensed = true
 						end
 					else
 						-- Put armor on nearby player
@@ -308,8 +301,28 @@ local dispenserdef = {
 
 								stack:take_item()
 								inv:set_stack("main", stack_id, stack)
+								armor_dispensed = true
 							end
 						end
+
+						-- Place head or pumpkin as node, if equipping it as armor has failed
+						if not armor_dispensed then
+							if igroups.head or iname == "mcl_farming:pumpkin_face" then
+								if dropnodedef.buildable_to then
+									minetest.set_node(droppos, {name = iname, param2 = node.param2})
+									stack:take_item()
+									inv:set_stack("main", stack_id, stack)
+								end
+							end
+						end
+					end
+
+				elseif igroups.head or igroups.shulker_box or iname == "mcl_farming:pumpkin_face" then
+					-- Place head, shulker box, or pumpkin as node
+					if dropnodedef.buildable_to then
+						minetest.set_node(droppos, {name = iname, param2 = node.param2})
+						stack:take_item()
+						inv:set_stack("main", stack_id, stack)
 					end
 
 				elseif igroups.spawn_egg then