From 177771b17cd1aa2f6058414fa2bf9b8cb7088bd8 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Wed, 31 Aug 2022 14:44:26 +0700 Subject: [PATCH] Account for vanishing curse --- .../mc/otm/capability/MatteryPlayerCapability.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt index 7275e2c66..e74a36437 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/capability/MatteryPlayerCapability.kt @@ -24,6 +24,7 @@ import net.minecraft.world.effect.MobEffects import net.minecraft.world.entity.Entity import net.minecraft.world.entity.item.ItemEntity import net.minecraft.world.entity.player.Player +import net.minecraft.world.item.enchantment.EnchantmentHelper.hasVanishingCurse import net.minecraftforge.common.capabilities.Capability import net.minecraftforge.common.capabilities.ForgeCapabilities import net.minecraftforge.event.AttachCapabilitiesEvent @@ -85,7 +86,10 @@ class MatteryPlayerCapability(val ply: Player) : ICapabilityProvider, IMatteryEn for (item in iterator) { if (!item.isEmpty) { - ply.drop(item, true, false) + if (!hasVanishingCurse(item)) { + ply.drop(item, true, false) + } + iterator.remove() } }