diff --git a/plugin.yml b/plugin.yml index 1f9dacf..3f3e6ae 100644 --- a/plugin.yml +++ b/plugin.yml @@ -1,5 +1,5 @@ name: Brewery -version: 1.3 +version: 1.3.1 main: com.dre.brewery.P authors: [Milan Albrecht, Frank Baumann] softdepend: [LWC, LogBlock, WorldGuard, GriefPrevention] diff --git a/pom.xml b/pom.xml index 9f19a2a..8a9e654 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.dre brewery - 1.3 + 1.3.1 Brewery @@ -130,9 +130,7 @@ com.sk89q worldguard - LATEST - compile - jar + 6.0.0-beta-01 diff --git a/src/com/dre/brewery/integration/WGBarrel.java b/src/com/dre/brewery/integration/WGBarrel.java index bd405c6..5f5855e 100644 --- a/src/com/dre/brewery/integration/WGBarrel.java +++ b/src/com/dre/brewery/integration/WGBarrel.java @@ -5,27 +5,24 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import com.dre.brewery.P; -import com.sk89q.worldguard.LocalPlayer; +import com.sk89q.worldguard.bukkit.RegionQuery; import com.sk89q.worldguard.bukkit.WorldGuardPlugin; -import com.sk89q.worldguard.protection.ApplicableRegionSet; import com.sk89q.worldguard.protection.flags.DefaultFlag; public class WGBarrel { public static boolean checkAccess(Player player, Block spigot, Plugin plugin) { WorldGuardPlugin wg = (WorldGuardPlugin) plugin; + if (!wg.getGlobalRegionManager().hasBypass(player, player.getWorld())) { - ApplicableRegionSet region = wg.getRegionManager(player.getWorld()).getApplicableRegions(spigot.getLocation()); - if (region != null) { - LocalPlayer localPlayer = wg.wrapPlayer(player); - if (!region.allows(DefaultFlag.CHEST_ACCESS, localPlayer)) { - if (!region.canBuild(localPlayer)) { - P.p.msg(player, P.p.languageReader.get("Error_NoBarrelAccess")); - return false; - } - } + RegionQuery query = wg.getRegionContainer().createQuery(); + + if(!query.testState(player.getLocation(), player, DefaultFlag.CHEST_ACCESS, DefaultFlag.BUILD)){ + P.p.msg(player, P.p.languageReader.get("Error_NoBarrelAccess")); + return false; } } + return true; } }