diff --git a/pom.xml b/pom.xml
index 7151ee8..44fe435 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
me.youhavetrouble
PreventStabby
- 1.3-pre4
+ 1.3-pre5
jar
PreventStabby
@@ -47,7 +47,6 @@
org.bstats
-
bstats
diff --git a/src/main/java/me/youhavetrouble/preventstabby/hooks/WorldGuardHook.java b/src/main/java/me/youhavetrouble/preventstabby/hooks/WorldGuardHook.java
index d950161..4996d93 100644
--- a/src/main/java/me/youhavetrouble/preventstabby/hooks/WorldGuardHook.java
+++ b/src/main/java/me/youhavetrouble/preventstabby/hooks/WorldGuardHook.java
@@ -18,27 +18,26 @@ import org.bukkit.plugin.Plugin;
public class WorldGuardHook {
- private static WorldGuardPlugin worldGuardPlugin;
private static FlagRegistry flagRegistry;
public static StateFlag FORCE_PVP_FLAG;
-
+ private static boolean enabled = false;
public static void init() {
PreventStabby plugin = PreventStabby.getPlugin();
try {
Class.forName("com.sk89q.worldguard.protection.flags.registry.FlagConflictException");
- worldGuardPlugin = WorldGuardPlugin.inst();
+ WorldGuardPlugin worldGuardPlugin = WorldGuardPlugin.inst();
if (WorldGuard.getInstance() == null || worldGuardPlugin == null) return;
plugin.getLogger().info("Hooking into WorldGuard");
flagRegistry = WorldGuard.getInstance().getFlagRegistry();
createForcePvpFlag(plugin);
- } catch (NoClassDefFoundError | ClassNotFoundException e) {
- return;
+ enabled = true;
+ } catch (NoClassDefFoundError | ClassNotFoundException ignored) {
}
}
private static void createForcePvpFlag(Plugin plugin) {
- if (!isHooked()) return;
+ if (!enabled) return;
if (flagRegistry == null) return;
String flagName = "preventstabby-force-pvp";
try {
@@ -56,7 +55,7 @@ public class WorldGuardHook {
}
public static boolean isPlayerForcedToPvp(Player player) {
- if (!isHooked()) return false;
+ if (!enabled) return false;
RegionContainer container = WorldGuard.getInstance().getPlatform().getRegionContainer();
RegionQuery query = container.createQuery();
org.bukkit.Location loc = player.getLocation();
@@ -65,10 +64,6 @@ public class WorldGuardHook {
return set.testState(localPlayer, FORCE_PVP_FLAG);
}
- public static boolean isHooked() {
- return worldGuardPlugin != null;
- }
-
}