From 7ab25a6ddb87e53e3cf3ec20a480c4a954ce1b53 Mon Sep 17 00:00:00 2001
From: yoyosource <yoyosource@nidido.de>
Date: Fri, 24 Feb 2023 21:09:14 +0100
Subject: [PATCH] Hotfix TNTSimulator other sim stuff

Signed-off-by: yoyosource <yoyosource@nidido.de>
---
 .../bausystem/features/simulator/TNTSimulator.java       | 9 ++++++++-
 .../features/simulator/TNTSimulatorListener.java         | 4 ----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulator.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulator.java
index 34efb4fb..f7c2ff71 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulator.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulator.java
@@ -112,13 +112,20 @@ public class TNTSimulator {
     public void remove(SimulatorElement element) {
         if (element instanceof TNTElement) {
             TNTElement tntElement = (TNTElement) element;
-            element.remove(tntElement);
             if (tntElement.hasParent()) {
                 tntElement.getParent().remove(tntElement);
                 if (tntElement.getParent().getElements().isEmpty()) {
                     remove(tntElement.getParent());
                 }
+            } else {
+                element.remove(tntElement);
             }
+        } else if (element instanceof TNTGroup) {
+            TNTGroup tntGroup = (TNTGroup) element;
+            tntGroup.getElements().forEach(tntElement -> {
+                tntElement.remove(tntElement);
+            });
+            tntGroup.getElements().clear();
         }
         element.close();
         tntElementList.remove(element);
diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulatorListener.java b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulatorListener.java
index 491f37c6..e877fc90 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulatorListener.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/simulator/TNTSimulatorListener.java
@@ -32,7 +32,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.*;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
-import org.bukkit.util.RayTraceResult;
 
 import java.util.function.Function;
 
@@ -89,9 +88,6 @@ public class TNTSimulatorListener implements Listener {
     @EventHandler
     public void onPlayerQuit(PlayerQuitEvent event) {
         SimulatorCursor.hide(event.getPlayer(), null);
-        SimulatorStorage.getSimulatorNames().forEach(s -> {
-            SimulatorStorage.getSimulator(s).hide(event.getPlayer());
-        });
     }
 
     @EventHandler