summaryrefslogtreecommitdiffstats
path: root/src/main/java/net/minecraft/server/Explosion.java
diff options
context:
space:
mode:
authorTravis Watkins <amaranth@ubuntu.com>2013-03-24 23:22:32 -0500
committerTravis Watkins <amaranth@ubuntu.com>2013-03-25 00:51:36 -0500
commit5f089137ee63505b85ee7ddf0e75cb797c835d41 (patch)
tree1a73488a61ae3bec6ae237b7c1d83652f211cdac /src/main/java/net/minecraft/server/Explosion.java
parent7c40a073d8b173dde3f7c13985b5b587e6158894 (diff)
downloadcraftbukkit-5f089137ee63505b85ee7ddf0e75cb797c835d41.tar
craftbukkit-5f089137ee63505b85ee7ddf0e75cb797c835d41.tar.gz
craftbukkit-5f089137ee63505b85ee7ddf0e75cb797c835d41.tar.lz
craftbukkit-5f089137ee63505b85ee7ddf0e75cb797c835d41.tar.xz
craftbukkit-5f089137ee63505b85ee7ddf0e75cb797c835d41.zip
Cleanup comments, formatting, etc
Diffstat (limited to 'src/main/java/net/minecraft/server/Explosion.java')
-rw-r--r--src/main/java/net/minecraft/server/Explosion.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
index 50646cef..b43953a0 100644
--- a/src/main/java/net/minecraft/server/Explosion.java
+++ b/src/main/java/net/minecraft/server/Explosion.java
@@ -131,7 +131,7 @@ public class Explosion {
double d9 = (double) this.world.a(vec3d, entity.boundingBox);
double d10 = (1.0D - d7) * d9;
- // CraftBukkit start - explosion damage hook
+ // 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);
@@ -290,10 +290,11 @@ public class Explosion {
int i1 = this.world.getTypeId(i, j - 1, k);
if (l == 0 && Block.s[i1] && this.j.nextInt(3) == 0) {
- // CraftBukkit start - ignition by explosion.
+ // 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);
- } // CraftBukkit end
+ }
+ // CraftBukkit end
}
}
}