summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndrew Ardill <andrew.ardill@gmail.com>2011-12-08 10:26:39 +1100
committerAndrew Ardill <andrew.ardill@gmail.com>2011-12-08 10:26:39 +1100
commita25151306c004b058be9a5f4fdf5b9d3933eb182 (patch)
tree180187dc8ea1d14f8ec62a0a364a0d17af8c1421 /src
parentb08b85bd265f6b3e540409d4ab955a413942ae87 (diff)
downloadcraftbukkit-a25151306c004b058be9a5f4fdf5b9d3933eb182.tar
craftbukkit-a25151306c004b058be9a5f4fdf5b9d3933eb182.tar.gz
craftbukkit-a25151306c004b058be9a5f4fdf5b9d3933eb182.tar.lz
craftbukkit-a25151306c004b058be9a5f4fdf5b9d3933eb182.tar.xz
craftbukkit-a25151306c004b058be9a5f4fdf5b9d3933eb182.zip
Fix NPE as described in BUKKIT-245. Thanks snowleo
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftWorld.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 334930f6..4bc15524 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -898,7 +898,7 @@ public class CraftWorld implements World {
public void explodeBlock(Block block, float yield) {
// First of all, don't explode fire
- if (block.getType().equals(Material.FIRE)) {
+ if (block.getType().equals(org.bukkit.Material.AIR) || block.getType().equals(org.bukkit.Material.FIRE)) {
return;
}
int blockId = block.getTypeId();