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

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Auxilor
2022-09-26 12:34:53 +01:00
parent ebc0ee7940 e81b788a1b
commit 90702bc7aa
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,9 +6,9 @@ import org.bukkit.block.Block
import org.bukkit.entity.LivingEntity
import org.bukkit.entity.Player
import org.kingdoms.constants.group.Kingdom
import org.kingdoms.constants.group.model.KingdomRelation
import org.kingdoms.constants.group.model.relationships.StandardRelationAttribute
import org.kingdoms.constants.land.Land
import org.kingdoms.constants.player.DefaultKingdomPermission
import org.kingdoms.constants.player.StandardKingdomPermission
import org.kingdoms.constants.player.KingdomPlayer
import org.kingdoms.managers.PvPManager
@@ -23,11 +23,11 @@ class AntigriefKingdoms : AntigriefIntegration {
}
val kingdom: Kingdom = kp.kingdom ?: return false
val land = Land.getLand(block) ?: return true
val permission: DefaultKingdomPermission =
if (land.isNexusLand) DefaultKingdomPermission.NEXUS_BUILD else DefaultKingdomPermission.BUILD
val permission: StandardKingdomPermission =
if (land.isNexusLand) StandardKingdomPermission.NEXUS_BUILD else StandardKingdomPermission.BUILD
return if (!kp.hasPermission(permission)) {
false
} else kingdom.hasAttribute(land.kingdom, KingdomRelation.Attribute.BUILD)
} else kingdom.hasAttribute(land.kingdom, StandardRelationAttribute.BUILD)
}
override fun canCreateExplosion(