diff options
author | feildmaster <admin@feildmaster.com> | 2013-01-17 03:28:44 -0600 |
---|---|---|
committer | feildmaster <admin@feildmaster.com> | 2013-01-17 03:50:24 -0600 |
commit | e59af9908b5c6418664a8676e9ef13d9c8edc90e (patch) | |
tree | e48bc62a3556af51cf375f587100019b79d814cc /src/main/java/net/minecraft/server/EntityFireworks.java | |
parent | 315127782a86659d8ac353408ce385e0b8ee9ddb (diff) | |
download | craftbukkit-e59af9908b5c6418664a8676e9ef13d9c8edc90e.tar craftbukkit-e59af9908b5c6418664a8676e9ef13d9c8edc90e.tar.gz craftbukkit-e59af9908b5c6418664a8676e9ef13d9c8edc90e.tar.lz craftbukkit-e59af9908b5c6418664a8676e9ef13d9c8edc90e.tar.xz craftbukkit-e59af9908b5c6418664a8676e9ef13d9c8edc90e.zip |
Update CraftBukkit to Minecraft 1.4.7
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityFireworks.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityFireworks.java | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java index 65b8714c..64454f5b 100644 --- a/src/main/java/net/minecraft/server/EntityFireworks.java +++ b/src/main/java/net/minecraft/server/EntityFireworks.java @@ -2,8 +2,8 @@ package net.minecraft.server; public class EntityFireworks extends Entity { - private int a; - public int b; // CraftBukkit - private -> public + private int ticksFlown; + public int expectedLifespan; // CraftBukkit - private -> public public EntityFireworks(World world) { super(world); @@ -11,12 +11,12 @@ public class EntityFireworks extends Entity { } protected void a() { - this.datawatcher.a(8, new ItemStack(0, 0, 0)); + this.datawatcher.a(8, 5); } public EntityFireworks(World world, double d0, double d1, double d2, ItemStack itemstack) { super(world); - this.a = 0; + this.ticksFlown = 0; this.a(0.25F, 0.25F); this.setPosition(d0, d1, d2); this.height = 0.0F; @@ -35,7 +35,7 @@ public class EntityFireworks extends Entity { this.motX = this.random.nextGaussian() * 0.001D; this.motZ = this.random.nextGaussian() * 0.001D; this.motY = 0.05D; - this.b = 10 * i + this.random.nextInt(6) + this.random.nextInt(7); + this.expectedLifespan = 10 * i + this.random.nextInt(6) + this.random.nextInt(7); } public void j_() { @@ -69,25 +69,25 @@ public class EntityFireworks extends Entity { this.pitch = this.lastPitch + (this.pitch - this.lastPitch) * 0.2F; this.yaw = this.lastYaw + (this.yaw - this.lastYaw) * 0.2F; - if (this.a == 0) { + if (this.ticksFlown == 0) { this.world.makeSound(this, "fireworks.launch", 3.0F, 1.0F); } - ++this.a; - if (this.world.isStatic && this.a % 2 < 2) { + ++this.ticksFlown; + if (this.world.isStatic && this.ticksFlown % 2 < 2) { this.world.addParticle("fireworksSpark", this.locX, this.locY - 0.3D, this.locZ, this.random.nextGaussian() * 0.05D, -this.motY * 0.5D, this.random.nextGaussian() * 0.05D); } - if (!this.world.isStatic && this.a > this.b) { + if (!this.world.isStatic && this.ticksFlown > this.expectedLifespan) { this.world.broadcastEntityEffect(this, (byte) 17); this.die(); } } public void b(NBTTagCompound nbttagcompound) { - nbttagcompound.setInt("Life", this.a); - nbttagcompound.setInt("LifeTime", this.b); - ItemStack itemstack = this.datawatcher.f(8); + nbttagcompound.setInt("Life", this.ticksFlown); + nbttagcompound.setInt("LifeTime", this.expectedLifespan); + ItemStack itemstack = this.datawatcher.getItemStack(8); if (itemstack != null) { NBTTagCompound nbttagcompound1 = new NBTTagCompound(); @@ -98,12 +98,12 @@ public class EntityFireworks extends Entity { } public void a(NBTTagCompound nbttagcompound) { - this.a = nbttagcompound.getInt("Life"); - this.b = nbttagcompound.getInt("LifeTime"); + this.ticksFlown = nbttagcompound.getInt("Life"); + this.expectedLifespan = nbttagcompound.getInt("LifeTime"); NBTTagCompound nbttagcompound1 = nbttagcompound.getCompound("FireworksItem"); if (nbttagcompound1 != null) { - ItemStack itemstack = ItemStack.a(nbttagcompound1); + ItemStack itemstack = ItemStack.createStack(nbttagcompound1); if (itemstack != null) { this.datawatcher.watch(8, itemstack); |