Fix WorldGuard detection logic

Author: Sidpatchy

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.hm.antiworldfly</groupId>
 	<artifactId>AntiWorldFly</artifactId>
-	<version>2.5.1</version>
+	<version>2.5.2</version>
 	<url>https://github.com/PyvesB/AntiWorldFly</url>
 	<name>AntiWorldFly</name>
 	<description>A Minecraft plugin to disable flying and chosen commands when joining or playing in specific worlds.</description>

src/main/java/com/hm/antiworldfly/AntiWorldFly.java

@@ -11,6 +11,7 @@
 import com.hm.antiworldfly.worldguard.listener.RegionToggleGlide;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.bstats.bukkit.Metrics;
+import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -97,14 +98,17 @@ public AntiWorldFly() {
 	public void onLoad() {
 		extractParametersFromConfig(true);
 
-		this.getLogger().info("Attempting to register WorldGuard flag.");
-		try {
-			FlagRegistry flagRegistry = new FlagRegistry(this);
-			flagRegistry.register(getAntiFlyFlag());
-			flagRegistry.register(getAntiElytraFlag());
-		}
-		catch (NoClassDefFoundError ignored) {
-			this.getLogger().info("WorldGuard not detected, continuing with a limited feature-set.");
+		if (Bukkit.getPluginManager().getPlugin("WorldGuard") != null) {
+			this.getLogger().info("WorldGuard detected! Attempting to register region flags.");
+			try {
+				FlagRegistry flagRegistry = new FlagRegistry(this);
+				flagRegistry.register(getAntiFlyFlag());
+				flagRegistry.register(getAntiElytraFlag());
+			}
+			catch (NoClassDefFoundError ignored) {
+				this.getLogger().info("There were issues with WorldGuard... Was there a major update recently?" +
+						"Please open an issue on the GitHub: https://github.com/PyvesB/AntiWorldFly/issues");
+			}
 		}
 	}
 
@@ -134,18 +138,27 @@ public void onEnable() {
 			awfPlayerMove = new PlayerMove(this);
 			awfRegionToggleGlide = new RegionToggleGlide(this);
 		}
-		catch (NoClassDefFoundError ignored) {} // already logged in onLoad()
+		catch (NoClassDefFoundError ignored) {
+		} // already logged in onLoad()
 
 		PluginManager pm = getServer().getPluginManager();
 
+		System.out.println(awfToggleGlide);
+		System.out.println(awfPlayerMove);
+		System.out.println(awfRegionToggleGlide);
+
 		pm.registerEvents(awfPreProcess, this);
 		pm.registerEvents(awfWorldJoin, this);
 		pm.registerEvents(awfPlayerJoin, this);
 		pm.registerEvents(awfPlayerToggleFly, this);
 		try {
 			pm.registerEvents(awfToggleGlide, this);
-			pm.registerEvents(awfPlayerMove, this);
-			pm.registerEvents(awfRegionToggleGlide, this);
+
+			// Do not register these events if WorldGuard isn't installed
+			if (Bukkit.getPluginManager().getPlugin("WorldGuard") != null) {
+				pm.registerEvents(awfPlayerMove, this);
+				pm.registerEvents(awfRegionToggleGlide, this);
+			}
 		}
 		catch (IllegalArgumentException ignored) {} // logged elsewhere
 

src/main/resources/config.yml

@@ -1,6 +1,6 @@
 #==============================O==============================#
 # I---------------------------------------------------------I #
-# |       Anti World Fly 2.5.1 configuration - Readme       | #
+# |       Anti World Fly 2.5.2 configuration - Readme       | #
 # 1---------------------------------------------------------1 #
 #==============================o==============================#
 

src/main/resources/lang.yml

@@ -1,6 +1,6 @@
 #============================================================#
 # +--------------------------------------------------------+ #
-# |       Anti World Fly 2.5.1 English language file       | #
+# |       Anti World Fly 2.5.2 English language file       | #
 # |                      By DarkPyves                      | #
 # |                 Maintained by Sidpatchy                | #
 # +--------------------------------------------------------+ #