Upstream/FastAsyncWorldedit
1
0
Fork 0
mirror of https://github.com/boy0001/FastAsyncWorldedit.git synced 2024-11-25 03:55:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix combine stages getPrevious

Browse Source
This commit is contained in:
Jesse Boyd 2017-01-03 07:10:09 +11:00
parent 75b0d5512c
commit 70812e78c8
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitChunk_1_11_Copy.java
View File

@ -42,10 +42,10 @@ public class BukkitChunk_1_11_Copy extends BukkitChunk_1_11 {
this.ids[i] = combined = new char[4096]; this.ids[i] = combined = new char[4096];
for (int j = 0, k = 0; j < 2048; j++, k += 2) { for (int j = 0, k = 0; j < 2048; j++, k += 2) {
combined[k] = (char) ((idsBytesArray[k] << 4) + (datasBytesArray[j] & 15)); combined[k] = (char) (((idsBytesArray[k] & 0xFF) << 4) + (datasBytesArray[j] & 15));
} }
for (int j = 0, k = 1; j < 2048; j++, k += 2) { for (int j = 0, k = 1; j < 2048; j++, k += 2) {
combined[k] = (char) ((idsBytesArray[k] << 4) + (datasBytesArray[j] >> 4)); combined[k] = (char) (((idsBytesArray[k] & 0xFF) << 4) + ((datasBytesArray[j] >> 4) & 15));
} }
return combined; return combined;
} }

2
bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java
View File

@ -573,7 +573,7 @@ public class BukkitQueue_1_11 extends BukkitQueue_0<Chunk, ChunkSection[], Chunk
} }
int x = ((int) Math.round(ent.locX) & 15); int x = ((int) Math.round(ent.locX) & 15);
int z = ((int) Math.round(ent.locZ) & 15); int z = ((int) Math.round(ent.locZ) & 15);
int y = (int) Math.round(ent.locY); int y = ((int) Math.round(ent.locY) & 0xFF);
int i = FaweCache.CACHE_I[y][z][x]; int i = FaweCache.CACHE_I[y][z][x];
char[] array = fs.getIdArray(i); char[] array = fs.getIdArray(i);
if (array == null) { if (array == null) {

2
bukkit/src/main/java/com/boydti/fawe/bukkit/v1_7/BukkitQueue17.java
View File

@ -271,7 +271,7 @@ public class BukkitQueue17 extends BukkitQueue_0<Chunk, ChunkSection[], ChunkSec
} }
int x = ((int) Math.round(ent.locX) & 15); int x = ((int) Math.round(ent.locX) & 15);
int z = ((int) Math.round(ent.locZ) & 15); int z = ((int) Math.round(ent.locZ) & 15);
int y = (int) Math.round(ent.locY); int y = ((int) Math.round(ent.locY) & 0xFF);
int i = FaweCache.CACHE_I[y][z][x]; int i = FaweCache.CACHE_I[y][z][x];
char[] array = fs.getIdArray(i); char[] array = fs.getIdArray(i);
if (array == null) { if (array == null) {

2
bukkit/src/main/java/com/boydti/fawe/bukkit/v1_8/BukkitQueue18R3.java
View File

@ -271,7 +271,7 @@ public class BukkitQueue18R3 extends BukkitQueue_0<Chunk, ChunkSection[], ChunkS
} }
int x = ((int) Math.round(ent.locX) & 15); int x = ((int) Math.round(ent.locX) & 15);
int z = ((int) Math.round(ent.locZ) & 15); int z = ((int) Math.round(ent.locZ) & 15);
int y = (int) Math.round(ent.locY); int y = ((int) Math.round(ent.locY) & 0xFF);
int i = FaweCache.CACHE_I[y][z][x]; int i = FaweCache.CACHE_I[y][z][x];
char[] array = fs.getIdArray(i); char[] array = fs.getIdArray(i);
if (array == null) { if (array == null) {

2
bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
View File

@ -533,7 +533,7 @@ public class BukkitQueue_1_9_R1 extends BukkitQueue_0<Chunk, ChunkSection[], Chu
} }
int x = ((int) Math.round(ent.locX) & 15); int x = ((int) Math.round(ent.locX) & 15);
int z = ((int) Math.round(ent.locZ) & 15); int z = ((int) Math.round(ent.locZ) & 15);
int y = (int) Math.round(ent.locY); int y = ((int) Math.round(ent.locY) & 0xFF);
int i = FaweCache.CACHE_I[y][z][x]; int i = FaweCache.CACHE_I[y][z][x];
char[] array = fs.getIdArray(i); char[] array = fs.getIdArray(i);
if (array == null) { if (array == null) {