Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Fixed FUUID

Browse Source
This commit is contained in:
Auxilor
2022-09-06 13:25:17 +01:00
parent 0442ccf58f
commit a1c0b8c857
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefFactionsUUID.kt
View File

@@ -5,7 +5,7 @@ import com.massivecraft.factions.FLocation
import com.massivecraft.factions.FPlayer import com.massivecraft.factions.FPlayer
import com.massivecraft.factions.FPlayers import com.massivecraft.factions.FPlayers
import com.massivecraft.factions.Faction 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 com.willfp.eco.core.integrations.antigrief.AntigriefIntegration
import org.bukkit.Location import org.bukkit.Location
import org.bukkit.block.Block import org.bukkit.block.Block
@@ -20,7 +20,7 @@ class AntigriefFactionsUUID : AntigriefIntegration {
val fplayer: FPlayer = FPlayers.getInstance().getByPlayer(player) val fplayer: FPlayer = FPlayers.getInstance().getByPlayer(player)
val flocation = FLocation(block.location) val flocation = FLocation(block.location)
val faction: Faction = Board.getInstance().getFactionAt(flocation) val faction: Faction = Board.getInstance().getFactionAt(flocation)
return if (!faction.hasAccess(fplayer, PermissibleAction.DESTROY)) { return if (!faction.hasAccess(fplayer, PermissibleActions.DESTROY, flocation)) {
fplayer.isAdminBypassing fplayer.isAdminBypassing
} else true } else true
} }
@@ -41,7 +41,7 @@ class AntigriefFactionsUUID : AntigriefIntegration {
val fplayer: FPlayer = FPlayers.getInstance().getByPlayer(player) val fplayer: FPlayer = FPlayers.getInstance().getByPlayer(player)
val flocation = FLocation(block.location) val flocation = FLocation(block.location)
val faction: Faction = Board.getInstance().getFactionAt(flocation) val faction: Faction = Board.getInstance().getFactionAt(flocation)
return if (!faction.hasAccess(fplayer, PermissibleAction.BUILD)) { return if (!faction.hasAccess(fplayer, PermissibleActions.BUILD, flocation)) {
fplayer.isAdminBypassing fplayer.isAdminBypassing
} else true } else true
} }
@@ -58,7 +58,7 @@ class AntigriefFactionsUUID : AntigriefIntegration {
return fplayer.isAdminBypassing return fplayer.isAdminBypassing
} }
} else { } else {
if (faction.hasAccess(fplayer, PermissibleAction.DESTROY)) { if (faction.hasAccess(fplayer, PermissibleActions.DESTROY, flocation)) {
return fplayer.isAdminBypassing return fplayer.isAdminBypassing
} }
} }