Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-10 10:17:38 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-4982: Armor disappearing while breaking the armor stand

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2019-05-25 10:45:24 +10:00
parent a7f92c8388
commit 0e59838abf
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
paper-server/nms-patches/EntityArmorStand.patch
View File

@ -101,7 +101,7 @@
} else { } else {
this.setHealth(f1); this.setHealth(f1);
} }
@@ -474,7 +510,7 @@ @@ -474,13 +510,13 @@
} }
private void f(DamageSource damagesource) { private void f(DamageSource damagesource) {
@ -110,6 +110,13 @@
this.g(damagesource); this.g(damagesource);
} }
private void g(DamageSource damagesource) {
this.F();
- this.d(damagesource);
+ // this.d(damagesource); // CraftBukkit - moved down
ItemStack itemstack;
int i;
@@ -488,7 +524,7 @@ @@ -488,7 +524,7 @@
for (i = 0; i < this.handItems.size(); ++i) { for (i = 0; i < this.handItems.size(); ++i) {
itemstack = (ItemStack) this.handItems.get(i); itemstack = (ItemStack) this.handItems.get(i);
@ -119,7 +126,7 @@
this.handItems.set(i, ItemStack.a); this.handItems.set(i, ItemStack.a);
} }
} }
@@ -496,7 +532,7 @@ @@ -496,10 +532,11 @@
for (i = 0; i < this.armorItems.size(); ++i) { for (i = 0; i < this.armorItems.size(); ++i) {
itemstack = (ItemStack) this.armorItems.get(i); itemstack = (ItemStack) this.armorItems.get(i);
if (!itemstack.isEmpty()) { if (!itemstack.isEmpty()) {
@ -128,7 +135,11 @@
this.armorItems.set(i, ItemStack.a); this.armorItems.set(i, ItemStack.a);
} }
} }
@@ -602,6 +638,7 @@ + this.d(damagesource); // CraftBukkit - moved from above
}
@@ -602,6 +639,7 @@
@Override @Override
public void killEntity() { public void killEntity() {