mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

SPIGOT-5309: Call cancelled EntityDamageEvent when damaging invisible armor stands

Browse source 
By: jojokobi <jhocheneder@gmx.at>
This commit is contained in:
CraftBukkit/Spigot 2019-10-05 19:02:38 +02:00
commit f73b0d238f
2 changed files with 33 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
paper-server/nms-patches/EntityArmorStand.patch
View file

@ -64,9 +64,10 @@
+ // CraftBukkit end
+ this.killEntity(); // CraftBukkit - this.die() -> this.killEntity()
return false;
} else if (!this.isInvulnerable(damagesource) && !this.bD && !this.isMarker()) {
- } else if (!this.isInvulnerable(damagesource) && !this.bD && !this.isMarker()) {
+ } else if (!this.isInvulnerable(damagesource) && (true || !this.bD) && !this.isMarker()) { // CraftBukkit
+ // CraftBukkit start
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f, true, this.bD)) { // PAIL: armorStandInvisible
+ return false;
+ }
+ // CraftBukkit end