oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-07-02 16:38:41 +00:00
Code Wiki Activity

Inventory: prevent item loss when stacking oversized ItemStacks (#14072)

Browse source
This commit is contained in:
SmallJoker 2023-12-15 10:24:04 +01:00 • committed by GitHub
parent c871b6dd4e
commit 94a54375e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 45 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/unittest/test_moveaction.cpp
View file

@ -36,6 +36,7 @@ public:
void runTests(IGameDef *gamedef);
void testMove(ServerActiveObject *obj, IGameDef *gamedef);
void testMoveFillStack(ServerActiveObject *obj, IGameDef *gamedef);
void testMoveSomewhere(ServerActiveObject *obj, IGameDef *gamedef);
void testMoveUnallowed(ServerActiveObject *obj, IGameDef *gamedef);
void testMovePartial(ServerActiveObject *obj, IGameDef *gamedef);
@ -51,14 +52,24 @@ void TestMoveAction::runTests(IGameDef *gamedef)
MockServer server;
ServerScripting server_scripting(&server);
server_scripting.loadMod(Server::getBuiltinLuaPath() + DIR_DELIM "init.lua", BUILTIN_MOD_NAME);
server_scripting.loadMod(std::string(HELPERS_PATH) + DIR_DELIM "helper_moveaction.lua", BUILTIN_MOD_NAME);
try {
server_scripting.loadMod(Server::getBuiltinLuaPath() + DIR_DELIM "init.lua", BUILTIN_MOD_NAME);
server_scripting.loadMod(
std::string(HELPERS_PATH) + DIR_DELIM "helper_moveaction.lua", BUILTIN_MOD_NAME
);
} catch (ModError &e) {
// Print backtrace in case of syntax errors
rawstream << e.what() << std::endl;
num_tests_failed = 1;
return;
}
MetricsBackend mb;
ServerEnvironment server_env(nullptr, &server_scripting, &server, "", &mb);
MockServerActiveObject obj(&server_env);
TEST(testMove, &obj, gamedef);
TEST(testMoveFillStack, &obj, gamedef);
TEST(testMoveSomewhere, &obj, gamedef);
TEST(testMoveUnallowed, &obj, gamedef);
TEST(testMovePartial, &obj, gamedef);
@ -95,6 +106,26 @@ void TestMoveAction::testMove(ServerActiveObject *obj, IGameDef *gamedef)
UASSERT(inv.p2.getList("main")->getItem(0).getItemString() == "default:stone 20");
}
void TestMoveAction::testMoveFillStack(ServerActiveObject *obj, IGameDef *gamedef)
{
MockInventoryManager inv(gamedef);
auto list = inv.p1.addList("main", 10);
list->changeItem(0, parse_itemstack("default:stone 209"));
list->changeItem(1, parse_itemstack("default:stone 90")); // 9 free slots
apply_action("Move 209 player:p1 main 0 player:p1 main 1", &inv, obj, gamedef);
UASSERT(list->getItem(0).getItemString() == "default:stone 200");
UASSERT(list->getItem(1).getItemString() == "default:stone 99");
// Trigger stack swap
apply_action("Move 200 player:p1 main 0 player:p1 main 1", &inv, obj, gamedef);
UASSERT(list->getItem(0).getItemString() == "default:stone 99");
UASSERT(list->getItem(1).getItemString() == "default:stone 200");
}
void TestMoveAction::testMoveSomewhere(ServerActiveObject *obj, IGameDef *gamedef)
{
MockInventoryManager inv(gamedef);