oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

General code refactoring/improvements in server, treegen and connection

Browse source
This commit is contained in:
sfan5 2024-03-12 14:13:24 +01:00
parent 24f2c38093
commit bc4ab8b99e
34 changed files with 330 additions and 439 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/unittest/test_sao.cpp
View file

@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "test.h"
#include "mock_server.h"
#include "scripting_server.h"
#include "server/luaentity_sao.h"
#include "emerge.h"
@ -73,10 +72,11 @@ void TestSAO::runTests(IGameDef *gamedef)
ofs2 << "backend = dummy\n";
}
ServerScripting server_scripting(&server);
server.createScripting();
try {
server_scripting.loadBuiltin();
server_scripting.loadMod(helper_lua, BUILTIN_MOD_NAME);
auto script = server.getScriptIface();
script->loadBuiltin();
script->loadMod(helper_lua, BUILTIN_MOD_NAME);
} catch (ModError &e) {
rawstream << e.what() << std::endl;
num_tests_failed = 1;
@ -88,8 +88,8 @@ void TestSAO::runTests(IGameDef *gamedef)
// EmergeManager should become mockable
MetricsBackend mb;
EmergeManager emerge(&server, &mb);
auto *map = new ServerMap(server.getWorldPath(), gamedef, &emerge, &mb);
ServerEnvironment env(map, &server_scripting, &server, "", &mb);
auto map = std::make_unique<ServerMap>(server.getWorldPath(), gamedef, &emerge, &mb);
ServerEnvironment env(std::move(map), &server, &mb);
env.loadMeta();
m_step_interval = std::max(