From 4a752ef0a250f95b9b81f0b5ef2ed8c4889194c2 Mon Sep 17 00:00:00 2001
From: ChomeNS <95471003+ChomeNS@users.noreply.github.com>
Date: Fri, 21 Mar 2025 17:13:38 +0700
Subject: [PATCH] fix: RefillCoreCommand not working correctly

---
 build-number.txt                                     |  2 +-
 .../me/chayapak1/chomens_bot/plugins/CorePlugin.java | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build-number.txt b/build-number.txt
index 22b9ca23..779ae3c6 100644
--- a/build-number.txt
+++ b/build-number.txt
@@ -1 +1 @@
-2050
\ No newline at end of file
+2053
\ No newline at end of file
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java
index 191b2d9d..21bb67f2 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/CorePlugin.java
@@ -93,7 +93,7 @@ public class CorePlugin extends PositionPlugin.Listener {
 
             if (!shouldRefill) return;
 
-            refill();
+            refill(false);
             shouldRefill = false;
         }, 0, 1, TimeUnit.SECONDS);
 
@@ -432,7 +432,7 @@ public class CorePlugin extends PositionPlugin.Listener {
                         Math.abs(botChunkPosZ - coreChunkPosZ) > bot.world.simulationDistance
         ) {
             reset();
-            refill();
+            refill(false);
         }
 
         if (!ready) {
@@ -471,7 +471,8 @@ public class CorePlugin extends PositionPlugin.Listener {
         block = Vector3i.from(from);
     }
 
-    public void refill () {
+    public void refill () { refill(true); }
+    public void refill (boolean force) {
         if (!ready) return;
 
         final Map<Integer, Boolean> refilledMap = new HashMap<>();
@@ -483,7 +484,10 @@ public class CorePlugin extends PositionPlugin.Listener {
 
                     final Boolean refilled = refilledMap.get(y);
 
-                    if (isCommandBlockState(block) || (refilled != null && refilled)) continue;
+                    if (
+                            (!force && isCommandBlockState(block)) ||
+                                    (refilled != null && refilled)
+                    ) continue;
 
                     final String command = String.format(
                             "minecraft:fill %s %s %s %s %s %s minecraft:command_block{CustomName:'%s'}",