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

Merge pull request #193

Browse Source 
Fix DeluxeCombat and FabledSkyBlock integration
This commit is contained in:
Will FP
2022-09-11 10:46:44 +01:00
committed by GitHub
parent 0a7acceb83 c857df2360
commit 09705e787b
2 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,9 @@ class AntigriefDeluxeCombat: AntigriefIntegration {
override fun canInjure(player: Player, victim: LivingEntity): Boolean {
val api = DeluxeCombatAPI()
return when(victim) {
is Player -> ((!api.hasProtection(victim) && api.hasPvPEnabled(victim)) || api.isInCombat(victim))
is Player -> {
if (api.hasProtection(player) || !api.hasPvPEnabled(player)) false
else ((!api.hasProtection(victim) && api.hasPvPEnabled(victim)) || api.isInCombat(victim))}
else -> true
}
}

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

@@ -19,15 +19,15 @@ class AntigriefFabledSkyBlock : AntigriefIntegration {
val skyblock = SkyBlock.getInstance()
val island = skyblock.islandManager.getIslandAtLocation(block.location) ?: return true
if (!player.hasPermission("fabledskyblock.bypass.destroy")) {
return false
if (player.hasPermission("fabledskyblock.bypass.destroy")) {
return true
}
if (!skyblock.permissionManager.hasPermission(island, "Destroy", island.getRole(player))) {
return false
if (skyblock.permissionManager.hasPermission(island, "Destroy", island.getRole(player))) {
return true
}
return true
return false
}
override fun canCreateExplosion(player: Player, location: Location): Boolean {
@@ -35,15 +35,15 @@ class AntigriefFabledSkyBlock : AntigriefIntegration {
val skyblock = SkyBlock.getInstance()
val island = skyblock.islandManager.getIslandAtLocation(location) ?: return true
if (!player.hasPermission("fabledskyblock.bypass.explosions")) {
return false
if (player.hasPermission("fabledskyblock.bypass.explosions")) {
return true
}
if (!skyblock.permissionManager.hasPermission(island, "Explosions", island.getRole(player))) {
return false
if (skyblock.permissionManager.hasPermission(island, "Explosions", island.getRole(player))) {
return true
}
return true
return false
}
override fun canPlaceBlock(player: Player, block: Block): Boolean {
@@ -51,15 +51,15 @@ class AntigriefFabledSkyBlock : AntigriefIntegration {
val skyblock = SkyBlock.getInstance()
val island = skyblock.islandManager.getIslandAtLocation(block.location) ?: return true
if (!player.hasPermission("fabledskyblock.bypass.place")) {
return false
if (player.hasPermission("fabledskyblock.bypass.place")) {
return true
}
if (!skyblock.permissionManager.hasPermission(island, "Place", island.getRole(player))) {
return false
if (skyblock.permissionManager.hasPermission(island, "Place", island.getRole(player))) {
return true
}
return true
return false
}
override fun canInjure(player: Player, victim: LivingEntity): Boolean {
@@ -74,11 +74,11 @@ class AntigriefFabledSkyBlock : AntigriefIntegration {
else -> "MobHurting"
}
if (!skyblock.permissionManager.hasPermission(island, islandPermission, island.getRole(player))) {
return false
if (skyblock.permissionManager.hasPermission(island, islandPermission, island.getRole(player))) {
return true
}
return true
return false
}
override fun canPickupItem(player: Player, location: Location): Boolean {
@@ -86,14 +86,14 @@ class AntigriefFabledSkyBlock : AntigriefIntegration {
val skyblock = SkyBlock.getInstance()
val island = SkyBlock.getInstance().islandManager.getIslandAtLocation(location) ?: return true
if (!player.hasPermission("fabledskyblock.bypass.itempickup")) {
return false
if (player.hasPermission("fabledskyblock.bypass.itempickup")) {
return true
}
if (!skyblock.permissionManager.hasPermission(island, "ItemPickup", island.getRole(player))) {
return false
if (skyblock.permissionManager.hasPermission(island, "ItemPickup", island.getRole(player))) {
return true
}
return true
return false
}
}