diff options
author | Shane Freeder <[email protected]> | 2024-07-08 22:30:01 +0100 |
---|---|---|
committer | Shane Freeder <[email protected]> | 2024-07-08 22:30:01 +0100 |
commit | a74d9bf629ab2d502831fb36a251cdac0ab30522 (patch) | |
tree | 44af854a258c4f9119f2caa6db257e4e3a1e6e52 /patches/server/0157-Add-PlayerArmorChangeEvent.patch | |
parent | 6723f5498616da919762c68978e13c518943ef40 (diff) | |
parent | 70b0e844767131681400b3dbace06c2dea13f87c (diff) | |
download | Paper-a74d9bf629ab2d502831fb36a251cdac0ab30522.tar.gz Paper-a74d9bf629ab2d502831fb36a251cdac0ab30522.zip |
Merge remote-tracking branch 'origin/master' into chore/terminalchore/terminal
Diffstat (limited to 'patches/server/0157-Add-PlayerArmorChangeEvent.patch')
-rw-r--r-- | patches/server/0157-Add-PlayerArmorChangeEvent.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/patches/server/0157-Add-PlayerArmorChangeEvent.patch b/patches/server/0157-Add-PlayerArmorChangeEvent.patch index 8e7a7da4ed..d9478284f8 100644 --- a/patches/server/0157-Add-PlayerArmorChangeEvent.patch +++ b/patches/server/0157-Add-PlayerArmorChangeEvent.patch @@ -5,10 +5,10 @@ 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 51dadc6d3ea7f0b7b5eb5117b58df0e532c65eb9..71696a99a99573aa54c11ee9b490bb292d59f753 100644 +index f297b2227d0793f44cb5770aa24a474ec7283b15..21d00a73ad8287d61eda1ab91b88ea3264aff021 100644 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java -@@ -3140,6 +3140,13 @@ public abstract class LivingEntity extends Entity implements Attackable { +@@ -3168,6 +3168,13 @@ public abstract class LivingEntity extends Entity implements Attackable { ItemStack itemstack2 = this.getItemBySlot(enumitemslot); if (this.equipmentHasChanged(itemstack1, itemstack2)) { |