diff --git a/plugins/heliodor-paper/build.gradle.kts b/plugins/heliodor-paper/build.gradle.kts index 1521a452b..382f6b313 100644 --- a/plugins/heliodor-paper/build.gradle.kts +++ b/plugins/heliodor-paper/build.gradle.kts @@ -10,4 +10,5 @@ dependencies { } compileOnly(project(":plugins:civmodcore-paper")) + compileOnly(project(":plugins:combattagplus-paper")) } diff --git a/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/backpack/BackpackListener.java b/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/backpack/BackpackListener.java index 19ac1711f..0021ecf3b 100644 --- a/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/backpack/BackpackListener.java +++ b/plugins/heliodor-paper/src/main/java/net/civmc/heliodor/backpack/BackpackListener.java @@ -2,7 +2,7 @@ package net.civmc.heliodor.backpack; import net.civmc.heliodor.HeliodorPlugin; import net.kyori.adventure.text.Component; -import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer; +import net.minelink.ctplus.CombatTagPlus; import org.bukkit.Material; import org.bukkit.NamespacedKey; import org.bukkit.block.Block; @@ -22,7 +22,6 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.persistence.PersistentDataType; import org.bukkit.plugin.java.JavaPlugin; -import java.util.List; public class BackpackListener implements Listener { @@ -125,6 +124,10 @@ public class BackpackListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void on(PlayerDeathEvent event) { + if (!JavaPlugin.getPlugin(CombatTagPlus.class).getTagManager().isTagged(event.getPlayer().getUniqueId())) { + return; + } + Inventory enderChest = event.getPlayer().getEnderChest(); for (ItemStack item : enderChest.getStorageContents()) { if (item != null && !item.isEmpty()) { diff --git a/plugins/heliodor-paper/src/main/resources/plugin.yml b/plugins/heliodor-paper/src/main/resources/plugin.yml index 595ee860b..4adf6cf4e 100644 --- a/plugins/heliodor-paper/src/main/resources/plugin.yml +++ b/plugins/heliodor-paper/src/main/resources/plugin.yml @@ -4,7 +4,7 @@ main: net.civmc.heliodor.HeliodorPlugin author: Okx api-version: 1.21 description: Implements various mechanics relating to custom ores, separately from HiddenOre -depend: [CivModCore] +depend: [CivModCore, CombatTagPlus] commands: heliodor: permission: helidor.admin