From 0d2e028facb3a645f6470c3911c0d284bdb0af0c Mon Sep 17 00:00:00 2001 From: D4rkr34lm Date: Thu, 8 Aug 2024 15:38:58 +0200 Subject: [PATCH] Moved init functionality in onEnable --- .../steamwar/bausystem/features/tracer/TraceManager.java | 4 +++- .../bausystem/features/tracer/TraceRecorder.java | 9 +++++---- .../bausystem/features/tracer/TraceRecordingWrapper.java | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java index 6596d46d..3972a034 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceManager.java @@ -30,6 +30,7 @@ import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerQuitEvent; +import org.bukkit.event.server.PluginEnableEvent; import java.io.File; import java.util.*; @@ -46,7 +47,8 @@ public class TraceManager implements Listener { public static File tracesFolder = new File(Bukkit.getWorlds().get(0).getWorldFolder(), "traces"); - public TraceManager() { + @EventHandler + public void init(PluginEnableEvent event) { if (!tracesFolder.exists()) tracesFolder.mkdir(); diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecorder.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecorder.java index fd0274fc..89b10c7f 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecorder.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecorder.java @@ -31,6 +31,7 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityExplodeEvent; import org.bukkit.event.entity.EntitySpawnEvent; +import org.bukkit.event.server.PluginEnableEvent; import java.util.*; import java.util.logging.Level; @@ -70,7 +71,8 @@ public class TraceRecorder implements Listener { */ private final Set autoTraceRegions = new HashSet<>(); - public TraceRecorder() { + @EventHandler + public void init(PluginEnableEvent event) { BauSystem.runTaskTimer(BauSystem.getInstance(), () -> { record(); checkForAutoTraceFinish(); @@ -170,14 +172,13 @@ public class TraceRecorder implements Listener { if (history.size() == 0) { try { historyMap.put(tntPrimed, history); - } - catch (NullPointerException e) { + } catch (NullPointerException e) { Logger logger = Bukkit.getLogger(); //TODO remove when no longer neccecary logger.log(Level.WARNING, "Nullpointer thrown by historyMap"); logger.log(Level.WARNING, "TNT History: " + history); logger.log(Level.WARNING, "History Map: " + historyMap); - throw e; + throw e; } tntID = wrappedTrace.getNextOpenRecordIdAndIncrement(); } else { diff --git a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecordingWrapper.java b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecordingWrapper.java index c7d2a043..bf104e1f 100644 --- a/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecordingWrapper.java +++ b/BauSystem/BauSystem_Main/src/de/steamwar/bausystem/features/tracer/TraceRecordingWrapper.java @@ -29,6 +29,7 @@ import java.util.List; public class TraceRecordingWrapper { + @Getter private final Trace trace; @Getter