exituser/Brewery
1
0
Fork 0
mirror of https://github.com/exituser/Brewery.git synced 2026-09-17 06:38:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace getApplicableRegions() call with reflection call to allow compilation

Browse Source
This commit is contained in:
Daniel Saukel
2019-01-12 16:59:50 +01:00
parent 8294e928bc
commit 9ec092b304
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/dre/brewery/integration/WGBarrelOld.java
+7 -4
View File
@@ -4,6 +4,7 @@ import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import org.bukkit.block.Block; import org.bukkit.block.Block;
import org.bukkit.Location;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
@@ -13,17 +14,20 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
import com.sk89q.worldguard.protection.ApplicableRegionSet; import com.sk89q.worldguard.protection.ApplicableRegionSet;
import com.sk89q.worldguard.protection.flags.DefaultFlag; import com.sk89q.worldguard.protection.flags.DefaultFlag;
import com.sk89q.worldguard.protection.flags.StateFlag; import com.sk89q.worldguard.protection.flags.StateFlag;
import com.sk89q.worldguard.protection.managers.RegionManager;
public class WGBarrelOld implements WGBarrel { public class WGBarrelOld implements WGBarrel {
private Method allows; private Method allows;
private Method canBuild; private Method canBuild;
private Method getApplicableRegions;
public WGBarrelOld() { public WGBarrelOld() {
try { try {
allows = ApplicableRegionSet.class.getMethod("allows", StateFlag.class, LocalPlayer.class); allows = ApplicableRegionSet.class.getMethod("allows", StateFlag.class, LocalPlayer.class);
canBuild = ApplicableRegionSet.class.getMethod("canBuild", LocalPlayer.class); canBuild = ApplicableRegionSet.class.getMethod("canBuild", LocalPlayer.class);
getApplicableRegions = RegionManager.class.getMethod("getApplicableRegions", Location.class);
} catch (NoSuchMethodException e) { } catch (NoSuchMethodException e) {
P.p.errorLog("Failed to Hook WorldGuard for Barrel Open Permissions! Opening Barrels will NOT work!"); P.p.errorLog("Failed to Hook WorldGuard for Barrel Open Permissions! Opening Barrels will NOT work!");
P.p.errorLog("Brewery was tested with version 5.8 to 6.1 of WorldGuard!"); P.p.errorLog("Brewery was tested with version 5.8 to 6.1 of WorldGuard!");
@@ -36,12 +40,11 @@ public class WGBarrelOld implements WGBarrel {
public boolean checkAccess(Player player, Block spigot, Plugin plugin) { public boolean checkAccess(Player player, Block spigot, Plugin plugin) {
WorldGuardPlugin wg = (WorldGuardPlugin) plugin; WorldGuardPlugin wg = (WorldGuardPlugin) plugin;
if (!wg.getGlobalRegionManager().hasBypass(player, player.getWorld())) { if (!wg.getGlobalRegionManager().hasBypass(player, player.getWorld())) {
try {
Object region = wg.getRegionManager(player.getWorld()).getApplicableRegions(spigot.getLocation()); Object region = getApplicableRegions.invoke(wg.getRegionManager(player.getWorld()), spigot.getLocation());
if (region != null) { if (region != null) {
LocalPlayer localPlayer = wg.wrapPlayer(player); LocalPlayer localPlayer = wg.wrapPlayer(player);
try {
if (!(Boolean) allows.invoke(region, DefaultFlag.CHEST_ACCESS, localPlayer)) { if (!(Boolean) allows.invoke(region, DefaultFlag.CHEST_ACCESS, localPlayer)) {
if (!(Boolean) canBuild.invoke(region, localPlayer)) { if (!(Boolean) canBuild.invoke(region, localPlayer)) {
@@ -49,13 +52,13 @@ public class WGBarrelOld implements WGBarrel {
return false; return false;
} }
} }
}
} catch (IllegalAccessException | InvocationTargetException e) { } catch (IllegalAccessException | InvocationTargetException e) {
e.printStackTrace(); e.printStackTrace();
return false; return false;
} }
} }
}
return true; return true;
} }
} }