From 916df1a858c46e240fa966540cf1cc819cfb3c36 Mon Sep 17 00:00:00 2001
From: granny <contact@granny.dev>
Date: Thu, 5 Jun 2025 21:18:05 -0700
Subject: [PATCH] use the correct item reference for retrieving components,
 closes #1668

---
 .../world/entity/monster/piglin/PiglinAi.java.patch         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch
index 1c6e7e4c3..ae53e80fd 100644
--- a/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch
+++ b/purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch
@@ -7,7 +7,7 @@
 -            if (entity.getItemBySlot(equipmentSlot).is(ItemTags.PIGLIN_SAFE_ARMOR)) {
 +            // Purpur start - piglins ignore gold-trimmed armor
 +            net.minecraft.world.item.ItemStack itemStack = entity.getItemBySlot(equipmentSlot);
-+            if (itemStack.is(ItemTags.PIGLIN_SAFE_ARMOR) || (entity.level().purpurConfig.piglinIgnoresArmorWithGoldTrim && isWearingGoldTrim(itemStack.getItem()))) {
++            if (itemStack.is(ItemTags.PIGLIN_SAFE_ARMOR) || (entity.level().purpurConfig.piglinIgnoresArmorWithGoldTrim && isWearingGoldTrim(itemStack))) {
 +            // Purpur end - piglins ignore gold-trimmed armor
                  return true;
              }
@@ -17,8 +17,8 @@
      }
 +
 +    // Purpur start - piglins ignore gold-trimmed armor
-+    private static boolean isWearingGoldTrim(Item itemstack) {
-+        net.minecraft.world.item.equipment.trim.ArmorTrim armorTrim = itemstack.components().get(net.minecraft.core.component.DataComponents.TRIM);
++    private static boolean isWearingGoldTrim(net.minecraft.world.item.ItemStack itemstack) {
++        net.minecraft.world.item.equipment.trim.ArmorTrim armorTrim = itemstack.getComponents().get(net.minecraft.core.component.DataComponents.TRIM);
 +        return armorTrim != null && armorTrim.material().is(net.minecraft.world.item.equipment.trim.TrimMaterials.GOLD);
 +    }
 +    // Purpur end - piglins ignore gold-trimmed armor