From a1c0b8c85764c794e324f30fc87f87771cbbc79c Mon Sep 17 00:00:00 2001 From: Auxilor Date: Tue, 6 Sep 2022 13:25:17 +0100 Subject: [PATCH] Fixed FUUID --- .../integrations/antigrief/AntigriefFactionsUUID.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFactionsUUID.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFactionsUUID.kt index dddf908b..ca331e40 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFactionsUUID.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFactionsUUID.kt @@ -5,7 +5,7 @@ import com.massivecraft.factions.FLocation import com.massivecraft.factions.FPlayer import com.massivecraft.factions.FPlayers import com.massivecraft.factions.Faction -import com.massivecraft.factions.perms.PermissibleAction +import com.massivecraft.factions.perms.PermissibleActions import com.willfp.eco.core.integrations.antigrief.AntigriefIntegration import org.bukkit.Location import org.bukkit.block.Block @@ -20,7 +20,7 @@ class AntigriefFactionsUUID : AntigriefIntegration { val fplayer: FPlayer = FPlayers.getInstance().getByPlayer(player) val flocation = FLocation(block.location) val faction: Faction = Board.getInstance().getFactionAt(flocation) - return if (!faction.hasAccess(fplayer, PermissibleAction.DESTROY)) { + return if (!faction.hasAccess(fplayer, PermissibleActions.DESTROY, flocation)) { fplayer.isAdminBypassing } else true } @@ -41,7 +41,7 @@ class AntigriefFactionsUUID : AntigriefIntegration { val fplayer: FPlayer = FPlayers.getInstance().getByPlayer(player) val flocation = FLocation(block.location) val faction: Faction = Board.getInstance().getFactionAt(flocation) - return if (!faction.hasAccess(fplayer, PermissibleAction.BUILD)) { + return if (!faction.hasAccess(fplayer, PermissibleActions.BUILD, flocation)) { fplayer.isAdminBypassing } else true } @@ -58,7 +58,7 @@ class AntigriefFactionsUUID : AntigriefIntegration { return fplayer.isAdminBypassing } } else { - if (faction.hasAccess(fplayer, PermissibleAction.DESTROY)) { + if (faction.hasAccess(fplayer, PermissibleActions.DESTROY, flocation)) { return fplayer.isAdminBypassing } }