diff --git a/adapter-6.2.x/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/v62x/WorldGuardAdapter.kt b/adapter-6.2.x/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/v62x/WorldGuardAdapter.kt index bc5e77f..b8be229 100644 --- a/adapter-6.2.x/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/v62x/WorldGuardAdapter.kt +++ b/adapter-6.2.x/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/v62x/WorldGuardAdapter.kt @@ -38,11 +38,15 @@ public object WorldGuardAdapter : IWorldGuardAdapter { WGBukkit.getPlugin().flagRegistry } - override fun isFlagAllowAtLocation(location: Location, flagName: String): Boolean = - getFlagFromRegistry(flagName)?.let { isFlagAllowAtLocation(location, it) } ?: true + override fun isFlagAllowAtLocation( + location: Location, + flagName: String, + ): Boolean = getFlagFromRegistry(flagName)?.let { isFlagAllowAtLocation(location, it) } ?: true - override fun isFlagDenyAtLocation(location: Location, flagName: String): Boolean = - getFlagFromRegistry(flagName)?.let { isFlagDenyAtLocation(location, it) } ?: false + override fun isFlagDenyAtLocation( + location: Location, + flagName: String, + ): Boolean = getFlagFromRegistry(flagName)?.let { isFlagDenyAtLocation(location, it) } ?: false override fun registerFlag(flagName: String) { flagRegistry.register(StateFlag(flagName, true)) @@ -50,11 +54,15 @@ public object WorldGuardAdapter : IWorldGuardAdapter { private fun getRegionQuery() = regionContainer.createQuery() - private fun isFlagAllowAtLocation(location: Location, flag: StateFlag) = - getRegionQuery().testState(location, nullPlayer, flag) + private fun isFlagAllowAtLocation( + location: Location, + flag: StateFlag, + ) = getRegionQuery().testState(location, nullPlayer, flag) - private fun isFlagDenyAtLocation(location: Location, flag: StateFlag) = - !getRegionQuery().testState(location, nullPlayer, flag) + private fun isFlagDenyAtLocation( + location: Location, + flag: StateFlag, + ) = !getRegionQuery().testState(location, nullPlayer, flag) private fun getFlagFromRegistry(flagName: String): StateFlag? = flagRegistry.get(flagName) as? StateFlag } diff --git a/adapter-7.0.x/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/v70x/WorldGuardAdapter.kt b/adapter-7.0.x/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/v70x/WorldGuardAdapter.kt index 8ff4737..c356ef3 100644 --- a/adapter-7.0.x/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/v70x/WorldGuardAdapter.kt +++ b/adapter-7.0.x/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/v70x/WorldGuardAdapter.kt @@ -34,22 +34,27 @@ public object WorldGuardAdapter : IWorldGuardAdapter { // we had to change this due to WG 7.0.4 not always having a platform for some reason @Suppress("detekt.TooGenericExceptionCaught") private val worldGuardPlatform: WorldGuardPlatform? - get() = try { - WorldGuard.getInstance().platform - } catch (npe: NullPointerException) { - null - } + get() = + try { + WorldGuard.getInstance().platform + } catch (npe: NullPointerException) { + null + } private val regionContainer: RegionContainer? get() = worldGuardPlatform?.regionContainer private val flagRegistry: FlagRegistry by lazy { WorldGuard.getInstance().flagRegistry } - override fun isFlagAllowAtLocation(location: Location, flagName: String): Boolean = - getFlagFromRegistry(flagName)?.let { isFlagAllowAtLocation(location, it) } ?: true + override fun isFlagAllowAtLocation( + location: Location, + flagName: String, + ): Boolean = getFlagFromRegistry(flagName)?.let { isFlagAllowAtLocation(location, it) } ?: true - override fun isFlagDenyAtLocation(location: Location, flagName: String): Boolean = - getFlagFromRegistry(flagName)?.let { isFlagDenyAtLocation(location, it) } ?: false + override fun isFlagDenyAtLocation( + location: Location, + flagName: String, + ): Boolean = getFlagFromRegistry(flagName)?.let { isFlagDenyAtLocation(location, it) } ?: false override fun registerFlag(flagName: String) { flagRegistry.register(StateFlag(flagName, true)) @@ -57,11 +62,15 @@ public object WorldGuardAdapter : IWorldGuardAdapter { private fun getRegionQuery() = regionContainer?.createQuery() - private fun isFlagAllowAtLocation(location: Location, flag: StateFlag) = - getRegionQuery()?.testState(BukkitAdapter.adapt(location), null, flag) + private fun isFlagAllowAtLocation( + location: Location, + flag: StateFlag, + ) = getRegionQuery()?.testState(BukkitAdapter.adapt(location), null, flag) - private fun isFlagDenyAtLocation(location: Location, flag: StateFlag) = - getRegionQuery()?.let { !it.testState(BukkitAdapter.adapt(location), null, flag) } + private fun isFlagDenyAtLocation( + location: Location, + flag: StateFlag, + ) = getRegionQuery()?.let { !it.testState(BukkitAdapter.adapt(location), null, flag) } private fun getFlagFromRegistry(flagName: String): StateFlag? = flagRegistry.get(flagName) as? StateFlag } diff --git a/adapter-api/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/IWorldGuardAdapter.kt b/adapter-api/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/IWorldGuardAdapter.kt index b416a27..2cc65d4 100644 --- a/adapter-api/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/IWorldGuardAdapter.kt +++ b/adapter-api/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/IWorldGuardAdapter.kt @@ -35,7 +35,10 @@ public interface IWorldGuardAdapter { * * @return if flag is allow at location */ - public fun isFlagAllowAtLocation(location: Location, flagName: String): Boolean + public fun isFlagAllowAtLocation( + location: Location, + flagName: String, + ): Boolean /** * Returns true if flag is deny at location. @@ -45,7 +48,10 @@ public interface IWorldGuardAdapter { * * @return if flag is deny at location */ - public fun isFlagDenyAtLocation(location: Location, flagName: String): Boolean + public fun isFlagDenyAtLocation( + location: Location, + flagName: String, + ): Boolean /** * Registers a flag with WorldGuard. diff --git a/adapter-lib/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/lib/NoOpWorldGuardAdapter.kt b/adapter-lib/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/lib/NoOpWorldGuardAdapter.kt index d469c95..fb0365e 100644 --- a/adapter-lib/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/lib/NoOpWorldGuardAdapter.kt +++ b/adapter-lib/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/lib/NoOpWorldGuardAdapter.kt @@ -29,10 +29,16 @@ import org.bukkit.Location */ internal object NoOpWorldGuardAdapter : IWorldGuardAdapter { // do nothing, return true if no WorldGuard - override fun isFlagAllowAtLocation(location: Location, flagName: String): Boolean = true + override fun isFlagAllowAtLocation( + location: Location, + flagName: String, + ): Boolean = true // do nothing, return false if no WorldGuard - override fun isFlagDenyAtLocation(location: Location, flagName: String): Boolean = false + override fun isFlagDenyAtLocation( + location: Location, + flagName: String, + ): Boolean = false override fun registerFlag(flagName: String) { // do nothing, no op diff --git a/adapter-lib/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/lib/WorldGuardAdapters.kt b/adapter-lib/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/lib/WorldGuardAdapters.kt index 30c36b5..c680ed5 100644 --- a/adapter-lib/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/lib/WorldGuardAdapters.kt +++ b/adapter-lib/src/main/kotlin/com/tealcube/minecraft/spigot/worldguard/adapters/lib/WorldGuardAdapters.kt @@ -47,11 +47,15 @@ public object WorldGuardAdapters : IWorldGuardAdapter { } } - override fun isFlagAllowAtLocation(location: Location, flagName: String): Boolean = - internalAdapter.isFlagAllowAtLocation(location, flagName) + override fun isFlagAllowAtLocation( + location: Location, + flagName: String, + ): Boolean = internalAdapter.isFlagAllowAtLocation(location, flagName) - override fun isFlagDenyAtLocation(location: Location, flagName: String): Boolean = - internalAdapter.isFlagDenyAtLocation(location, flagName) + override fun isFlagDenyAtLocation( + location: Location, + flagName: String, + ): Boolean = internalAdapter.isFlagDenyAtLocation(location, flagName) override fun registerFlag(flagName: String): Unit = internalAdapter.registerFlag(flagName) }