From 1a32b066e92fb08199886413e8e0ffb2b93c9ab5 Mon Sep 17 00:00:00 2001 From: Esophose Date: Mon, 1 Apr 2019 12:49:36 -0600 Subject: [PATCH] Dependencies, worldguard 7.0.0 integration --- EpicBuckets-Plugin/pom.xml | 34 +++++++++---------- .../epicbuckets/hooks/HookWorldGuard.java | 10 +++++- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/EpicBuckets-Plugin/pom.xml b/EpicBuckets-Plugin/pom.xml index 25388be..9894512 100644 --- a/EpicBuckets-Plugin/pom.xml +++ b/EpicBuckets-Plugin/pom.xml @@ -20,7 +20,7 @@ com.gmail.filoghost.holographicdisplays holographicdisplays-api - LATEST + 2.3.2 provided @@ -32,36 +32,36 @@ net.arcaniax liquidtanks - LATEST + 2.1.0 org kingdoms - LATEST + 13.0.9 provided net.milkbowl vault - LATEST + 1.7.1 provided me.ryanhamshire GriefPrevention - LATEST + 16.6 provided com.sk89q worldedit - LATEST + 7.0.0 provided com.sk89q worldguard - 6.2.2 + 7.0.0 provided @@ -73,13 +73,13 @@ com.songoda skyblockearth - LATEST + 59 provided com.palmergames.bukkit towny - LATEST + 0.93.0.0 provided @@ -91,7 +91,7 @@ us.talabrek ultimateskyblock - LATEST + 2.7.2 provided @@ -109,43 +109,43 @@ com.gmail.nossr50 mcmmo - LATEST + 1.5.09 provided com.gamingmesh jobs - LATEST + 4.6.0 provided me.botsko prism - LATEST + 2.0.6 provided de.diddiz logblock - LATEST + 1.10.0 provided net coreprotect - LATEST + 2.14.2 provided uk.antiperson stackmob - LATEST + 2.2.6 provided net.sothatsit blockstore - LATEST + 1.5.0 provided diff --git a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookWorldGuard.java b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookWorldGuard.java index cf31fbf..fee2c69 100644 --- a/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookWorldGuard.java +++ b/EpicBuckets-Plugin/src/main/java/com/songoda/epicbuckets/hooks/HookWorldGuard.java @@ -1,6 +1,10 @@ package com.songoda.epicbuckets.hooks; +import com.sk89q.worldedit.bukkit.BukkitAdapter; +import com.sk89q.worldguard.WorldGuard; import com.sk89q.worldguard.bukkit.WorldGuardPlugin; +import com.sk89q.worldguard.protection.ApplicableRegionSet; +import com.sk89q.worldguard.protection.managers.RegionManager; import com.songoda.epicbuckets.utils.hooks.ProtectionPluginHook; import org.bukkit.Location; import org.bukkit.entity.Player; @@ -21,7 +25,11 @@ public class HookWorldGuard implements ProtectionPluginHook { @Override public boolean canBuild(Player player, Location location) { - return worldGuard.canBuild(player, location); + RegionManager regionManager = WorldGuard.getInstance().getPlatform().getRegionContainer().get(BukkitAdapter.adapt(location.getWorld())); + if (regionManager == null) return true; + ApplicableRegionSet set = regionManager.getApplicableRegions(BukkitAdapter.asBlockVector(location)); + + return set.size() < 1; } } \ No newline at end of file