From c177ecdeb3238bb41d989321059bad4ded53b8af Mon Sep 17 00:00:00 2001
From: tenplus1 <kinsellaja@yahoo.com>
Date: Fri, 24 Dec 2021 09:50:50 +0000
Subject: [PATCH] add some nil checks for entities, add nether mod lucky blocks

---
 blocks.lua | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 init.lua   | 52 +++++++++++++++++++++++-------------
 2 files changed, 111 insertions(+), 19 deletions(-)

diff --git a/blocks.lua b/blocks.lua
index de2f46d..ea2f879 100644
--- a/blocks.lua
+++ b/blocks.lua
@@ -735,6 +735,84 @@ lucky_block:add_blocks({
 })
 end
 
+-- Nether Mod
+if minetest.get_modpath("nether") then
+
+	local p = "nether:"
+
+	-- add well blocks
+	lucky_block.wellblocks[#lucky_block.wellblocks + 1] = {p.."glowstone", 4}
+	lucky_block.wellblocks[#lucky_block.wellblocks + 1] = {p.."glowstone_deep", 4}
+
+	-- add lucky blocks
+	lucky_block:add_blocks({
+		{"flo", 3, {"nether:rack", "nether:brick", "nether:brick_cracked"}, 1},
+		{"flo", 3, {"nether:rack_deep", "nether:brick_deep"}, 1},
+		{"flo", 3, {"nether:basalt", "nether:basalt_hewn", "nether:basalt_chiselled"}, 1},
+		{"nod", "nether:glowstone", 0},
+		{"nod", "nether:glowstone_deep", 0},
+		{"exp", 3},
+		{"fal", {p.."sand", p.."sand", p.."sand", p.."sand", p.."sand", p.."glowstone"}, 0},
+		{"nod", "nether:lava_crust", 1},
+		{"nod", "default:chest", 0, {
+			{name = p.."fence_nether_brick", max = 5},
+			{name = p.."rack_wall", max = 5},
+			{name = p.."rack", max = 5},
+			{name = p.."axe_nether", max = 1},
+			{name = p.."sword_nether", max = 1},
+			{name = p.."nether_lump", max = 3},
+
+		}},
+		{"exp", 2},
+		{"sch", "wishingwell", 0, true, {
+			{"default:stonebrick", p.."brick"},
+			{"stairs:slab_stonebrick", "stairs:slab_nether_brick"},
+			{"default:fence_wood", p.."fence_nether_brick"},
+			{"default:steelblock", p.."basalt_chiselled"},
+			{"default:water_source", "default:lava_source"},
+			{"default:glass", "default:obsidian_glass"}
+		}},
+		{"lig"},
+		{"sch", "platform", 1, true, {
+			{"default:sandstonebrick", p.."brick_deep"},
+			{"default:sandstone", p.."rack_deep"},
+			{"lucky_block:lucky_block", "lucky_block:super_lucky_block"}
+		}},
+		{"nod", "default:chest", 0, {
+			{name = p.."rack_deep_wall", max = 5},
+			{name = p.."rack_deep", max = 5},
+			{name = p.."pick_nether", max = 1},
+			{name = p.."shovel_nether", max = 1},
+			{name = p.."nether_lump", max = 3}
+		}},
+	})
+
+	if minetest.get_modpath("3d_armor") then
+
+		lucky_block:add_blocks({
+			{"dro", {"3d_armor:helmet_nether"}},
+			{"dro", {"3d_armor:chestplate_nether"}},
+			{"dro", {"3d_armor:leggings_nether"}},
+			{"dro", {"3d_armor:boots_nether"}}
+		})
+	end
+
+	if minetest.get_modpath("shields") then
+		lucky_block:add_blocks({
+			{"dro", {"shields:shield_nether"}}
+		})
+	end
+
+	if minetest.get_modpath("xpanes") and minetest.registered_nodes["nether:geode"] then
+		lucky_block:add_blocks({
+			{"dro", {"xpanes:nether_crystal_pane_flat"}, 5},
+			{"nod", "nether_geode", 0},
+			{"dro", {"nether_geode"}, 3}
+		})
+	end
+end
+
+
 -- Additional Wishing Well Styles
 lucky_block:add_blocks({
 	{"sch", "wishingwell", 0, true},
diff --git a/init.lua b/init.lua
index 3bd149e..0deaca5 100644
--- a/init.lua
+++ b/init.lua
@@ -309,28 +309,38 @@ local lb_spawn = function(pos, digger, def)
 				entity = "mobs:sheep" .. colour
 			end
 
+			if entity == "mobs_animal:sheep" then
+				local colour = "_" .. all_colours[math.random(#all_colours)]
+				entity = "mobs_animal:sheep" .. colour
+			end
+
 			-- has entity been registered?
 			if minetest.registered_entities[entity] then
 
-				local ent = minetest.add_entity(pos2, entity):get_luaentity()
+				local obj = minetest.add_entity(pos2, entity)
 
-				if tame then
-					ent.tamed = true
-				end
+				if obj then
 
-				if own then
-					ent.owner = digger:get_player_name()
-				end
+					local ent = obj:get_luaentity()
 
-				if name then
-					ent.nametag = name
-					ent.object:set_properties({
-						nametag = name,
-						nametag_color = "#FFFF00"
-					})
+					if tame then
+						ent.tamed = true
+					end
+
+					if own then
+						ent.owner = digger:get_player_name()
+					end
+
+					if name then
+						ent.nametag = name
+						ent.object:set_properties({
+							nametag = name,
+							nametag_color = "#FFFF00"
+						})
+					end
+				else
+					print ("[lucky_block] " .. entity .. " could not be spawned")
 				end
-			else
-				print ("[lucky_block] " .. entity .. " could not be spawned")
 			end
 		end
 	end
@@ -495,11 +505,15 @@ local lb_falling = function(pos, digger, def)
 
 			if n then
 
-				local ent = minetest.add_entity(
-						pos2, "__builtin:falling_node"):get_luaentity()
+				local obj = minetest.add_entity(pos2, "__builtin:falling_node")
 
-				if ent then
-					ent:set_node(n)
+				if obj then
+
+					local ent = obj:get_luaentity()
+
+					if ent then
+						ent:set_node(n)
+					end
 				end
 			end
 		end)