diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-11-29 12:41:51 +0200 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-11-29 12:41:51 +0200 |
| commit | c61594c782c531914dfc66dbd8dcbef86b8d627b (patch) | |
| tree | 1708c57335af353472679dc88f3b210f8bee7b46 | |
| parent | 8c3698bf0f7aef6de972b41f7db1eae308935d63 (diff) | |
| parent | dd33bcf6a53149d3813d128d5e93b5bf5ca69711 (diff) | |
| download | craftbukkit-c61594c782c531914dfc66dbd8dcbef86b8d627b.tar craftbukkit-c61594c782c531914dfc66dbd8dcbef86b8d627b.tar.gz craftbukkit-c61594c782c531914dfc66dbd8dcbef86b8d627b.tar.lz craftbukkit-c61594c782c531914dfc66dbd8dcbef86b8d627b.tar.xz craftbukkit-c61594c782c531914dfc66dbd8dcbef86b8d627b.zip | |
Merge pull request #4 in SPIGOT/craftbukkit from ~MIKEPRIMM/craftbukkit:mikeprimm/SPIGOT-29 to master
* commit 'dd33bcf6a53149d3813d128d5e93b5bf5ca69711':
Fix chunk snapshot generation (needed for Dynmap)
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftChunk.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java index 0cba7fd9..9b481a08 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java @@ -168,7 +168,8 @@ public class CraftChunk implements Chunk { // Copy base IDs for (int j = 0; j < 4096; j++) { - IBlockData blockData = net.minecraft.server.Block.getByCombinedId(baseids[j]); + if (baseids[j] == 0) continue; + IBlockData blockData = (IBlockData) net.minecraft.server.Block.d.a(baseids[j]); blockids[j] = (short) net.minecraft.server.Block.getId(blockData.getBlock()); int data = blockData.getBlock().toLegacyData(blockData); int jj = j >> 1; |