Upstream/SongodaCore
1
0
Fork 0
mirror of https://github.com/songoda/SongodaCore.git synced 2025-02-21 14:01:20 +01:00
Code Issues Projects Releases Wiki Activity

Fixed WorldGuard hooks.

Browse Source
This commit is contained in:
Brianna 2020-04-22 09:36:39 -04:00
parent 9007d32fd5
commit 686d4b7612
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Core/src/main/java/com/songoda/core/hooks/WorldGuardHook.java
View File

@ -77,7 +77,7 @@ public class WorldGuardHook {
* @return false if the pvp flag is not set for this region, or is set to DENY * @return false if the pvp flag is not set for this region, or is set to DENY
*/ */
public static boolean isPvpAllowed(@NotNull Location loc) { public static boolean isPvpAllowed(@NotNull Location loc) {
return canHook ? Objects.equals(WorldGuardFlagHandler.getBooleanFlag(loc, "pvp"), Boolean.TRUE) : false; return canHook && Objects.equals(WorldGuardFlagHandler.getBooleanFlag(loc, "pvp"), Boolean.TRUE);
} }
/** /**
@ -86,8 +86,18 @@ public class WorldGuardHook {
* @param loc Location to check * @param loc Location to check
* @return false if the block-break flag is not set for this region, or is set to DENY * @return false if the block-break flag is not set for this region, or is set to DENY
*/ */
public boolean isBreakAllowed(@NotNull Location loc) { public static boolean isBreakAllowed(@NotNull Location loc) {
return canHook ? Objects.equals(WorldGuardFlagHandler.getBooleanFlag(loc, "block-break"), Boolean.TRUE) : false; return canHook && Objects.equals(WorldGuardFlagHandler.getBooleanFlag(loc, "block-break"), Boolean.TRUE);
}
/**
* Check to see if the use flag is set and is set to ALLOW
*
* @param loc Location to check
* @return false if the use flag is not set for this region, or is set to DENY
*/
public static boolean isInteractAllowed(@NotNull Location loc) {
return canHook && Objects.equals(WorldGuardFlagHandler.getBooleanFlag(loc, "use"), Boolean.TRUE);
} }
/** /**
@ -96,8 +106,8 @@ public class WorldGuardHook {
* @param loc Location to check * @param loc Location to check
* @return false if the other-explosion flag is not set for this region, or is set to DENY * @return false if the other-explosion flag is not set for this region, or is set to DENY
*/ */
public boolean isExplosionsAllowed(@NotNull Location loc) { public static boolean isExplosionsAllowed(@NotNull Location loc) {
return canHook ? Objects.equals(WorldGuardFlagHandler.getBooleanFlag(loc, "other-explosion"), Boolean.TRUE) : false; return canHook && Objects.equals(WorldGuardFlagHandler.getBooleanFlag(loc, "other-explosion"), Boolean.TRUE);
} }
/** /**
@ -106,8 +116,8 @@ public class WorldGuardHook {
* @param loc Location to check * @param loc Location to check
* @return false if the mob-spawning flag is not set for this region, or is set to DENY * @return false if the mob-spawning flag is not set for this region, or is set to DENY
*/ */
public boolean isMobSpawningAllowed(@NotNull Location loc) { public static boolean isMobSpawningAllowed(@NotNull Location loc) {
return canHook ? Objects.equals(WorldGuardFlagHandler.getBooleanFlag(loc, "mob-spawning"), Boolean.TRUE) : false; return canHook && Objects.equals(WorldGuardFlagHandler.getBooleanFlag(loc, "mob-spawning"), Boolean.TRUE);
} }
/** /**