voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-08 20:41:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

fix fatal error on invalid item id in inventory

Browse source
This commit is contained in:
MihailRis 2025-12-16 00:17:51 +03:00
parent 77b4382577
commit 180dd5051b
4 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/items/Inventory.cpp
View file

@ -1,6 +1,9 @@
#include "Inventory.hpp"
#include "content/ContentReport.hpp"
#include "debug/Logger.hpp"
static debug::Logger logger("inventory");
Inventory::Inventory(int64_t id, size_t size) : id(id), slots(size) {
}
@ -104,6 +107,22 @@ dv::value Inventory::serialize() const {
return map;
}
void Inventory::check(const ContentIndices& indices) {
for (size_t i = 0; i < slots.size(); i++) {
auto& slot = slots[i];
if (indices.items.get(slot.getItemId()) == nullptr) {
#ifdef NDEBUG
logger.error() << "invalid item id " << slot.getItemId()
<< " found in inventory #" << id << " slot #" << i
<< "; will reset";
slot.clear();
#else
abort();
#endif
}
}
}
void Inventory::convert(const ContentReport* report) {
for (auto& slot : slots) {
itemid_t id = slot.getItemId();

1
src/items/Inventory.hpp
View file

@ -39,6 +39,7 @@ public:
dv::value serialize() const override;
void check(const ContentIndices& indices);
void convert(const ContentReport* report);
static void convert(dv::value& data, const ContentReport* report);