diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2013-03-13 17:33:27 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2013-03-15 13:28:59 -0500 |
commit | 83d29e461c85733f0113b6eb19db6e3b42da2949 (patch) | |
tree | b3063a1c28f478ab368d5ba3413a842def68c28f /src/main/java/net/minecraft/server/EntityTNTPrimed.java | |
parent | ba6e4c38cfa98ad291974195cc46d70a4f138ac1 (diff) | |
download | craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.gz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.lz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.tar.xz craftbukkit-83d29e461c85733f0113b6eb19db6e3b42da2949.zip |
Update CraftBukkit to Minecraft 1.5
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityTNTPrimed.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityTNTPrimed.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java index 8db94ffe..41139997 100644 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java @@ -5,6 +5,7 @@ import org.bukkit.event.entity.ExplosionPrimeEvent; // CraftBukkit public class EntityTNTPrimed extends Entity { public int fuseTicks; + private EntityLiving source; public float yield = 4; // CraftBukkit public boolean isIncendiary = false; // CraftBukkit @@ -16,7 +17,7 @@ public class EntityTNTPrimed extends Entity { this.height = this.length / 2.0F; } - public EntityTNTPrimed(World world, double d0, double d1, double d2) { + public EntityTNTPrimed(World world, double d0, double d1, double d2, EntityLiving entityliving) { this(world); this.setPosition(d0, d1, d2); float f = (float) (Math.random() * 3.1415927410125732D * 2.0D); @@ -28,6 +29,7 @@ public class EntityTNTPrimed extends Entity { this.lastX = d0; this.lastY = d1; this.lastZ = d2; + this.source = entityliving; } protected void a() {} @@ -36,11 +38,11 @@ public class EntityTNTPrimed extends Entity { return false; } - public boolean L() { + public boolean K() { return !this.dead; } - public void j_() { + public void l_() { this.lastX = this.locX; this.lastY = this.locY; this.lastZ = this.locZ; @@ -90,4 +92,8 @@ public class EntityTNTPrimed extends Entity { protected void a(NBTTagCompound nbttagcompound) { this.fuseTicks = nbttagcompound.getByte("Fuse"); } + + public EntityLiving getSource() { + return this.source; + } } |