diff --git a/files/boats/init.lua b/files/boats/init.lua index 8d27e92..c1f7e45 100644 --- a/files/boats/init.lua +++ b/files/boats/init.lua @@ -42,9 +42,6 @@ local boat = { auto = false } - --- Compatible for MultiCraft Engine 2.0 -local ah = minetest.features.object_independent_selectionbox and 0 or 10 function boat.on_rightclick(self, clicker) if not clicker or not clicker:is_player() then return @@ -74,7 +71,7 @@ function boat.on_rightclick(self, clicker) end self.driver = name clicker:set_attach(self.object, "", - {x = 0, y = ah + 1, z = -2}, {x = 0, y = 0, z = 0}) + {x = 0, y = 1, z = -2}, {x = 0, y = 0, z = 0}) player_api.player_attached[name] = true minetest.after(0.1, function() if clicker then diff --git a/files/environment/dungeon_loot/mapgen.lua b/files/environment/dungeon_loot/mapgen.lua index eb43114..2b1bf76 100644 --- a/files/environment/dungeon_loot/mapgen.lua +++ b/files/environment/dungeon_loot/mapgen.lua @@ -1,7 +1,7 @@ minetest.set_gen_notify({dungeon = true, temple = true}) local function noise3d_integer(noise, pos) - return math.abs(math.floor(noise:get3d(pos) * 0x7fffffff)) + return math.abs(math.floor(noise:get_3d(pos) * 0x7fffffff)) end local function random_sample(rand, list, count) diff --git a/files/player/player_api/models/character.b3d b/files/player/player_api/models/character.b3d index 82e1726..8b7497a 100644 Binary files a/files/player/player_api/models/character.b3d and b/files/player/player_api/models/character.b3d differ diff --git a/files/player/player_api/wieldview.lua b/files/player/player_api/wieldview.lua index 9e2cb35..ba4e55e 100644 --- a/files/player/player_api/wieldview.lua +++ b/files/player/player_api/wieldview.lua @@ -64,17 +64,9 @@ local function prepare() end end -if minetest.register_on_mods_loaded then - minetest.register_on_mods_loaded(function() - minetest.after(1, function() - prepare() - end) - end) -else -- legacy MultiCraft Engine - minetest.after(1, function() - prepare() - end) -end +minetest.register_on_mods_loaded(function() + minetest.after(1, prepare) + end) local sfinv_exists = minetest.global_exists("sfinv") local sfinv_sscsm_exists = minetest.global_exists("sfinv_sscsm") diff --git a/files/watch/init.lua b/files/watch/init.lua index 877f4d2..12bcd32 100644 --- a/files/watch/init.lua +++ b/files/watch/init.lua @@ -6,7 +6,7 @@ for hour = 0, 12 do description = S"Watch", inventory_image = "watch_watch.png^" .. img .. ".png", wield_image = "watch_watch.png^" .. img .. ".png", - groups = {watch = hour, not_in_creative_inventory = (hour == 0 and 0) or 1} + groups = {watch = hour, wieldview = 1, not_in_creative_inventory = (hour == 0 and 0) or 1} }) end