diff options
author | Travis Watkins <amaranth@ubuntu.com> | 2014-06-26 13:05:08 -0500 |
---|---|---|
committer | Travis Watkins <amaranth@ubuntu.com> | 2014-07-08 14:31:10 -0500 |
commit | dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00 (patch) | |
tree | 062b1b273d0e0f337fde6b79f9377519d85c48c5 /src/main/java/net/minecraft/server/ChunkSection.java | |
parent | a8628fd645e12ec22bc525f49dd25f68d094f3ef (diff) | |
download | craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.gz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.lz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.tar.xz craftbukkit-dbb5e6e3cd35ca82efb39a44fcf6542733d2bc00.zip |
Update CraftBukkit to Minecraft 1.7.10
Diffstat (limited to 'src/main/java/net/minecraft/server/ChunkSection.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ChunkSection.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java index 787077dc..e33712a4 100644 --- a/src/main/java/net/minecraft/server/ChunkSection.java +++ b/src/main/java/net/minecraft/server/ChunkSection.java @@ -85,7 +85,7 @@ public class ChunkSection { id |= this.extBlockIds.a(i, j, k) << 8; } - return Block.e(id); // Should be getBlockForId + return Block.getById(id); } // CraftBukkit end @@ -95,7 +95,7 @@ public class ChunkSection { l |= this.extBlockIds.a(i, j, k) << 8; } - return Block.e(l); + return Block.getById(l); } public void setTypeId(int i, int j, int k, Block block) { @@ -120,7 +120,7 @@ public class ChunkSection { } } - int i1 = Block.b(block); + int i1 = Block.getId(block); // CraftBukkit start - Compact storage if (this.blockIds == null) { @@ -226,7 +226,7 @@ public class ChunkSection { if (this.extBlockIds == null) { id |= this.compactExtId << 8; if (id > 0) { - Block block = Block.e(id); // Should be getBlockForId + Block block = Block.getById(id); if (block == null) { this.compactId = 0; this.compactExtId = 0; @@ -243,7 +243,7 @@ public class ChunkSection { byte extid = ext[off2]; int l = (id & 0xFF) | ((extid & 0xF) << 8); // Even data if (l > 0) { - Block block = Block.e(l); // Should be getBlockForId + Block block = Block.getById(l); if (block == null) { this.compactId = 0; ext[off2] &= 0xF0; @@ -257,7 +257,7 @@ public class ChunkSection { off++; l = (id & 0xFF) | ((extid & 0xF0) << 4); // Odd data if (l > 0) { - Block block = Block.e(l); // Should be getBlockForId + Block block = Block.getById(l); if (block == null) { this.compactId = 0; ext[off2] &= 0x0F; @@ -278,11 +278,11 @@ public class ChunkSection { for (int off = 0; off < blkIds.length; off++) { int l = blkIds[off] & 0xFF; if (l > 0) { - if (Block.e(l) == null) { + if (Block.getById(l) == null) { blkIds[off] = 0; } else { ++cntNonEmpty; - if (Block.e(l).isTicking()) { + if (Block.getById(l).isTicking()) { ++cntTicking; } } @@ -294,12 +294,12 @@ public class ChunkSection { byte extid = ext[off2]; int l = (blkIds[off] & 0xFF) | ((extid & 0xF) << 8); // Even data if (l > 0) { - if (Block.e(l) == null) { + if (Block.getById(l) == null) { blkIds[off] = 0; ext[off2] &= 0xF0; } else { ++cntNonEmpty; - if (Block.e(l).isTicking()) { + if (Block.getById(l).isTicking()) { ++cntTicking; } } @@ -307,12 +307,12 @@ public class ChunkSection { off++; l = (blkIds[off] & 0xFF) | ((extid & 0xF0) << 4); // Odd data if (l > 0) { - if (Block.e(l) == null) { + if (Block.getById(l) == null) { blkIds[off] = 0; ext[off2] &= 0x0F; } else { ++cntNonEmpty; - if (Block.e(l).isTicking()) { + if (Block.getById(l).isTicking()) { ++cntTicking; } } |