aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/server.lua7
1 files changed, 6 insertions, 1 deletions
diff --git a/net/server.lua b/net/server.lua
index 15bba603..a2325735 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -5,6 +5,9 @@ local server;
if have_luaevent and use_luaevent == true then
server = require "net.server_event";
+ -- util.timer requires "net.server", so instead of having
+ -- Lua look for, and load us again (causing a loop) - set this here
+ -- (usually it isn't set until we return, look down there...)
package.loaded["net.server"] = server;
-- Backwards compatibility for timers, addtimer
@@ -18,4 +21,6 @@ else
package.loaded["net.server"] = server;
end
-return server;
+-- require "net.server" shall now forever return this,
+-- ie. server_select or server_event as chosen above.
+return server;