From 71238a0167ba4d7a6599f0d54a07adfcdee9e3e5 Mon Sep 17 00:00:00 2001
From: YoyoNow <jwsteam@nidido.de>
Date: Thu, 10 Jul 2025 13:40:21 +0200
Subject: [PATCH] Add Simulator.autoTestblock

---
 .../features/simulator/execute/SimulatorExecutor.java         | 2 +-
 .../features/simulator/execute/SimulatorStabGenerator.java    | 4 ++--
 .../bausystem/features/simulator/execute/StabData.java        | 2 --
 .../bausystem/features/simulator/execute/StabStep.java        | 2 +-
 .../bausystem/features/simulator/gui/SimulatorTNTGui.java     | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorExecutor.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorExecutor.java
index ff343a9e..7ca2da8c 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorExecutor.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorExecutor.java
@@ -95,7 +95,7 @@ public class SimulatorExecutor implements Listener {
                     }
                 });
 
-        if (simulator.isAutoTestblock()) {
+        if (player != null && simulator.isAutoTestblock()) {
             player.performCommand("tb");
         }
         if (simulator.isAutoTrace() && onEnd == null) {
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorStabGenerator.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorStabGenerator.java
index 3263f772..37ca8bf3 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorStabGenerator.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/SimulatorStabGenerator.java
@@ -30,8 +30,8 @@ public class SimulatorStabGenerator {
 
     private final StabData stabData;
 
-    public SimulatorStabGenerator(Player player, Region region, Simulator simulator, TNTElement tntElement, int depthLimit) {
-        stabData = new StabData(player, region, simulator, tntElement, tntElement.getPhases(), depthLimit);
+    public SimulatorStabGenerator(Region region, Simulator simulator, TNTElement tntElement, int depthLimit) {
+        stabData = new StabData(region, simulator, tntElement, tntElement.getPhases(), depthLimit);
         new StabSetup(stabData);
     }
 
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabData.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabData.java
index 48c0bc89..dc1a6e0e 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabData.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabData.java
@@ -25,7 +25,6 @@ import de.steamwar.bausystem.features.simulator.data.tnt.TNTElement;
 import de.steamwar.bausystem.features.simulator.data.tnt.TNTPhase;
 import de.steamwar.bausystem.region.Region;
 import lombok.RequiredArgsConstructor;
-import org.bukkit.entity.Player;
 
 import java.util.List;
 import java.util.logging.Level;
@@ -39,7 +38,6 @@ public class StabData {
     protected static final int TNT_INCREASE = 10;
     protected static final int MIN_BLOCK_TO_COUNT_AS_DEPTH = 20;
 
-    protected final Player player;
     protected final Region region;
     protected final Simulator simulator;
     protected final TNTElement tntElement;
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabStep.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabStep.java
index 9d5bae91..6a0e1a2f 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabStep.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/execute/StabStep.java
@@ -58,7 +58,7 @@ public abstract class StabStep {
     protected abstract void start();
 
     protected final void runSimulator(Runnable onFinish) {
-        SimulatorExecutor.run(data.player, data.simulator, () -> {
+        SimulatorExecutor.run(null, data.simulator, () -> {
             Bukkit.getScheduler().runTaskLater(BauSystem.getInstance(), () -> {
                 if (this instanceof Listener) {
                     HandlerList.unregisterAll((Listener) this);
diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTGui.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTGui.java
index 340ae014..471270c9 100644
--- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTGui.java
+++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/gui/SimulatorTNTGui.java
@@ -106,7 +106,7 @@ public class SimulatorTNTGui extends SimulatorScrollGui<TNTPhase> {
             inventory.setItem(49, new SWItem(Material.CALIBRATED_SCULK_SENSOR, "§eCreate Stab", click -> {
                 new SimulatorAnvilGui<>(player, "Depth Limit", "", Integer::parseInt, depthLimit -> {
                     if (depthLimit <= 0) return false;
-                    simulator.setStabGenerator(new SimulatorStabGenerator(player, Region.getRegion(player.getLocation()), simulator, tnt, depthLimit));
+                    simulator.setStabGenerator(new SimulatorStabGenerator(Region.getRegion(player.getLocation()), simulator, tnt, depthLimit));
                     SimulatorWatcher.update(simulator);
                     return true;
                 }, null).open();