Finally fix client not initializing fully, randomly :)

[crafter_client.git] / init.lua

diff --git a/init.lua b/init.lua
index 4d1cac3d6fe4e87847bca7feb38b26a63af45537..7c52e45332207dc9cf9369a92c50ed69a7f5cb58 100644 (file)
--- a/init.lua
+++ b/init.lua
@@ -5,6 +5,8 @@ weather_type = nil
 running_send = nil
 player_movement_state = nil
 nether = nil
+aether = nil
+run = nil
 
 function initialize_all()
        --declare globals for now
@@ -14,6 +16,7 @@ function initialize_all()
        running_send = minetest.mod_channel_join("running_send")
        player_movement_state = minetest.mod_channel_join("player.player_movement_state")
        nether = minetest.mod_channel_join("nether_teleporters")
+       aether = minetest.mod_channel_join("aether_teleporters")
                
        --next we load everything seperately because it's easier to work on individual files than have everything jammed into one file
        --not into seperate mods because that is unnecessary and cumbersome
@@ -22,17 +25,17 @@ function initialize_all()
        dofile(path.."/weather_handling.lua")
        dofile(path.."/environment_effects.lua")
        dofile(path.."/nether.lua")
+       dofile(path.."/aether.lua")
+       dofile(path.."/waila.lua")
+       dofile(path.."/music_handling.lua")
 end
 
---we must delay initialization until the server tells us it's ready to begin
-local initialize_client_modchannels = minetest.mod_channel_join("initializer")
-
+--we must delay initialization until the player exists in the world
 local function recursive_startup_attempt()
-       local ready_to_go = initialize_client_modchannels:is_writeable()
-       if ready_to_go == true then
+       local ready_to_go = minetest.localplayer
+       if ready_to_go and minetest.get_node_or_nil(minetest.localplayer:get_pos()) then
                --good to begin
                initialize_all()
-               initialize_client_modchannels:leave()
        else
                --try again
                minetest.after(0,function()