44 lines
2.3 KiB
Diff
44 lines
2.3 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/world/entity/EquipmentSlot.java b/src/main/java/net/minecraft/world/entity/EquipmentSlot.java
|
||
|
|
index b686b7a2faa4fbce37dcc3598b3c956661b91aaa..17cd5f525a45058ce34c66c87f9c133033bb8f4b 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/EquipmentSlot.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/EquipmentSlot.java
|
||
|
|
@@ -16,6 +16,7 @@ public enum EquipmentSlot {
|
||
|
|
this.name = s;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ public EquipmentSlot.Type getType() { return this.getType(); } // Paper - OBFHELPER
|
||
|
|
public EquipmentSlot.Type getType() {
|
||
|
|
return this.type;
|
||
|
|
}
|
||
|
|
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
index d6b4fabd232958ae1fd5405c7129551951cd7765..8b0d1f4fbc43a6f37a5f9c453b5dd142a4f69745 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
|
||
|
|
@@ -1,5 +1,6 @@
|
||
|
|
package net.minecraft.world.entity;
|
||
|
|
|
||
|
|
+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;
|
||
|
|
@@ -2643,6 +2644,13 @@ public abstract class LivingEntity extends Entity {
|
||
|
|
ItemStack itemstack1 = this.getItemBySlot(enumitemslot);
|
||
|
|
|
||
|
|
if (!ItemStack.matches(itemstack1, itemstack)) {
|
||
|
|
+ // Paper start - PlayerArmorChangeEvent
|
||
|
|
+ if (this instanceof ServerPlayer && enumitemslot.getType() == EquipmentSlot.Type.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(EquipmentSlot.class);
|
||
|
|
}
|