From 494c1a87b212bd0abebde7a04faa6ef620e22914 Mon Sep 17 00:00:00 2001 From: _OfTeN_ Date: Thu, 4 Nov 2021 19:30:16 +0300 Subject: [PATCH] Added DeluxeCombat integration --- .../com/willfp/eco/spigot/EcoSpigotPlugin.kt | 12 ++----- .../antigrief/AntigriefDeluxeCombat.kt | 34 ++++++++++++++++++ lib/DeluxeCombat API.jar | Bin 0 -> 3238 bytes 3 files changed, 36 insertions(+), 10 deletions(-) create mode 100644 eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefDeluxeCombat.kt create mode 100644 lib/DeluxeCombat API.jar diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt index 3de33571..d37d2132 100644 --- a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/EcoSpigotPlugin.kt @@ -52,16 +52,7 @@ import com.willfp.eco.spigot.integrations.anticheat.AnticheatMatrix import com.willfp.eco.spigot.integrations.anticheat.AnticheatNCP import com.willfp.eco.spigot.integrations.anticheat.AnticheatSpartan import com.willfp.eco.spigot.integrations.anticheat.AnticheatVulcan -import com.willfp.eco.spigot.integrations.antigrief.AntigriefBentoBox -import com.willfp.eco.spigot.integrations.antigrief.AntigriefCombatLogXV10 -import com.willfp.eco.spigot.integrations.antigrief.AntigriefCombatLogXV11 -import com.willfp.eco.spigot.integrations.antigrief.AntigriefFactionsUUID -import com.willfp.eco.spigot.integrations.antigrief.AntigriefGriefPrevention -import com.willfp.eco.spigot.integrations.antigrief.AntigriefKingdoms -import com.willfp.eco.spigot.integrations.antigrief.AntigriefLands -import com.willfp.eco.spigot.integrations.antigrief.AntigriefSuperiorSkyblock2 -import com.willfp.eco.spigot.integrations.antigrief.AntigriefTowny -import com.willfp.eco.spigot.integrations.antigrief.AntigriefWorldGuard +import com.willfp.eco.spigot.integrations.antigrief.* import com.willfp.eco.spigot.integrations.customitems.CustomItemsHeadDatabase import com.willfp.eco.spigot.integrations.customitems.CustomItemsItemsAdder import com.willfp.eco.spigot.integrations.customitems.CustomItemsOraxen @@ -173,6 +164,7 @@ abstract class EcoSpigotPlugin : EcoPlugin( override fun loadIntegrationLoaders(): List { return listOf( // AntiGrief + IntegrationLoader("DeluxeCombat") { AntigriefManager.register(AntigriefDeluxeCombat()) }, IntegrationLoader("SuperiorSkyblock2") { AntigriefManager.register(AntigriefSuperiorSkyblock2()) }, IntegrationLoader("BentoBox") { AntigriefManager.register(AntigriefBentoBox()) }, IntegrationLoader("WorldGuard") { AntigriefManager.register(AntigriefWorldGuard()) }, diff --git a/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefDeluxeCombat.kt b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefDeluxeCombat.kt new file mode 100644 index 00000000..d6ddf69c --- /dev/null +++ b/eco-core/core-plugin/src/main/kotlin/com/willfp/eco/spigot/integrations/antigrief/AntigriefDeluxeCombat.kt @@ -0,0 +1,34 @@ +package com.willfp.eco.spigot.integrations.antigrief + +import com.willfp.eco.core.integrations.antigrief.AntigriefWrapper +import nl.marido.deluxecombat.api.DeluxeCombatAPI +import org.bukkit.Location +import org.bukkit.block.Block +import org.bukkit.entity.LivingEntity +import org.bukkit.entity.Player + +class AntigriefDeluxeCombat: AntigriefWrapper { + override fun getPluginName(): String { + return "DeluxeCombat"; + } + + override fun canBreakBlock(player: Player, block: Block): Boolean { + return true; + } + + override fun canCreateExplosion(player: Player, location: Location): Boolean { + return true; + } + + override fun canPlaceBlock(player: Player, block: Block): Boolean { + return true; + } + + 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) + else -> true + } + } +} \ No newline at end of file diff --git a/lib/DeluxeCombat API.jar b/lib/DeluxeCombat API.jar new file mode 100644 index 0000000000000000000000000000000000000000..b8811303aa4a12dc0a086dd00ca29725c988afe4 GIT binary patch literal 3238 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