Merge pull request #1620 from Dans-Plugins/feature/unclaim-others

Feature - Unclaim Others
Dans-Plugins · Nov 29, 2022 · c69174f · c69174f
2 parents 89c3c20 + 85cbbc8
commit c69174f
Showing 1 changed file with 27 additions and 13 deletions.
diff --git a/...n/kotlin/com/dansplugins/factionsystem/command/faction/unclaim/MfFactionUnclaimCommand.kt b/...n/kotlin/com/dansplugins/factionsystem/command/faction/unclaim/MfFactionUnclaimCommand.kt
@@ -1,6 +1,8 @@
 package com.dansplugins.factionsystem.command.faction.unclaim
 
 import com.dansplugins.factionsystem.MedievalFactions
+import com.dansplugins.factionsystem.claim.MfClaimedChunk
+import com.dansplugins.factionsystem.faction.MfFaction
 import com.dansplugins.factionsystem.player.MfPlayer
 import dev.forkhandles.result4k.onFailure
 import org.bukkit.ChatColor.GREEN
@@ -31,15 +33,18 @@ class MfFactionUnclaimCommand(private val plugin: MedievalFactions) : CommandExe
                     return@Runnable
                 }
             val factionService = plugin.services.factionService
-            val faction = factionService.getFaction(mfPlayer.id)
-            if (faction == null) {
-                sender.sendMessage("$RED${plugin.language["CommandFactionUnclaimMustBeInAFaction"]}")
-                return@Runnable
-            }
-            val role = faction.getRole(mfPlayer.id)
-            if (role == null || !role.hasPermission(faction, plugin.factionPermissions.unclaim)) {
-                sender.sendMessage("$RED${plugin.language["CommandFactionUnclaimNoFactionPermission"]}")
-                return@Runnable
+            var faction: MfFaction? = null
+            if (!mfPlayer.isBypassEnabled) { // skip faction check if in bypass mode
+                faction = factionService.getFaction(mfPlayer.id)
+                if (faction == null) {
+                    sender.sendMessage("$RED${plugin.language["CommandFactionUnclaimMustBeInAFaction"]}")
+                    return@Runnable
+                }
+                val role = faction.getRole(mfPlayer.id)
+                if (role == null || !role.hasPermission(faction, plugin.factionPermissions.unclaim)) {
+                    sender.sendMessage("$RED${plugin.language["CommandFactionUnclaimNoFactionPermission"]}")
+                    return@Runnable
+                }
             }
             val radius = if (args.isNotEmpty()) {
                 args[0].toIntOrNull()
@@ -68,10 +73,19 @@ class MfFactionUnclaimCommand(private val plugin: MedievalFactions) : CommandExe
                     }
                 }
                 plugin.server.scheduler.runTaskAsynchronously(plugin, Runnable saveChunks@{
-                    val claims = chunks.mapNotNull { chunk ->
-                        claimService.getClaim(chunk)
-                    }.filter { claim ->
-                        return@filter claim.factionId.value == faction.id.value
+                    val claims: List<MfClaimedChunk> = if (!mfPlayer.isBypassEnabled) {
+                        chunks.mapNotNull { chunk ->
+                            claimService.getClaim(chunk)
+                        }.filter { claim ->
+                            if (faction == null) {
+                                return@filter false
+                            }
+                            return@filter claim.factionId.value == faction.id.value
+                        }
+                    } else {
+                        chunks.mapNotNull { chunk ->
+                            claimService.getClaim(chunk)
+                        }
                     }
                     if (claims.isEmpty()) {
                         sender.sendMessage("$RED${plugin.language["CommandFactionUnclaimNoUnclaimableChunks"]}")