Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #357

Browse Source
This commit is contained in:
Jesse Boyd 2016-12-03 13:41:23 +11:00
parent 6b0c2b9ef9
commit 24d61c2ceb
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/main/java/com/boydti/fawe/object/clipboard/CPUOptimizedClipboard.java
View File

@ -61,12 +61,13 @@ public class CPUOptimizedClipboard extends FaweClipboard {
}
public int getId(int index) {
if (add != null) {
return ids[index] & 0xFF + add[index] & 0xFF;
}
return ids[index] & 0xFF;
}
public int getAdd(int index) {
return add[index] & 0xFF;
}
public int getData(int index) {
return datas[index];
}
@ -128,6 +129,9 @@ public class CPUOptimizedClipboard extends FaweClipboard {
public BaseBlock getBlock(int index) {
int id = getId(index);
if (add != null) {
id += getAdd(index) << 8;
}
if (id == 0) {
return FaweCache.CACHE_BLOCK[0];
}
@ -178,8 +182,12 @@ public class CPUOptimizedClipboard extends FaweClipboard {
}
public boolean setBlock(int index, BaseBlock block) {
setId(index, (byte) block.getId());
setData(index, (byte) block.getData());
int id = block.getId();
setId(index, id);
setData(index, block.getData());
if (id >= 256) {
setAdd(index, (id >> 8));
}
CompoundTag tile = block.getNbtData();
if (tile != null) {
nbtMapIndex.put(index, tile);

23
core/src/main/java/com/boydti/fawe/object/clipboard/MemoryOptimizedClipboard.java
View File

@ -94,11 +94,7 @@ public class MemoryOptimizedClipboard extends FaweClipboard {
if (lastIds == null) {
return 0;
}
if (add == null) {
return lastIds[index & BLOCK_MASK] & 0xFF;
} else {
return lastIds[index & BLOCK_MASK] & 0xFF + getAdd(index);
}
return lastIds[index & BLOCK_MASK] & 0xFF;
}
saveIds();
byte[] compressed = ids[lastIdsI = i];
@ -107,11 +103,7 @@ public class MemoryOptimizedClipboard extends FaweClipboard {
return 0;
}
lastIds = MainUtil.decompress(compressed, lastIds, BLOCK_SIZE, compressionLevel);
if (add == null) {
return lastIds[index & BLOCK_MASK] & 0xFF;
} else {
return lastIds[index & BLOCK_MASK] & 0xFF + getAdd(index);
}
return lastIds[index & BLOCK_MASK] & 0xFF;
}
int saves = 0;
@ -301,6 +293,9 @@ public class MemoryOptimizedClipboard extends FaweClipboard {
public BaseBlock getBlock(int index) {
int id = getId(index);
if (add != null) {
id += getAdd(index) << 8;
}
if (id == 0) {
return FaweCache.CACHE_BLOCK[0];
}
@ -369,8 +364,12 @@ public class MemoryOptimizedClipboard extends FaweClipboard {
}
public boolean setBlock(int index, BaseBlock block) {
setId(index, (byte) block.getId());
setData(index, (byte) block.getData());
int id = block.getId();
setId(index, id);
if (id >= 256) {
setAdd(index, (id >> 8));
}
setData(index, block.getData());
CompoundTag tile = block.getNbtData();
if (tile != null) {
nbtMapIndex.put(index, tile);