Merge branch 'master' of https://git.minetest.land/MineClone2/MineClone2

mods/ENTITIES/mcl_boats/init.lua

@@ -163,6 +163,8 @@ function boat.get_staticdata(self)
 end
 
 function boat.on_death(self, killer)
+	mcl_burning.extinguish(self.object)
+
 	if killer and killer:is_player() and minetest.is_creative_enabled(killer:get_player_name()) then
 		local inv = killer:get_inventory()
 		if not inv:contains_item("main", self._itemstring) then
@@ -188,6 +190,8 @@ function boat.on_punch(self, puncher, time_from_last_punch, tool_capabilities, d
 end
 
 function boat.on_step(self, dtime, moveresult)
+	mcl_burning.tick(self.object, dtime)
+
 	self._v = get_v(self.object:get_velocity()) * get_sign(self._v)
 	local v_factor = 1
 	local v_slowdown = 0.02

mods/ENTITIES/mcl_paintings/init.lua

@@ -191,6 +191,14 @@ minetest.register_craftitem("mcl_paintings:painting", {
 		if pointed_thing.type ~= "node" then
 			return itemstack
 		end
+
+		local node = minetest.get_node(pointed_thing.under)
+		if placer and not placer:get_player_control().sneak then
+			if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
+				return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack
+			end
+		end
+
 		local dir = vector.subtract(pointed_thing.above, pointed_thing.under)
 		dir = vector.normalize(dir)
 		if dir.y ~= 0 then

mods/ITEMS/mcl_end/end_crystal.lua

@@ -77,7 +77,7 @@ minetest.register_entity("mcl_end:crystal", {
 	_exploded = false,
 	_hittable_by_projectile = true
 })
- 
+
 minetest.register_craftitem("mcl_end:crystal", {
 	inventory_image = "mcl_end_crystal_item.png",
 	description = S("End Crystal"),
@@ -86,9 +86,14 @@ minetest.register_craftitem("mcl_end:crystal", {
 		if pointed_thing.type == "node" then
 			local pos = minetest.get_pointed_thing_position(pointed_thing)
 			local node = minetest.get_node(pos).name
+			if placer and not placer:get_player_control().sneak then
+				if minetest.registered_nodes[node.name] and minetest.registered_nodes[node.name].on_rightclick then
+					return minetest.registered_nodes[node.name].on_rightclick(pointed_thing.under, node, placer, itemstack) or itemstack
+				end
+			end
 			if find_crystal(pos) then return itemstack end
 			if node == "mcl_core:obsidian" or node == "mcl_core:bedrock" then
-				if not minetest.is_creative_enabled(placer:get_player_name()) then 
+				if not minetest.is_creative_enabled(placer:get_player_name()) then
 					itemstack:take_item()
 				end
 				spawn_crystal(pos)
@@ -110,5 +115,5 @@ minetest.register_craft({
 		{"mcl_core:glass", "mcl_mobitems:ghast_tear", "mcl_core:glass"},
 	}
 })
- 
+
 minetest.register_alias("mcl_end_crystal:end_crystal", "mcl_end:crystal")

mods/ITEMS/mcl_nether/init.lua

@@ -106,7 +106,7 @@ minetest.register_node("mcl_nether:magma", {
 	sounds = mcl_sounds.node_sound_stone_defaults(),
 	-- From walkover mod
 	on_walk_over = function(loc, nodeiamon, player)
-		if minetest.global_exists("mcl_potions") and mcl_potions.player_has_effect(player, "fire_proof") then
+		if player and player:get_player_control().sneak or minetest.global_exists("mcl_potions") and mcl_potions.player_has_effect(player, "fire_proof") then
 			return
 		end
 		-- Hurt players standing on top of this block

mods/PLAYER/wieldview/transform.lua

@@ -22,11 +22,6 @@ wieldview.transform = {
 	["mcl_flowers:oxeye_daisy"]="R270",
 	["mcl_flowers:fern"]="R270",
 	["mcl_flowers:tallgrass"]="R270",
-	["mcl_buckets:bucket_empty"]="R270",
-	["mcl_buckets:bucket_water"]="R270",
-	["mcl_buckets:bucket_river_water"]="R270",
-	["mcl_buckets:bucket_lava"]="R270",
-	["mcl_mobitems:milk_bucket"]="R270",
 	["mcl_potions:glass_bottle"]="R270",
 	["mcl_potions:water"]="R270",
 	["mcl_potions:awkward"]="R270",