Fix negative offsets not being supported by container[]

[oweals/minetest.git] / builtin / game / init.lua

diff --git a/builtin/game/init.lua b/builtin/game/init.lua
index 793d9fe2bcc61957a4fa30b4c9f4594e5bd3bef6..04f0732e566b8d7f94ce9d5fe1670f13656bb002 100644 (file)
--- a/builtin/game/init.lua
+++ b/builtin/game/init.lua
@@ -1,5 +1,5 @@
 
-local scriptpath = core.get_builtin_path()..DIR_DELIM
+local scriptpath = core.get_builtin_path()
 local commonpath = scriptpath.."common"..DIR_DELIM
 local gamepath = scriptpath.."game"..DIR_DELIM
 
@@ -13,10 +13,11 @@ dofile(gamepath.."constants.lua")
 assert(loadfile(gamepath.."item.lua"))(builtin_shared)
 dofile(gamepath.."register.lua")
 
-if core.setting_getbool("profiler.load") then
+if core.settings:get_bool("profiler.load") then
        profiler = dofile(scriptpath.."profiler"..DIR_DELIM.."init.lua")
 end
 
+dofile(commonpath .. "after.lua")
 dofile(gamepath.."item_entity.lua")
 dofile(gamepath.."deprecated.lua")
 dofile(gamepath.."misc.lua")
@@ -24,6 +25,7 @@ dofile(gamepath.."privileges.lua")
 dofile(gamepath.."auth.lua")
 dofile(commonpath .. "chatcommands.lua")
 dofile(gamepath.."chatcommands.lua")
+dofile(commonpath .. "information_formspecs.lua")
 dofile(gamepath.."static_spawn.lua")
 dofile(gamepath.."detached_inventory.lua")
 assert(loadfile(gamepath.."falling.lua"))(builtin_shared)