Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-28 13:15:30 +01:00
Code Issues Projects Releases Wiki Activity

Handle 1.2.x world height in chunks with Spout plus custom blocks

Browse Source
This commit is contained in:
Mike Primm 2012-03-28 11:39:39 -05:00
parent cf5e2e00e6
commit f93f37deea
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/dynmap/bukkit/NewMapChunkCache.java
View File

@ -590,11 +590,22 @@ public class NewMapChunkCache implements MapChunkCache {
private static class SpoutChunkSnapshot implements ChunkSnapshot { private static class SpoutChunkSnapshot implements ChunkSnapshot {
private ChunkSnapshot chunk; private ChunkSnapshot chunk;
private short[] customids; /* (X << 11) | (Z << 7) | Y */ private short[] customids;
private final int shiftx;
private final int shiftz;
SpoutChunkSnapshot(ChunkSnapshot chunk, short[] customids) { SpoutChunkSnapshot(ChunkSnapshot chunk, short[] customids, int height) {
this.chunk = chunk; this.chunk = chunk;
this.customids = customids.clone(); this.customids = customids.clone();
int sx = 11;
int sz = 7; /* 128 high values */
while(height > 128) {
sx++;
sz++;
height = (height >> 1);
}
shiftx = sx;
shiftz = sz;
} }
/* Need these for interface, but not used */ /* Need these for interface, but not used */
public final int getX() { return chunk.getX(); } public final int getX() { return chunk.getX(); }
@ -606,7 +617,7 @@ public class NewMapChunkCache implements MapChunkCache {
public final long getCaptureFullTime() { return chunk.getCaptureFullTime(); } public final long getCaptureFullTime() { return chunk.getCaptureFullTime(); }
public final int getBlockTypeId(int x, int y, int z) { public final int getBlockTypeId(int x, int y, int z) {
int id = customids[(x << 11) | (z << 7) | y]; int id = customids[(x << shiftx) | (z << shiftz) | y];
if(id != 0) return id; if(id != 0) return id;
return chunk.getBlockTypeId(x, y, z); return chunk.getBlockTypeId(x, y, z);
} }
@ -716,7 +727,7 @@ public class NewMapChunkCache implements MapChunkCache {
SpoutChunk sc = (SpoutChunk)c; SpoutChunk sc = (SpoutChunk)c;
short[] custids = sc.getCustomBlockIds(); short[] custids = sc.getCustomBlockIds();
if(custids != null) { if(custids != null) {
return new SpoutChunkSnapshot(ss, custids); return new SpoutChunkSnapshot(ss, custids, c.getWorld().getMaxHeight());
} }
} }
return ss; return ss;