From 4a880177da63b282d0889493c4497bf81c4780ae Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Thu, 4 Dec 2025 20:59:02 +0300
Subject: [PATCH 1/2] fix block ticks

---
 src/voxels/blocks_agent.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/voxels/blocks_agent.cpp b/src/voxels/blocks_agent.cpp
index ea668f8e6..46fae323c 100644
--- a/src/voxels/blocks_agent.cpp
+++ b/src/voxels/blocks_agent.cpp
@@ -160,12 +160,6 @@ static void initialize_block(
     block_register_events.push_back(BlockRegisterEvent {
         static_cast<uint8_t>(bits | 1), def.rt.id, {x, y, z}
     });
-
-    if (def.rt.funcsset.onblocktick) {
-        block_register_events.push_back(BlockRegisterEvent {
-            bits, def.rt.id, {x, y, z}
-        });
-    }
 }
 
 template <class Storage>

From 719ba6e17a995d689e2c6e4845d920b6c42856c1 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Thu, 4 Dec 2025 22:23:16 +0300
Subject: [PATCH 2/2] fix overriden content units scripts overriding

---
 src/content/loading/BlockLoader.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/content/loading/BlockLoader.cpp b/src/content/loading/BlockLoader.cpp
index a8615e3f2..6866443bc 100644
--- a/src/content/loading/BlockLoader.cpp
+++ b/src/content/loading/BlockLoader.cpp
@@ -247,5 +247,7 @@ template<> void ContentUnitLoader<Block>::loadUnit(
     if (def.hidden && def.pickingItem == def.name + BLOCK_ITEM_SUFFIX) {
         def.pickingItem = CORE_EMPTY;
     }
-    def.scriptFile = pack.id + ":scripts/" + def.scriptName + ".lua";
+    if (root.has("script-name") || def.scriptFile.empty()) {
+        def.scriptFile = pack.id + ":scripts/" + def.scriptName + ".lua";
+    }
 }