diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoPlugin.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoPlugin.java index db971198..ea18e092 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoPlugin.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/EcoPlugin.java @@ -16,11 +16,13 @@ import com.willfp.eco.spigot.eventlisteners.NaturalExpGainListeners; import com.willfp.eco.spigot.integrations.anticheat.AnticheatAAC; import com.willfp.eco.spigot.integrations.anticheat.AnticheatMatrix; import com.willfp.eco.spigot.integrations.anticheat.AnticheatNCP; +import com.willfp.eco.spigot.integrations.antigrief.AntigriefCombatLogX; 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.AntigriefTowny; +import com.willfp.eco.spigot.integrations.antigrief.AntigriefUltimateLands; import com.willfp.eco.spigot.integrations.antigrief.AntigriefWorldGuard; import com.willfp.eco.spigot.integrations.mcmmo.McmmoIntegrationImpl; import com.willfp.eco.spigot.recipes.RecipeListener; @@ -107,6 +109,8 @@ public class EcoPlugin extends AbstractEcoPlugin { new IntegrationLoader("Towny", () -> AntigriefManager.register(new AntigriefTowny())), new IntegrationLoader("Lands", () -> AntigriefManager.register(new AntigriefLands(this))), new IntegrationLoader("Kingdoms", () -> AntigriefManager.register(new AntigriefKingdoms())), + new IntegrationLoader("ULands", () -> AntigriefManager.register(new AntigriefUltimateLands())), + new IntegrationLoader("CombatLogX", () -> AntigriefManager.register(new AntigriefCombatLogX())), // Anticheat new IntegrationLoader("AAC5", () -> AnticheatManager.register(this, new AnticheatAAC())), diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogX.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogX.java index f6f81a88..ff88c69d 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogX.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefCombatLogX.java @@ -72,6 +72,6 @@ public class AntigriefCombatLogX implements AntigriefWrapper { @Override public String getPluginName() { - return "Towny"; + return "CombatLogX"; } } diff --git a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefUltimateLands.java b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefUltimateLands.java index 59ce104e..75d47682 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefUltimateLands.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/eco/spigot/integrations/antigrief/AntigriefUltimateLands.java @@ -1,6 +1,7 @@ package com.willfp.eco.spigot.integrations.antigrief; import com.willfp.eco.util.integrations.antigrief.AntigriefWrapper; +import me.ulrich.lands.api.LandsAPI; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.entity.LivingEntity; @@ -11,25 +12,25 @@ public class AntigriefUltimateLands implements AntigriefWrapper { @Override public boolean canBreakBlock(@NotNull final Player player, @NotNull final Block block) { - return true; + return LandsAPI.getInstance().isOwnerOfChunk(player.getName(), block.getChunk()) || LandsAPI.getInstance().isMemberOfChunk(block.getChunk(), player); } @Override public boolean canCreateExplosion(@NotNull final Player player, @NotNull final Location location) { - return true; + return LandsAPI.getInstance().isOwnerOfChunk(player.getName(), location.getChunk()) || LandsAPI.getInstance().isMemberOfChunk(location.getChunk(), player); } @Override public boolean canPlaceBlock(@NotNull final Player player, @NotNull final Block block) { - return true; + return LandsAPI.getInstance().isOwnerOfChunk(player.getName(), block.getChunk()) || LandsAPI.getInstance().isMemberOfChunk(block.getChunk(), player); } @Override public boolean canInjure(@NotNull final Player player, @NotNull final LivingEntity victim) { - return true; + return LandsAPI.getInstance().isOwnerOfChunk(player.getName(), victim.getLocation().getChunk()) || LandsAPI.getInstance().isMemberOfChunk(victim.getLocation().getChunk(), player); } @Override diff --git a/eco-core/core-plugin/src/main/resources/plugin.yml b/eco-core/core-plugin/src/main/resources/plugin.yml index a3f9ce72..019f7b8d 100644 --- a/eco-core/core-plugin/src/main/resources/plugin.yml +++ b/eco-core/core-plugin/src/main/resources/plugin.yml @@ -24,4 +24,6 @@ softdepend: - Matrix - Spartan - PlaceholderAPI - - mcMMO \ No newline at end of file + - mcMMO + - ULands + - CombatLogX \ No newline at end of file