Fix errors with Minetest 5.3.0-dev

Fixes #154
minetest-LOTR · May 25, 2020 · bc5927e · bc5927e
1 parent fac6382
commit bc5927e
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 11 deletions.
diff --git a/mods/default/mapgen.lua b/mods/default/mapgen.lua
@@ -70,7 +70,7 @@ minetest.register_alias("mapgen_stair_sandstonebrick", "stairs:stair_cobble")
 -- Ore generation
 --
 
-local wl = minetest.get_mapgen_setting("water_level")
+local wl = tonumber(minetest.get_mapgen_setting("water_level")) or 1
 
 minetest.register_ore({
 	ore_type       = "scatter",

diff --git a/mods/lottmapgen/schematics.lua b/mods/lottmapgen/schematics.lua
@@ -167,7 +167,7 @@ lottmapgen.fill_bellow = function(fill)
 	local replace_node = {}
 	replace_node[minetest.get_content_id("lottother:dirt")]=minetest.get_content_id("default:dirt")
 	replace_node[minetest.get_content_id("lottother:snow")]=minetest.get_content_id("default:snowblock")
-	replace_node[minetest.get_content_id("lottother:mordor_stone")]=minetest.get_content_id("default:mordor_stone")
+	replace_node[minetest.get_content_id("lottother:mordor_stone")]=minetest.get_content_id("lottmapgen:mordor_stone")
 
 	local c_air = 	minetest.get_content_id("air")
 	local c_ignore = minetest.get_content_id("ignore")

diff --git a/mods/lottores/init.lua b/mods/lottores/init.lua
@@ -99,7 +99,7 @@ minetest.register_node("lottores:mineral_salt", {
 			}
 		}
 	},
-	sounds = default.node_sound_dirt_defaults,
+	sounds = default.node_sound_dirt_defaults(),
 })
 
 -- Craft Items

diff --git a/mods/lottores/ithildin.lua b/mods/lottores/ithildin.lua
@@ -14,8 +14,6 @@ minetest.register_node("lottores:ithildin_0", {
 minetest.register_node("lottores:ithildin_1", {
 	description = "Ithildin",
 	tiles = {"ithildin_1.png"},
-	inventory_image = {"ithildin_1.png"},
-	wield_image = {"ithildin_1.png"},
 	paramtype = "light",
 	drawtype = 'glasslike',
 	walkable = false,

diff --git a/mods/lottpotion/potionbrewing.lua b/mods/lottpotion/potionbrewing.lua
@@ -207,8 +207,6 @@ minetest.register_node("lottpotion:potion_brewer", {
 	drawtype = "plantlike",
 	visual_scale = 1.0,
 	tiles = {"lottpotion_potion_brewer.png"},
-	inventory_image = {"lottpotion_potion_brewer.png"},
-	wield_image = {"lottpotion_potion_brewer.png"},
 	paramtype = "light",
      sounds = default.node_sound_stone_defaults(),
 	selection_box = {
@@ -234,8 +232,6 @@ minetest.register_node("lottpotion:potion_brewer_active", {
 	drawtype = "plantlike",
 	visual_scale = 1.0,
 	tiles = {"lottpotion_potion_brewer_active.png"},
-     inventory_image = {"lottpotion_potion_brewer.png"},
-	wield_image = {"lottpotion_potion_brewer.png"},
 	paramtype = "light",
 	light_source = 8,
 	selection_box = {

diff --git a/mods/mobs/api.lua b/mods/mobs/api.lua
@@ -2519,7 +2519,6 @@ end
 local c_air = minetest.get_content_id("air")
 local c_ignore = minetest.get_content_id("ignore")
 local c_obsidian = minetest.get_content_id("default:obsidian")
-local c_brick = minetest.get_content_id("default:obsidianbrick")
 local c_chest = minetest.get_content_id("default:chest_locked")
 
 -- explosion (cannot break protected or unbreakable nodes)
@@ -2568,7 +2567,6 @@ function mobs:explosion(pos, radius, fire, smoke, sound)
 		and data[vi] ~= c_air
 		and data[vi] ~= c_ignore
 		and data[vi] ~= c_obsidian
-		and data[vi] ~= c_brick
 		and data[vi] ~= c_chest then
 
 			local n = node_ok(p).name
-Original file line number
+Diff line change
@@ Expand Up / @@ -99,7 +99,7 @@ minetest.register_node("lottores:mineral_salt", { @@
     			}
     		}
     	},
-    	sounds = default.node_sound_dirt_defaults,
+    	sounds = default.node_sound_dirt_defaults(),
     })
     -- Craft Items
@@ Expand Down @@