blob: 07de6e30fb1a7641a666d85c0193e7262fe341d9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
--- ../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
@@ -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();
@@ -542,6 +547,8 @@
}
this.datawatcher.watch(10, Byte.valueOf(b0));
+
+ this.T = flag; // CraftBukkit. // PAIL: Rename (noclip)
}
public boolean hasGravity() {
|
