2015-02-01 08:12:55 +01:00
|
|
|
--- ../work/decompile-8eb82bde/net/minecraft/server/EntityArmorStand.java 2015-02-01 18:12:22.718390345 +1100
|
|
|
|
|
+++ src/main/java/net/minecraft/server/EntityArmorStand.java 2015-02-01 18:12:22.718390345 +1100
|
2014-11-29 17:05:55 +01:00
|
|
|
@@ -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();
|
2015-02-01 08:12:55 +01:00
|
|
|
@@ -542,6 +547,8 @@
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
this.datawatcher.watch(10, Byte.valueOf(b0));
|
|
|
|
|
+
|
|
|
|
|
+ this.T = flag; // CraftBukkit. // PAIL: Rename (noclip)
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
public boolean hasGravity() {
|
