Merge branch 'main' into physics-upgrade

src/voxels/Chunk.cpp

@@ -1,13 +1,13 @@
 #include "Chunk.hpp"
 
-#include <utility>
-
 #include "content/ContentReport.hpp"
 #include "items/Inventory.hpp"
 #include "lighting/Lightmap.hpp"
 #include "util/data_io.hpp"
 #include "voxel.hpp"
 
+#include <utility>
+
 Chunk::Chunk(int xpos, int zpos, std::shared_ptr<Lightmap> lightmap)
     : x(xpos), z(zpos), lightmap(std::move(lightmap)) {
     bottom = 0;
@@ -40,6 +40,7 @@ void Chunk::addBlockInventory(
 void Chunk::removeBlockInventory(uint x, uint y, uint z) {
     if (inventories.erase(vox_index(x, y, z))) {
         flags.unsaved = true;
+        flags.inventoriesRemoved = true;
     }
 }
 

src/voxels/Chunk.hpp

@@ -38,6 +38,7 @@ public:
         bool entities : 1;
         bool blocksData : 1;
         bool dirtyHeights : 1;
+        bool inventoriesRemoved : 1;
     } flags {};
 
     uint64_t lastRandomTickId = -1;