SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix for crash on startup if Worldguard integration is enabled ("worldGuardChecking" or the new "worldGuardBuildPriority") but Worldguard plugin isn't loaded on server

Browse Source 
Also updated SpoutPlugin lib
This commit is contained in:
Brettflan 2012-10-09 17:36:59 -05:00
parent 6c5e9cbdc8
commit ea2da7ea9f
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/SpoutAPI.jar
View File

Binary file not shown.

BIN
lib/SpoutPlugin.jar Normal file
View File

Binary file not shown.

6
src/com/massivecraft/factions/integration/Worldguard.java
View File

@ -8,7 +8,6 @@ import java.util.Map;
import com.sk89q.worldguard.bukkit.WorldGuardPlugin; import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
import com.sk89q.worldguard.protection.managers.RegionManager; import com.sk89q.worldguard.protection.managers.RegionManager;
import com.sk89q.worldguard.protection.ApplicableRegionSet; import com.sk89q.worldguard.protection.ApplicableRegionSet;
import com.sk89q.worldguard.protection.UnsupportedIntersectionException;
import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion; import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
import com.sk89q.worldguard.protection.regions.ProtectedRegion; import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import static com.sk89q.worldguard.bukkit.BukkitUtil.*; import static com.sk89q.worldguard.bukkit.BukkitUtil.*;
@ -75,6 +74,7 @@ public class Worldguard
ApplicableRegionSet set = regionManager.getApplicableRegions(pt); ApplicableRegionSet set = regionManager.getApplicableRegions(pt);
return set.allows(DefaultFlag.PVP); return set.allows(DefaultFlag.PVP);
} }
// Check if player can build at location by worldguards rules. // Check if player can build at location by worldguards rules.
// Returns: // Returns:
// True: Player can build in the region. // True: Player can build in the region.
@ -94,7 +94,7 @@ public class Worldguard
return wg.canBuild(player, loc); return wg.canBuild(player, loc);
return false; return false;
} }
// Check for Regions in chunk the chunk // Check for Regions in chunk the chunk
// Returns: // Returns:
// True: Regions found within chunk // True: Regions found within chunk
@ -138,7 +138,7 @@ public class Worldguard
foundregions = true; foundregions = true;
} }
} }
catch (UnsupportedIntersectionException e) catch (Exception e)
{ {
e.printStackTrace(); e.printStackTrace();
} }