Merge pull request #199 from mani1232/master
Update KingdomsX dependence
This commit is contained in:
@@ -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'
|
||||
}
|
||||
|
||||
@@ -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(
|
||||
|
||||
BIN
lib/KingdomsX-1.14.13-BETA.jar
Normal file
BIN
lib/KingdomsX-1.14.13-BETA.jar
Normal file
Binary file not shown.
Reference in New Issue
Block a user