diff --git a/eco-core/core-plugin/build.gradle b/eco-core/core-plugin/build.gradle index 68f55d91..a519bf18 100644 --- a/eco-core/core-plugin/build.gradle +++ b/eco-core/core-plugin/build.gradle @@ -25,7 +25,7 @@ dependencies { compileOnly 'com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT' compileOnly 'com.sk89q.worldguard:worldguard-bukkit:7.0.7-SNAPSHOT' compileOnly 'com.github.TechFortress:GriefPrevention:16.17.1' - compileOnly 'com.github.cryptomorin:kingdoms:1.12.3' + //compileOnly 'com.github.cryptomorin:kingdoms:1.13.9' wait for release 1.14.0 compileOnly('com.github.TownyAdvanced:Towny:0.97.2.6') { exclude group: 'com.zaxxer', module: 'HikariCP' } diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefKingdoms.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefKingdoms.kt index 13cbff4e..f1ffdebf 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefKingdoms.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/internal/spigot/integrations/antigrief/AntigriefKingdoms.kt @@ -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( diff --git a/lib/KingdomsX-1.14.13-BETA.jar b/lib/KingdomsX-1.14.13-BETA.jar new file mode 100644 index 00000000..75ba3b54 Binary files /dev/null and b/lib/KingdomsX-1.14.13-BETA.jar differ