Merge pull request #17 from yzh5606/main

seems fix the memory issue

2 files changed, 5 insertions, 3 deletions

diff --git a/source/game/scripting/StarLuaRoot.cpp b/source/game/scripting/StarLuaRoot.cpp
index c538df1..d79e8f4 100644
--- a/source/game/scripting/StarLuaRoot.cpp
+++ b/source/game/scripting/StarLuaRoot.cpp
@@ -106,9 +106,11 @@ LuaContext LuaRoot::createContext(StringList const& scriptPaths) {
     }
   });
 
-  newContext.set("loadstring", m_luaEngine->createFunction([newContext](String const& source, Maybe<String> const& name, Maybe<LuaValue> const& env) -> LuaFunction {
+  auto handleIndex = newContext.handleIndex();
+  auto engine = m_luaEngine.get();
+  newContext.set("loadstring", m_luaEngine->createFunction([engine,handleIndex](String const& source, Maybe<String> const& name, Maybe<LuaValue> const& env) -> LuaFunction {
     String functionName = name ? strf("loadstring: {}", *name) : "loadstring";
-    return newContext.engine().createFunctionFromSource(newContext.handleIndex(), source.utf8Ptr(), source.utf8Size(), functionName.utf8Ptr());
+    return engine->createFunctionFromSource(handleIndex, source.utf8Ptr(), source.utf8Size(), functionName.utf8Ptr());
   }));
 
   auto assets = Root::singleton().assets();
diff --git a/source/utility/world_benchmark.cpp b/source/utility/world_benchmark.cpp
index 40476a1..90524f5 100644
--- a/source/utility/world_benchmark.cpp
+++ b/source/utility/world_benchmark.cpp
@@ -81,7 +81,7 @@ int main(int argc, char** argv) {
           lastReport = Time::monotonicTime();
           coutf("[{}] {}s | FPS: {} | Entities: {}\n", j, Time::monotonicTime() - start, fps, entityCount);
         }
-        worldServer.update();
+        worldServer.update(ServerGlobalTimestep * GlobalTimescale);
       }
       double totalTime = Time::monotonicTime() - start;
       coutf("Finished run of running dungeon world '{}' with seed {} for {} steps in {} seconds, average FPS: {}\n",