summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/EntityTNTPrimed.java
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2011-04-20 19:05:14 +0200
committerErik Broes <erikbroes@grum.nl>2011-04-20 19:05:14 +0200
commit483a878b8bcf1feb789cb5fd9374d0a060cc4d8a (patch)
treefb56faee3872a85282e2fa88235580589c826e45 /src/main/java/net/minecraft/server/EntityTNTPrimed.java
parentac9f297445a6116c5bb314b3be9f38520a58845e (diff)
downloadcraftbukkit-483a878b8bcf1feb789cb5fd9374d0a060cc4d8a.tar
craftbukkit-483a878b8bcf1feb789cb5fd9374d0a060cc4d8a.tar.gz
craftbukkit-483a878b8bcf1feb789cb5fd9374d0a060cc4d8a.tar.lz
craftbukkit-483a878b8bcf1feb789cb5fd9374d0a060cc4d8a.tar.xz
craftbukkit-483a878b8bcf1feb789cb5fd9374d0a060cc4d8a.zip
Update for 1.4_00_01 -- if you bypassed Bukkit, you will most likely break.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityTNTPrimed.java')
-rw-r--r--src/main/java/net/minecraft/server/EntityTNTPrimed.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
index 7e85e6b5..456b9af6 100644
--- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
+++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
@@ -20,12 +20,12 @@ public class EntityTNTPrimed extends Entity {
public EntityTNTPrimed(World world, double d0, double d1, double d2) {
this(world);
- this.a(d0, d1, d2);
+ this.setPosition(d0, d1, d2);
float f = (float) (Math.random() * 3.1415927410125732D * 2.0D);
- this.motX = (double) (-MathHelper.a(f * 3.1415927F / 180.0F) * 0.02F);
+ this.motX = (double) (-MathHelper.sin(f * 3.1415927F / 180.0F) * 0.02F);
this.motY = 0.20000000298023224D;
- this.motZ = (double) (-MathHelper.b(f * 3.1415927F / 180.0F) * 0.02F);
+ this.motZ = (double) (-MathHelper.cos(f * 3.1415927F / 180.0F) * 0.02F);
this.a = 80;
this.lastX = d0;
this.lastY = d1;
@@ -47,7 +47,7 @@ public class EntityTNTPrimed extends Entity {
this.lastY = this.locY;
this.lastZ = this.locZ;
this.motY -= 0.03999999910593033D;
- this.c(this.motX, this.motY, this.motZ);
+ this.move(this.motX, this.motY, this.motZ);
this.motX *= 0.9800000190734863D;
this.motY *= 0.9800000190734863D;
this.motZ *= 0.9800000190734863D;
@@ -59,15 +59,15 @@ public class EntityTNTPrimed extends Entity {
if (this.a-- <= 0) {
// CraftBukkit start - Need to reverse the order of the explosion and the entity death so we have a location for the event.
- this.h();
- this.D();
+ this.explode();
+ this.die();
// CraftBukkit end
} else {
this.world.a("smoke", this.locX, this.locY + 0.5D, this.locZ, 0.0D, 0.0D, 0.0D);
}
}
- private void h() {
+ private void explode() {
float f = 4.0F;
// CraftBukkit start
@@ -78,7 +78,7 @@ public class EntityTNTPrimed extends Entity {
if (!event.isCancelled()) {
// give 'this' instead of (Entity) null so we know what causes the damage
- this.world.a(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire());
+ this.world.createExplosion(this, this.locX, this.locY, this.locZ, event.getRadius(), event.getFire());
}
// CraftBukkit end
}