From 3e2b747ff42e7b7340ed68ae7b122767e88f6af6 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 18 Aug 2020 12:28:55 +0100 Subject: [PATCH] Fix some ultraregions issues --- modern/build.gradle | 6 +++--- .../integrations/ultraregions/UltraRegionsIntegration.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modern/build.gradle b/modern/build.gradle index d4d3494..2d01c2b 100644 --- a/modern/build.gradle +++ b/modern/build.gradle @@ -8,7 +8,7 @@ version = pluginVersion sourceCompatibility = 1.8 // Set to false if you don't have access to the UltraRegions API jar to make the plugin compilable. The purchased plugin has support for it. -ultraRegionsSupport = true +ultraRegions = ultraRegionsSupport repositories { mavenLocal() @@ -40,7 +40,7 @@ repositories { } compileJava { - if (!ultraRegionsSupport) sourceSets.main.java.exclude "**/net/islandearth/rpgregions/api/integrations/ultraregions/UltraRegionsIntegration.java" + if (!ultraRegions) sourceSets.main.java.exclude "**/net/islandearth/rpgregions/api/integrations/ultraregions/UltraRegionsIntegration.java" } dependencies { @@ -53,7 +53,7 @@ dependencies { compileOnly 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT' // spigot compileOnly 'net.zrips:residence:4.9.0.6' // residence compileOnly 'me.ryanhamshire:griefprevention:16.13.0' // griefprevention - if (ultraRegionsSupport) compileOnly 'me.techscode:ultraregions:1.2.2' // ultraregions + if (ultraRegions) compileOnly 'me.techscode:ultraregions:1.2.2' // ultraregions compileOnly project(':api') compileOnly project(':rpgregions') } diff --git a/modern/src/main/java/net/islandearth/rpgregions/api/integrations/ultraregions/UltraRegionsIntegration.java b/modern/src/main/java/net/islandearth/rpgregions/api/integrations/ultraregions/UltraRegionsIntegration.java index 5fa0332..f9bfb03 100644 --- a/modern/src/main/java/net/islandearth/rpgregions/api/integrations/ultraregions/UltraRegionsIntegration.java +++ b/modern/src/main/java/net/islandearth/rpgregions/api/integrations/ultraregions/UltraRegionsIntegration.java @@ -32,7 +32,7 @@ public class UltraRegionsIntegration implements IntegrationManager { @Override public boolean isInRegion(Location location) { - return false; + return this.getProtectedRegions(location).size() > 0; } @Override