@@ -30,7 +30,7 @@ public void injectDie(DamageSource source, CallbackInfo ci) {
3030 if (OptCarpetSettings .removeAllCurseOfBindingArmorWhenPlayerDeadInWall && player .level ().getGameRules ().get (GameRules .KEEP_INVENTORY ) && Objects .equals (source .getMsgId (), "inWall" )) {
3131 final List <ItemStack > list = List .of (player .getInventory ().equipment .get (EquipmentSlot .CHEST ), player .getInventory ().equipment .get (EquipmentSlot .FEET ), player .getInventory ().equipment .get (EquipmentSlot .LEGS ), player .getInventory ().equipment .get (EquipmentSlot .HEAD ));
3232 for (ItemStack armor : list ) {
33- if (EnchantmentHelper .has (armor , EnchantmentEffectComponents .PREVENT_EQUIPMENT_DROP )) {
33+ if (EnchantmentHelper .has (armor , EnchantmentEffectComponents .PREVENT_ARMOR_CHANGE )) {
3434 armor .setCount (0 );
3535 }
3636 }
@@ -64,16 +64,18 @@ public void injectOnDeath(DamageSource source, CallbackInfo ci) {
6464 if (OptCarpetSettings.removeAllCurseOfBindingArmorWhenPlayerDeadInWall && ((ServerPlayer) (Object)this).level().getGameRules().get(GameRules.KEEP_INVENTORY) && Objects.equals(source.getMsgId(), "inWall")) {
6565 final List<ItemStack> list = List.of(((ServerPlayer)(Object)this).getInventory().equipment.get(EquipmentSlot.CHEST), ((ServerPlayer) (Object)this).getInventory().equipment.get(EquipmentSlot.FEET), ((ServerPlayer) (Object)this).getInventory().equipment.get(EquipmentSlot.LEGS), ((ServerPlayer) (Object)this).getInventory().equipment.get(EquipmentSlot.HEAD));
6666 for (ItemStack armor : list) {
67- if (EnchantmentHelper.has(armor, net.minecraft.world.item.enchantment.EnchantmentEffectComponents.PREVENT_EQUIPMENT_DROP )) {
67+ if (EnchantmentHelper.has(armor, net.minecraft.world.item.enchantment.EnchantmentEffectComponents.PREVENT_ARMOR_CHANGE )) {
6868 armor.setCount(0);
6969 }
7070 }
7171 }
7272 }
7373}
7474*/ //?} else if >= 1.21.5 {
75- /*import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
75+ /*import io.github.optijava.opt_carpet_addition.OptCarpetAddition;
76+ import io.github.optijava.opt_carpet_addition.OptCarpetSettings;
7677import net.minecraft.world.entity.EquipmentSlot;
78+ import net.minecraft.world.item.enchantment.EnchantmentEffectComponents;
7779import net.minecraft.world.item.enchantment.EnchantmentHelper;
7880import net.minecraft.world.damagesource.DamageSource;
7981import net.minecraft.world.item.ItemStack;
@@ -95,9 +97,9 @@ public class ServerPlayer_Mixin {
9597 )
9698 public void injectOnDeath(DamageSource source, CallbackInfo ci) {
9799 if (OptCarpetSettings.removeAllCurseOfBindingArmorWhenPlayerDeadInWall && Objects.equals(source.getMsgId(), "inWall")) {
98- final List<ItemStack> list = List.of(((ServerPlayer)(Object)this).getInventory().equipment.get(EquipmentSlot.CHEST), ((ServerPlayer) (Object)this).getInventory().equipment.get(EquipmentSlot.FEET), ((ServerPlayer) (Object)this).getInventory().equipment.get(EquipmentSlot.LEGS), ((ServerPlayer) (Object)this).getInventory().equipment.get(EquipmentSlot.HEAD));
100+ final List<ItemStack> list = List.of(((ServerPlayer) (Object)this).getInventory().equipment.get(EquipmentSlot.CHEST), ((ServerPlayer) (Object)this).getInventory().equipment.get(EquipmentSlot.FEET), ((ServerPlayer) (Object)this).getInventory().equipment.get(EquipmentSlot.LEGS), ((ServerPlayer) (Object)this).getInventory().equipment.get(EquipmentSlot.HEAD));
99101 for (ItemStack armor : list) {
100- if (EnchantmentHelper.has(armor, net.minecraft.world.item.enchantment. EnchantmentEffectComponents.PREVENT_EQUIPMENT_DROP )) {
102+ if (EnchantmentHelper.has(armor, EnchantmentEffectComponents.PREVENT_ARMOR_CHANGE )) {
101103 armor.setCount(0);
102104 }
103105 }
@@ -129,7 +131,7 @@ public class ServerPlayer_Mixin {
129131 public void injectOnDeath(DamageSource source, CallbackInfo ci) {
130132 if (OptCarpetSettings.removeAllCurseOfBindingArmorWhenPlayerDeadInWall && Objects.equals(source.getMsgId(), "inWall")) {
131133 for (ItemStack armor : ((ServerPlayer) (Object) this).getArmorSlots()) {
132- if (EnchantmentHelper.has(armor, net.minecraft.world.item.enchantment.EnchantmentEffectComponents.PREVENT_EQUIPMENT_DROP )) {
134+ if (EnchantmentHelper.has(armor, net.minecraft.world.item.enchantment.EnchantmentEffectComponents.PREVENT_ARMOR_CHANGE )) {
133135 armor.setCount(0);
134136 }
135137 }
0 commit comments