diff options
| author | Tahg <tahgtahv@gmail.com> | 2012-03-01 21:26:00 -0500 |
|---|---|---|
| committer | Tahg <tahgtahv@gmail.com> | 2012-03-01 21:26:21 -0500 |
| commit | 2510af0d1aa6f2e7b0404d3b6dcd2bb4ffdbe1e8 (patch) | |
| tree | 03fcbea3d6ab0481da54eeb4411f7708a1c01fb4 /src | |
| parent | 82f2a2e773816ef465c866b25fb57b505737cdfa (diff) | |
| download | craftbukkit-2510af0d1aa6f2e7b0404d3b6dcd2bb4ffdbe1e8.tar craftbukkit-2510af0d1aa6f2e7b0404d3b6dcd2bb4ffdbe1e8.tar.gz craftbukkit-2510af0d1aa6f2e7b0404d3b6dcd2bb4ffdbe1e8.tar.lz craftbukkit-2510af0d1aa6f2e7b0404d3b6dcd2bb4ffdbe1e8.tar.xz craftbukkit-2510af0d1aa6f2e7b0404d3b6dcd2bb4ffdbe1e8.zip | |
Fix porting issue in World.mayPlace Fixes BUKKIT-915
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/net/minecraft/server/World.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java index 2202b0ed..e0ca78ab 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -2555,7 +2555,7 @@ public class World implements IBlockAccess { if (axisalignedbb != null && !this.containsEntity(axisalignedbb)) { defaultReturn = false; // CraftBukkit } else { - if (block == Block.WATER || block == Block.STATIONARY_WATER || block == Block.LAVA || block == Block.STATIONARY_LAVA || block == Block.FIRE || block == Block.SNOW || block == Block.VINE) { + if (block != null && (block == Block.WATER || block == Block.STATIONARY_WATER || block == Block.LAVA || block == Block.STATIONARY_LAVA || block == Block.FIRE || block.material.isReplacable())) { block = null; } |