From 61741a5cc898272627491b4cd8d5404048169df1 Mon Sep 17 00:00:00 2001
From: Richard Try <bazrovstepan@gmail.com>
Date: Thu, 19 Dec 2024 01:37:34 +0300
Subject: [PATCH 1/3] Copy metatable in table.deepcopy

Copy metatable as well during deep copying
---
 res/scripts/stdmin.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/scripts/stdmin.lua b/res/scripts/stdmin.lua
index 13934e06..76df31e2 100644
--- a/res/scripts/stdmin.lua
+++ b/res/scripts/stdmin.lua
@@ -74,7 +74,7 @@ function table.deep_copy(t)
         end
     end
 
-    return copied
+    return setmetatable(copied, getmetatable(t))
 end
 
 function table.count_pairs(t)

From 2787f2fc5495004f6029644ed5221f3abfc0c68f Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Thu, 19 Dec 2024 22:44:54 +0300
Subject: [PATCH 2/3] fix: grabbed item is deleted on inventory close

---
 src/frontend/hud.cpp | 28 ++++++++++++++++++++++++++++
 src/frontend/hud.hpp |  3 +++
 2 files changed, 31 insertions(+)

diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index 21111e18..01252c4c 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -47,6 +47,7 @@
 #include "window/Window.hpp"
 #include "world/Level.hpp"
 #include "world/World.hpp"
+#include "debug/Logger.hpp"
 
 #include <assert.h>
 #include <memory>
@@ -56,6 +57,8 @@
 
 using namespace gui;
 
+static debug::Logger logger("hud");
+
 bool Hud::showGeneratorMinimap = false;
 
 // implemented in debug_panel.cpp
@@ -485,7 +488,32 @@ void Hud::openPermanent(UiDocument* doc) {
     add(HudElement(hud_element_mode::permanent, doc, doc->getRoot(), false));
 }
 
+void Hud::dropExchangeSlot() {
+    auto slotView = std::dynamic_pointer_cast<SlotView>(
+        gui->get(SlotView::EXCHANGE_SLOT_NAME)
+    );
+    if (slotView == nullptr) {
+        return;
+    }
+    ItemStack& stack = slotView->getStack();
+    
+    auto indices = frontend.getLevel().content->getIndices();
+    if (auto invView = std::dynamic_pointer_cast<InventoryView>(blockUI)) {
+        invView->getInventory()->move(stack, indices);
+    }
+    if (stack.isEmpty()) {
+        return;
+    }
+    player->getInventory()->move(stack, indices);
+    if (!stack.isEmpty()) {
+        logger.warning() << "discard item [" << stack.getItemId() << ":"
+                         << stack.getCount();
+        stack.clear();
+    }
+}
+
 void Hud::closeInventory() {
+    dropExchangeSlot();
     gui->remove(SlotView::EXCHANGE_SLOT_NAME);
     exchangeSlot = nullptr;
     exchangeSlotInv = nullptr;
diff --git a/src/frontend/hud.hpp b/src/frontend/hud.hpp
index 5594664a..ad834955 100644
--- a/src/frontend/hud.hpp
+++ b/src/frontend/hud.hpp
@@ -128,6 +128,9 @@ class Hud : public util::ObjectsKeeper {
     void updateHotbarControl();
     void cleanup();
 
+    /// @brief Perform exchange slot removal when it's not empty.
+    void dropExchangeSlot();
+
     void showExchangeSlot();
     void updateWorldGenDebugVisualization();
 public:

From cda34e3975a42696ea31a1b0018731e746cd13bb Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Thu, 19 Dec 2024 22:54:54 +0300
Subject: [PATCH 3/3] fix block overriding

---
 src/content/ContentLoader.cpp | 8 +++-----
 src/voxels/Block.hpp          | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/content/ContentLoader.cpp b/src/content/ContentLoader.cpp
index 1e954a55..fee559e4 100644
--- a/src/content/ContentLoader.cpp
+++ b/src/content/ContentLoader.cpp
@@ -220,11 +220,11 @@ void ContentLoader::loadBlock(
     }
 
     // block model
-    std::string modelTypeName;
+    std::string modelTypeName = to_string(def.model);
     root.at("model").get(modelTypeName);
     root.at("model-name").get(def.modelName);
     if (auto model = BlockModel_from(modelTypeName)) {
-        if (*model == BlockModel::custom) {
+        if (*model == BlockModel::custom && def.customModelRaw == nullptr) {
             if (root.has("model-primitives")) {
                 def.customModelRaw = root["model-primitives"];
             } else if (def.modelName.empty()) {
@@ -246,7 +246,7 @@ void ContentLoader::loadBlock(
     root.at("material").get(def.material);
 
     // rotation profile
-    std::string profile = "none";
+    std::string profile = def.rotations.name;
     root.at("rotation").get(profile);
 
     def.rotatable = profile != "none";
@@ -285,8 +285,6 @@ void ContentLoader::loadBlock(
         );
         aabb.b += aabb.a;
         def.hitboxes = {aabb};
-    } else {
-        def.hitboxes = {AABB()};
     }
 
     // block light emission [r, g, b] where r,g,b in range [0..15]
diff --git a/src/voxels/Block.hpp b/src/voxels/Block.hpp
index e7fb182c..557bf04c 100644
--- a/src/voxels/Block.hpp
+++ b/src/voxels/Block.hpp
@@ -181,7 +181,7 @@ public:
     bool translucent = false;
 
     /// @brief Set of block physical hitboxes
-    std::vector<AABB> hitboxes;
+    std::vector<AABB> hitboxes {AABB()};
 
     /// @brief Set of available block rotations (coord-systems)
     BlockRotProfile rotations = BlockRotProfile::NONE;