summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityTNTPrimed.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2011-05-28 22:50:08 +0200
committerEvilSeph <evilseph@unaligned.org>2011-05-30 22:37:34 -0400
commit6dbd710bbf37728eb760cacb019d1e384a7e1311 (patch)
tree37b670b6e589f3fcffa116d55c099e424402dfdc /src/main/java/net/minecraft/server/EntityTNTPrimed.java
parent9ec5d8b5dfc544a6873aa1bb48a07deedd1751fb (diff)
downloadcraftbukkit-6dbd710bbf37728eb760cacb019d1e384a7e1311.tar
craftbukkit-6dbd710bbf37728eb760cacb019d1e384a7e1311.tar.gz
craftbukkit-6dbd710bbf37728eb760cacb019d1e384a7e1311.tar.lz
craftbukkit-6dbd710bbf37728eb760cacb019d1e384a7e1311.tar.xz
craftbukkit-6dbd710bbf37728eb760cacb019d1e384a7e1311.zip
Update for 1.6.5
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityTNTPrimed.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityTNTPrimed.java8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
index cd023a8d..997ef48d 100644
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
@@ -13,7 +13,7 @@ public class EntityTNTPrimed extends Entity {
public EntityTNTPrimed(World world) {
super(world);
this.a = 0;
- this.aH = true;
+ this.aI = true;
this.b(0.98F, 0.98F);
this.height = this.width / 2.0F;
}
@@ -38,11 +38,11 @@ public class EntityTNTPrimed extends Entity {
return false;
}
- public boolean o_() {
+ public boolean n_() {
return !this.dead;
}
- public void p_() {
+ public void o_() {
this.lastX = this.locX;
this.lastY = this.locY;
this.lastZ = this.locZ;
@@ -63,6 +63,8 @@ public class EntityTNTPrimed extends Entity {
this.explode();
this.die();
// CraftBukkit end
+ } else {
+ this.die();
}
} else {
this.world.a("smoke", this.locX, this.locY + 0.5D, this.locZ, 0.0D, 0.0D, 0.0D);