From 46a38257b09a6207c30defb373bd9f609f5dcf10 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Sun, 3 Mar 2019 15:21:51 -0500
Subject: [PATCH] Fire PlayerArmorChangeEvent for more cases

---
 Spigot-Server-Patches/Add-PlayerArmorChangeEvent.patch      | 4 ++--
 .../Allow-disabling-armour-stand-ticking.patch              | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Spigot-Server-Patches/Add-PlayerArmorChangeEvent.patch b/Spigot-Server-Patches/Add-PlayerArmorChangeEvent.patch
index 34645c6e4..4170a0ebf 100644
--- a/Spigot-Server-Patches/Add-PlayerArmorChangeEvent.patch
+++ b/Spigot-Server-Patches/Add-PlayerArmorChangeEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 46a09faf9..49e55ebdb 100644
+index 46a09faf9..316b66cc4 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@
@@ -20,7 +20,7 @@ index 46a09faf9..49e55ebdb 100644
  
                  if (!ItemStack.matches(itemstack1, itemstack)) {
 +                    // Paper start - PlayerArmorChangeEvent
-+                    if (this instanceof EntityPlayer && enumitemslot.getType() == EnumItemSlot.Function.ARMOR && !itemstack.getItem().equals(itemstack1.getItem())) {
++                    if (this instanceof EntityPlayer && enumitemslot.getType() == EnumItemSlot.Function.ARMOR) {
 +                        final org.bukkit.inventory.ItemStack oldItem = CraftItemStack.asBukkitCopy(itemstack);
 +                        final org.bukkit.inventory.ItemStack newItem = CraftItemStack.asBukkitCopy(itemstack1);
 +                        new PlayerArmorChangeEvent((Player) this.getBukkitEntity(), PlayerArmorChangeEvent.SlotType.valueOf(enumitemslot.name()), oldItem, newItem).callEvent();
diff --git a/Spigot-Server-Patches/Allow-disabling-armour-stand-ticking.patch b/Spigot-Server-Patches/Allow-disabling-armour-stand-ticking.patch
index 1418c5da4..1b01094b8 100644
--- a/Spigot-Server-Patches/Allow-disabling-armour-stand-ticking.patch
+++ b/Spigot-Server-Patches/Allow-disabling-armour-stand-ticking.patch
@@ -141,7 +141,7 @@ index c604182dd..2c54e3e34 100644
  
      public Vector3f r() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index fa4c593de..d94f5e609 100644
+index bca5136dc..497b5ceb5 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -0,0 +0,0 @@ public abstract class EntityLiving extends Entity {
@@ -170,7 +170,7 @@ index fa4c593de..d94f5e609 100644
 -
 -                if (!ItemStack.matches(itemstack1, itemstack)) {
 -                    // Paper start - PlayerArmorChangeEvent
--                    if (this instanceof EntityPlayer && enumitemslot.getType() == EnumItemSlot.Function.ARMOR && !itemstack.getItem().equals(itemstack1.getItem())) {
+-                    if (this instanceof EntityPlayer && enumitemslot.getType() == EnumItemSlot.Function.ARMOR) {
 -                        final org.bukkit.inventory.ItemStack oldItem = CraftItemStack.asBukkitCopy(itemstack);
 -                        final org.bukkit.inventory.ItemStack newItem = CraftItemStack.asBukkitCopy(itemstack1);
 -                        new PlayerArmorChangeEvent((Player) this.getBukkitEntity(), PlayerArmorChangeEvent.SlotType.valueOf(enumitemslot.name()), oldItem, newItem).callEvent();
@@ -226,7 +226,7 @@ index fa4c593de..d94f5e609 100644
 +
 +            if (!ItemStack.matches(itemstack1, itemstack)) {
 +                // Paper start - PlayerArmorChangeEvent
-+                if (this instanceof EntityPlayer && enumitemslot.getType() == EnumItemSlot.Function.ARMOR && !itemstack.getItem().equals(itemstack1.getItem())) {
++                if (this instanceof EntityPlayer && enumitemslot.getType() == EnumItemSlot.Function.ARMOR) {
 +                    final org.bukkit.inventory.ItemStack oldItem = CraftItemStack.asBukkitCopy(itemstack);
 +                    final org.bukkit.inventory.ItemStack newItem = CraftItemStack.asBukkitCopy(itemstack1);
 +                    new PlayerArmorChangeEvent((Player) this.getBukkitEntity(), PlayerArmorChangeEvent.SlotType.valueOf(enumitemslot.name()), oldItem, newItem).callEvent();