mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-09 20:30:28 +01:00
15 lines
668 B
Diff
15 lines
668 B
Diff
|
--- ../work/decompile-8eb82bde//net/minecraft/server/EntityArmorStand.java 2014-11-29 16:03:15.597435308 +0000
|
||
|
|
+++ src/main/java/net/minecraft/server/EntityArmorStand.java 2014-11-29 16:02:17.625436595 +0000
|
||
|
|
@@ -343,6 +343,11 @@
|
||
|
|
}
|
||
|
|
|
||
|
|
public boolean damageEntity(DamageSource damagesource, float f) {
|
||
|
|
+ // CraftBukkit start
|
||
|
|
+ if (org.bukkit.craftbukkit.event.CraftEventFactory.handleNonLivingEntityDamageEvent(this, damagesource, f)) {
|
||
|
|
+ return false;
|
||
|
|
+ }
|
||
|
|
+ // CraftBukkit end
|
||
|
|
if (!this.world.isStatic && !this.h) {
|
||
|
|
if (DamageSource.OUT_OF_WORLD.equals(damagesource)) {
|
||
|
|
this.die();
|