From 866d437f05e64f3f2bc1ead9fa387545ac35fb45 Mon Sep 17 00:00:00 2001
From: Charles <charles.cullen99@gmail.com>
Date: Tue, 12 Feb 2019 21:57:40 +0800
Subject: [PATCH] 1.0.8-U1

+ Fixed issue where blocked/whitelisted regions weren't set up (were commented out with "TODO" posted)
---
 .../managers/BossLocationManager.java         | 54 +++++++++----------
 pom.xml                                       |  2 +-
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/managers/BossLocationManager.java b/plugin-modules/Core/src/com/songoda/epicbosses/managers/BossLocationManager.java
index 7430f9a..7e30ffa 100644
--- a/plugin-modules/Core/src/com/songoda/epicbosses/managers/BossLocationManager.java
+++ b/plugin-modules/Core/src/com/songoda/epicbosses/managers/BossLocationManager.java
@@ -52,21 +52,21 @@ public class BossLocationManager implements IReloadable {
             if(getBlockedWorlds().contains(location.getWorld().getName())) return false;
         }
 
+        boolean isInBlockedRegion = false;
+
         if(this.bossHookManager.isWorldguardEnabld() && this.bossHookManager.getWorldGuardHelper() != null) {
-//            TODO: Add Blocked regions support
-//            List<String> currentRegions = this.bossHookManager.getWorldGuardHelper().getRegionNames(location);
-//            boolean blocked = false;
-//
-//            if(currentRegions != null) {
-//                for(String s : this.bossHookManager.getWorldguardBlockedRegions()) {
-//                    if(currentRegions.contains(s)) {
-//                        blocked = true;
-//                        break;
-//                    }
-//                }
-//
-//                if(blocked) return false;
-//            }
+            List<String> currentRegions = this.bossHookManager.getWorldGuardHelper().getRegionNames(location);
+
+            if(currentRegions != null) {
+                for(String s : this.bossHookManager.getWorldguardBlockedRegions()) {
+                    if(currentRegions.contains(s)) {
+                        isInBlockedRegion = true;
+                        break;
+                    }
+                }
+            }
+
+            if(isInBlockedRegion) return false;
         }
 
         if(this.bossHookManager.isFactionsEnabled() && this.bossHookManager.getFactionHelper() != null) {
@@ -74,19 +74,19 @@ public class BossLocationManager implements IReloadable {
         }
 
         if(this.bossHookManager.isWorldguardEnabld() && this.bossHookManager.getWorldGuardHelper() != null) {
-//            List<String> currentRegions = this.bossHookManager.getWorldGuardHelper().getRegionNames(location);
-//            boolean allowed = false;
-//
-//            if(currentRegions != null) {
-//                for(String s : this.bossHookManager.getWorldGuardSpawnRegions()) {
-//                    if(currentRegions.contains(s)) {
-//                        allowed = true;
-//                        break;
-//                    }
-//                }
-//
-//                if(!allowed) return false;
-//            }
+            List<String> currentRegions = this.bossHookManager.getWorldGuardHelper().getRegionNames(location);
+            boolean allowed = false;
+
+            if(currentRegions != null) {
+                for(String s : this.bossHookManager.getWorldGuardSpawnRegions()) {
+                    if(currentRegions.contains(s)) {
+                        allowed = true;
+                        break;
+                    }
+                }
+
+                if(!allowed) return false;
+            }
         }
 
         if(this.bossHookManager.isAskyblockEnabled() && this.bossHookManager.getASkyblockHelper() != null) {
diff --git a/pom.xml b/pom.xml
index 47ce698..685dec7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
     </modules>
 
     <properties>
-        <plugin.version>1.0.7-U3</plugin.version>
+        <plugin.version>1.0.8-U1</plugin.version>
         <plugin.name>EpicBosses</plugin.name>
         <plugin.main>com.songoda.epicbosses.CustomBosses</plugin.main>
         <plugin.author>AMinecraftDev</plugin.author>