diff options
| author | Nate Mortensen <nate.richard.mortensen@gmail.com> | 2013-07-01 06:03:00 -0500 |
|---|---|---|
| committer | Wesley Wolfe <weswolf@aol.com> | 2013-07-01 12:10:06 -0500 |
| commit | 6c09066e224ac85b8a6464eaf8f53edfeb4beda4 (patch) | |
| tree | 573e05f4b148cb1891a1d3839175e501e6257442 /src/main/java/net/minecraft/server/Explosion.java | |
| parent | f887b76a259e12468b28d82d1eced93f0b73bd6d (diff) | |
| download | craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.gz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.lz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.xz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.zip | |
Update CraftBukkit to 1.6.1
Diffstat (limited to 'src/main/java/net/minecraft/server/Explosion.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/Explosion.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java index ef220c1f..758d447b 100644 --- a/src/main/java/net/minecraft/server/Explosion.java +++ b/src/main/java/net/minecraft/server/Explosion.java @@ -19,7 +19,7 @@ import org.bukkit.Location; public class Explosion { - public boolean a = false; + public boolean a; public boolean b = true; private int i = 16; private Random j = new Random(); @@ -133,7 +133,7 @@ public class Explosion { // CraftBukkit start - Explosion damage hook org.bukkit.entity.Entity damagee = (entity == null) ? null : entity.getBukkitEntity(); - int damageDone = (int) ((d10 * d10 + d10) / 2.0D * 8.0D * (double) this.size + 1.0D); + float damageDone = (float) ((int) ((d10 * d10 + d10) / 2.0D * 8.0D * (double) this.size + 1.0D)); if (damagee == null) { // nothing was hurt @@ -143,7 +143,7 @@ public class Explosion { if (!event.isCancelled()) { damagee.setLastDamageCause(event); - entity.damageEntity(DamageSource.explosion(this), event.getDamage()); + entity.damageEntity(DamageSource.explosion(this), (float) event.getDamage()); double d11 = EnchantmentProtection.a(entity, d10); entity.motX += d0 * d11; @@ -168,7 +168,7 @@ public class Explosion { if (!event.isCancelled()) { entity.getBukkitEntity().setLastDamageCause(event); - entity.damageEntity(DamageSource.explosion(this), event.getDamage()); + entity.damageEntity(DamageSource.explosion(this), (float) event.getDamage()); entity.motX += d0 * d10; entity.motY += d1 * d10; @@ -287,7 +287,7 @@ public class Explosion { l = this.world.getTypeId(i, j, k); int i1 = this.world.getTypeId(i, j - 1, k); - if (l == 0 && Block.s[i1] && this.j.nextInt(3) == 0) { + if (l == 0 && Block.t[i1] && this.j.nextInt(3) == 0) { // CraftBukkit start - Ignition by explosion if (!org.bukkit.craftbukkit.event.CraftEventFactory.callBlockIgniteEvent(this.world, i, j, k, this).isCancelled()) { this.world.setTypeIdUpdate(i, j, k, Block.FIRE.id); |