Skip to content

Commit 916df1a

Browse files
committed
use the correct item reference for retrieving components, closes #1668
1 parent 5d3463a commit 916df1a

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

  • purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/piglin

purpur-server/minecraft-patches/sources/net/minecraft/world/entity/monster/piglin/PiglinAi.java.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
- if (entity.getItemBySlot(equipmentSlot).is(ItemTags.PIGLIN_SAFE_ARMOR)) {
88
+ // Purpur start - piglins ignore gold-trimmed armor
99
+ net.minecraft.world.item.ItemStack itemStack = entity.getItemBySlot(equipmentSlot);
10-
+ if (itemStack.is(ItemTags.PIGLIN_SAFE_ARMOR) || (entity.level().purpurConfig.piglinIgnoresArmorWithGoldTrim && isWearingGoldTrim(itemStack.getItem()))) {
10+
+ if (itemStack.is(ItemTags.PIGLIN_SAFE_ARMOR) || (entity.level().purpurConfig.piglinIgnoresArmorWithGoldTrim && isWearingGoldTrim(itemStack))) {
1111
+ // Purpur end - piglins ignore gold-trimmed armor
1212
return true;
1313
}
@@ -17,8 +17,8 @@
1717
}
1818
+
1919
+ // Purpur start - piglins ignore gold-trimmed armor
20-
+ private static boolean isWearingGoldTrim(Item itemstack) {
21-
+ net.minecraft.world.item.equipment.trim.ArmorTrim armorTrim = itemstack.components().get(net.minecraft.core.component.DataComponents.TRIM);
20+
+ private static boolean isWearingGoldTrim(net.minecraft.world.item.ItemStack itemstack) {
21+
+ net.minecraft.world.item.equipment.trim.ArmorTrim armorTrim = itemstack.getComponents().get(net.minecraft.core.component.DataComponents.TRIM);
2222
+ return armorTrim != null && armorTrim.material().is(net.minecraft.world.item.equipment.trim.TrimMaterials.GOLD);
2323
+ }
2424
+ // Purpur end - piglins ignore gold-trimmed armor

0 commit comments

Comments
 (0)