Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

catch more instances of people using outdated worldguard versions

Browse Source
This commit is contained in:
RoboMWM 2018-09-18 23:49:05 -07:00
parent 393aa27329
commit d31c62e233
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/me/ryanhamshire/GriefPrevention/WorldGuardWrapper.java
View File

@ -26,35 +26,38 @@ class WorldGuardWrapper
public boolean canBuild(Location lesserCorner, Location greaterCorner, Player creatingPlayer) public boolean canBuild(Location lesserCorner, Location greaterCorner, Player creatingPlayer)
{ {
if (worldGuard == null) try
{ {
GriefPrevention.AddLogEntry("WorldGuard is out of date and not enabled. Please update or remove WorldGuard.", CustomLogEntryTypes.Debug, false); BukkitPlayer localPlayer = new BukkitPlayer(this.worldGuard, creatingPlayer);
return true; World world = WorldGuard.getInstance().getPlatform().getWorldByName(lesserCorner.getWorld().getName());
}
BukkitPlayer localPlayer = new BukkitPlayer(this.worldGuard, creatingPlayer); if(new RegionPermissionModel(localPlayer).mayIgnoreRegionProtection(world)) return true;
World world = WorldGuard.getInstance().getPlatform().getWorldByName(lesserCorner.getWorld().getName());
if(new RegionPermissionModel(localPlayer).mayIgnoreRegionProtection(world)) return true; RegionManager manager = WorldGuard.getInstance().getPlatform().getRegionContainer().get(world);
RegionManager manager = WorldGuard.getInstance().getPlatform().getRegionContainer().get(world); if(manager != null)
{
ProtectedCuboidRegion tempRegion = new ProtectedCuboidRegion(
"GP_TEMP",
new BlockVector(lesserCorner.getX(), 0, lesserCorner.getZ()),
new BlockVector(greaterCorner.getX(), world.getMaxY(), greaterCorner.getZ()));
if(manager != null) ApplicableRegionSet overlaps = manager.getApplicableRegions(tempRegion);
{ for (ProtectedRegion r : overlaps.getRegions()) {
ProtectedCuboidRegion tempRegion = new ProtectedCuboidRegion( if (!manager.getApplicableRegions(r).testState(localPlayer, Flags.BUILD)) {
"GP_TEMP", return false;
new BlockVector(lesserCorner.getX(), 0, lesserCorner.getZ()), }
new BlockVector(greaterCorner.getX(), world.getMaxY(), greaterCorner.getZ()));
ApplicableRegionSet overlaps = manager.getApplicableRegions(tempRegion);
for (ProtectedRegion r : overlaps.getRegions()) {
if (!manager.getApplicableRegions(r).testState(localPlayer, Flags.BUILD)) {
return false;
} }
return true;
} }
return true;
}
catch (Throwable rock)
{
GriefPrevention.AddLogEntry("WorldGuard is out of date. Please update or remove WorldGuard, or disable WorldGuard integration in GP's config (CreationRequiresWorldGuardBuildPermission)", CustomLogEntryTypes.Debug, false);
return true; return true;
} }
return true;
} }
} }