44 lines
2.2 KiB
Diff
44 lines
2.2 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: pkt77 <parkerkt77@gmail.com>
|
||
|
|
Date: Fri, 10 Nov 2017 23:46:34 -0500
|
||
|
|
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 7ec1a572efd99928e8aae9b75c0eed73430aa337..26832d31cc64d26a9ca61a3bad21424ed366c74c 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EntityLiving.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EntityLiving.java
|
||
|
|
@@ -1,5 +1,6 @@
|
||
|
|
package net.minecraft.server;
|
||
|
|
|
||
|
|
+import com.destroystokyo.paper.event.player.PlayerArmorChangeEvent; // Paper
|
||
|
|
import com.google.common.base.Objects;
|
||
|
|
import com.google.common.collect.ImmutableList;
|
||
|
|
import com.google.common.collect.ImmutableMap;
|
||
|
|
@@ -2523,6 +2524,13 @@ public abstract class EntityLiving extends Entity {
|
||
|
|
ItemStack itemstack1 = this.getEquipment(enumitemslot);
|
||
|
|
|
||
|
|
if (!ItemStack.matches(itemstack1, itemstack)) {
|
||
|
|
+ // Paper start - PlayerArmorChangeEvent
|
||
|
|
+ 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();
|
||
|
|
+ }
|
||
|
|
+ // Paper end
|
||
|
|
if (map == null) {
|
||
|
|
map = Maps.newEnumMap(EnumItemSlot.class);
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java
|
||
|
|
index 02a7ae6785b0539e4aa567fca377d727184fd019..60b235f16f5e762d635efa1578b715db445513a5 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/EnumItemSlot.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/EnumItemSlot.java
|
||
|
|
@@ -16,6 +16,7 @@ public enum EnumItemSlot {
|
||
|
|
this.j = s;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ public EnumItemSlot.Function getType() { return this.a(); } // Paper - OBFHELPER
|
||
|
|
public EnumItemSlot.Function a() {
|
||
|
|
return this.g;
|
||
|
|
}
|