Merge remote-tracking branch 'upstream/master' into forkhausen

README.md

@@ -2,7 +2,7 @@
 An unofficial Minecraft-like game for Minetest. Forked from MineClone2 developed by Wuzzy 
 and contributors which is a fork of MineClone by davedevils. Not developed or endorsed by Mojang AB.
 
-Version: 0.64.0
+Version: 0.65.1
 
 ## Differences to MineClone 2
 So far some minor fixes that I also sent upstream to Wuzzy for inclusion and some yet unmerged features from others:
@@ -215,12 +215,13 @@ There are so many people to list (sorry). Check out the respective mod directori
 * [ryvnf](https://github.com/ryvnf): Explosion mechanics
 * Lots of other people: TO BE WRITTEN (see mod directories for details)
 
-### Textures
+### Graphics
 * [XSSheep](http://www.minecraftforum.net/members/XSSheep): Main author; creator of the Pixel Perfection resource pack of Minecraft 1.11
 * [Wuzzy](https://forum.minetest.net/memberlist.php?mode=viewprofile&u=3082): Main menu imagery and various edits and additions of texture pack
 * [kingoscargames](https://github.com/kingoscargames): Various edits and additions of existing textures
 * [leorockway](https://github.com/leorockway): Some edits of mob textures
 * [xMrVizzy](https://minecraft.curseforge.com/members/xMrVizzy): Glazed terracotta (textures are subject to be replaced later)
+* yutyo <tanakinci2002@gmail.com>: MineClone 2 logo
 * Other authors: GUI images,
 
 ### Models

mods/CORE/mcl_explosions/init.lua

@@ -328,7 +328,7 @@ local function trace_explode(pos, strength, raydirs, radius, drop_chance, fire,
 			end
 		end
 		if remove then
-			if mod_fire and math.random(1, 3) == 1 then
+			if mod_fire and fire and math.random(1, 3) == 1 then
 				data[idx] = CONTENT_FIRE
 			else
 				data[idx] = minetest.CONTENT_AIR
@@ -359,6 +359,7 @@ end
 --               explosion (defaults to 1.0 / strength)
 -- no_sound - If true then the explosion will not play a sound
 -- no_particle - If true then the explosion will not create particles
+-- fire - If true, 1/3 nodes become fire (default: false)
 function mcl_explosions.explode(pos, strength, info, puncher)
 	-- The maximum blast radius (in the air)
 	local radius = math.ceil(1.3 * strength / (0.3 * 0.75) * 0.3)

mods/ENTITIES/mobs_mc/guardian.lua

@@ -81,7 +81,9 @@ mobs:register_mob("mobs_mc:guardian", {
 	view_range = 16,
 })
 
-mobs:spawn_specific("mobs_mc:guardian", mobs_mc.spawn.water, mobs_mc.spawn_water, 0, minetest.LIGHT_MAX+1, 30, 25000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.water - 10)
+-- Spawning disabled due to size issues
+-- TODO: Re-enable spawning
+--mobs:spawn_specific("mobs_mc:guardian", mobs_mc.spawn.water, mobs_mc.spawn_water, 0, minetest.LIGHT_MAX+1, 30, 25000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.water - 10)
 
 -- spawn eggs
 mobs:register_egg("mobs_mc:guardian", S("Guardian"), "mobs_mc_spawn_icon_guardian.png", 0)

mods/ENTITIES/mobs_mc/guardian_elder.lua

@@ -88,7 +88,9 @@ mobs:register_mob("mobs_mc:guardian_elder", {
 	view_range = 16,
 })
 
-mobs:spawn_specific("mobs_mc:guardian_elder", mobs_mc.spawn.water, mobs_mc.spawn_water, 0, minetest.LIGHT_MAX+1, 30, 40000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.water-18)
+-- Spawning disabled due to size issues
+-- TODO: Re-enable spawning
+-- mobs:spawn_specific("mobs_mc:guardian_elder", mobs_mc.spawn.water, mobs_mc.spawn_water, 0, minetest.LIGHT_MAX+1, 30, 40000, 2, mobs_mc.spawn_height.overworld_min, mobs_mc.spawn_height.water-18)
 
 -- spawn eggs
 mobs:register_egg("mobs_mc:guardian_elder", S("Elder Guardian"), "mobs_mc_spawn_icon_guardian_elder.png", 0)

mods/ENTITIES/mobs_mc/villager.lua

@@ -488,6 +488,9 @@ local function show_trade_formspec(playername, trader, tradenum)
 	end
 
 	local inv = minetest.get_inventory({type="detached", name="mobs_mc:trade_"..playername})
+	if not inv then
+		return
+	end
 	local wanted1 = inv:get_stack("wanted", 1)
 	local wanted2 = inv:get_stack("wanted", 2)
 	local offered = inv:get_stack("offered", 1)
@@ -624,6 +627,9 @@ local return_fields = function(player)
 	local name = player:get_player_name()
 	local inv_t = minetest.get_inventory({type="detached", name = "mobs_mc:trade_"..name})
 	local inv_p = player:get_inventory()
+	if not inv_t or not inv_p then
+		return
+	end
 	for i=1, inv_t:get_size("input") do
 		local stack = inv_t:get_stack("input", i)
 		return_item(stack, player, player:get_pos(), inv_p)
@@ -660,6 +666,9 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
 			end
 			local tradenum = player_tradenum[name] + dir
 			local inv = minetest.get_inventory({type="detached", name="mobs_mc:trade_"..name})
+			if not inv then
+				return
+			end
 			set_trade(trader, player, inv, tradenum)
 			update_offer(inv, player, false)
 			show_trade_formspec(name, trader, player_tradenum[name])
@@ -983,6 +992,9 @@ mobs:register_mob("mobs_mc:villager", {
 		player_trading_with[name] = self
 
 		local inv = minetest.get_inventory({type="detached", name="mobs_mc:trade_"..name})
+		if not inv then
+			return
+		end
 
 		set_trade(self, clicker, inv, 1)
 

mods/PLAYER/mcl_playerplus/init.lua

@@ -28,6 +28,9 @@ minetest.register_globalstep(function(dtime)
 			if not node_stand or not node_stand_below or not node_head or not node_feet then
 				return
 			end
+			if not minetest.registered_nodes[node_stand] or not minetest.registered_nodes[node_stand_below] or not minetest.registered_nodes[node_head] or not minetest.registered_nodes[node_feet] then
+				return
+			end
 
 			-- Cause buggy exhaustion for jumping