From 6a5e5f8d44d9405b8816b85399fc30cf02886632 Mon Sep 17 00:00:00 2001
From: YouHaveTrouble <youhavetrouble@youhavetrouble.me>
Date: Mon, 28 Oct 2024 19:52:35 +0100
Subject: [PATCH] fix worldguard hook failing to initialize

---
 pom.xml                                                     | 2 +-
 .../java/me/youhavetrouble/preventstabby/PreventStabby.java | 5 ++++-
 .../youhavetrouble/preventstabby/hooks/WorldGuardHook.java  | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7d7f0dc..c044bda 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.youhavetrouble</groupId>
     <artifactId>PreventStabby</artifactId>
-    <version>2.0.0-pre-5</version>
+    <version>2.0.0-rc-1</version>
     <packaging>jar</packaging>
 
     <name>PreventStabby</name>
diff --git a/src/main/java/me/youhavetrouble/preventstabby/PreventStabby.java b/src/main/java/me/youhavetrouble/preventstabby/PreventStabby.java
index 7562e8e..ca522be 100644
--- a/src/main/java/me/youhavetrouble/preventstabby/PreventStabby.java
+++ b/src/main/java/me/youhavetrouble/preventstabby/PreventStabby.java
@@ -11,6 +11,7 @@ import me.youhavetrouble.preventstabby.listeners.PvpListener;
 import me.youhavetrouble.preventstabby.listeners.UtilListener;
 import me.youhavetrouble.preventstabby.util.*;
 import org.bstats.bukkit.Metrics;
+import org.bstats.charts.MultiLineChart;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.plugin.java.JavaPlugin;
@@ -63,11 +64,13 @@ public final class PreventStabby extends JavaPlugin {
     public void onLoad() {
         if (getServer().getPluginManager().getPlugin("WorldGuard") != null) {
             try {
-                WorldGuardHook.init();
+                WorldGuardHook.init(this.getLogger());
                 worldGuardHook = true;
             } catch (NoClassDefFoundError e) {
                 worldGuardHook = false;
             }
+        } else {
+            worldGuardHook = false;
         }
     }
 
diff --git a/src/main/java/me/youhavetrouble/preventstabby/hooks/WorldGuardHook.java b/src/main/java/me/youhavetrouble/preventstabby/hooks/WorldGuardHook.java
index a99024f..3907852 100644
--- a/src/main/java/me/youhavetrouble/preventstabby/hooks/WorldGuardHook.java
+++ b/src/main/java/me/youhavetrouble/preventstabby/hooks/WorldGuardHook.java
@@ -15,17 +15,19 @@ import com.sk89q.worldguard.protection.regions.RegionQuery;
 import me.youhavetrouble.preventstabby.PreventStabby;
 import org.bukkit.entity.Player;
 
+import java.util.logging.Logger;
+
 public class WorldGuardHook {
 
     private static FlagRegistry flagRegistry;
     public static StateFlag FORCE_PVP_FLAG;
 
-    public static void init() {
+    public static void init(Logger logger) {
         try {
             Class.forName("com.sk89q.worldguard.protection.flags.registry.FlagRegistry");
             WorldGuardPlugin worldGuardPlugin = WorldGuardPlugin.inst();
             if (WorldGuard.getInstance() == null || worldGuardPlugin == null) return;
-            PreventStabby.getPlugin().getLogger().info("[PreventStabby] Hooking into WorldGuard");
+            logger.info("Hooking into WorldGuard");
             flagRegistry = WorldGuard.getInstance().getFlagRegistry();
             createForcePvpFlag();
         } catch (NoClassDefFoundError | ClassNotFoundException ignored) {