From 97ad6ea902716e8967707a241e622ecb2d7ee207 Mon Sep 17 00:00:00 2001 From: Vivian Horvath Date: Wed, 13 Nov 2024 22:25:41 -0500 Subject: [PATCH] Use Obfuscation Helpers --- .../server/0156-Add-PlayerArmorChangeEvent.patch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/patches/server/0156-Add-PlayerArmorChangeEvent.patch b/patches/server/0156-Add-PlayerArmorChangeEvent.patch index fd686cc2ee..4ce219ad91 100644 --- a/patches/server/0156-Add-PlayerArmorChangeEvent.patch +++ b/patches/server/0156-Add-PlayerArmorChangeEvent.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java -index 009539fa39c81c610ac34747cc09082a0756c79d..04704d729c1e8b170866f4101442da839a52f235 100644 +index 009539fa39c81c610ac34747cc09082a0756c79d..47a435501ab09dff1d66e91f926eaa712bb24136 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java @@ -3280,10 +3280,17 @@ public abstract class LivingEntity extends Entity implements Attackable { @@ -13,15 +13,17 @@ index 009539fa39c81c610ac34747cc09082a0756c79d..04704d729c1e8b170866f4101442da83 } - ItemStack itemstack2 = itemstack1; -+ ItemStack itemstack2 = itemstack1; final ItemStack oldEquipment = itemstack2; // Paper - PlayerArmorChangeEvent - obfhelper - +- - itemstack = this.getItemBySlot(enumitemslot); +- if (this.equipmentHasChanged(itemstack2, itemstack)) { ++ // Paper start - PlayerArmorChangeEvent ++ ItemStack itemstack2 = itemstack1; final ItemStack oldEquipment = itemstack2; // Paper - PlayerArmorChangeEvent - obfhelper ++ + itemstack = this.getItemBySlot(enumitemslot); final ItemStack newEquipment = itemstack;// Paper - PlayerArmorChangeEvent - obfhelper - if (this.equipmentHasChanged(itemstack2, itemstack)) { -+ // Paper start - PlayerArmorChangeEvent ++ if (this.equipmentHasChanged(oldEquipment, newEquipment)) { + if (this instanceof ServerPlayer && enumitemslot.getType() == EquipmentSlot.Type.HUMANOID_ARMOR) { -+ final org.bukkit.inventory.ItemStack oldItem = CraftItemStack.asBukkitCopy(itemstack2); -+ final org.bukkit.inventory.ItemStack newItem = CraftItemStack.asBukkitCopy(itemstack); ++ final org.bukkit.inventory.ItemStack oldItem = CraftItemStack.asBukkitCopy(oldEquipment); ++ final org.bukkit.inventory.ItemStack newItem = CraftItemStack.asBukkitCopy(newEquipment); + new com.destroystokyo.paper.event.player.PlayerArmorChangeEvent((Player) this.getBukkitEntity(), com.destroystokyo.paper.event.player.PlayerArmorChangeEvent.SlotType.valueOf(enumitemslot.name()), oldItem, newItem).callEvent(); + } + // Paper end - PlayerArmorChangeEvent