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

Fix 1.7 get id

Browse Source
This commit is contained in:
Jesse Boyd 2017-04-10 22:40:49 +10:00
parent eef3eff310
commit bd6eb2b7b8
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,7 +234,7 @@ public class BukkitQueue17 extends BukkitQueue_0<net.minecraft.server.v1_7_R4.Ch
byte[] ids = ls.getIdArray(); byte[] ids = ls.getIdArray();
NibbleArray datasNibble = ls.getDataArray(); NibbleArray datasNibble = ls.getDataArray();
int i = FaweCache.CACHE_J[y & 15][z & 15][x & 15]; int i = FaweCache.CACHE_J[y & 15][z & 15][x & 15];
int combined = (ids[i] << 4) + (datasNibble == null ? 0 : datasNibble.a(x & 15, y & 15, z & 15)); int combined = ((ids[i] & 0xFF) << 4) + (datasNibble == null ? 0 : datasNibble.a(x & 15, y & 15, z & 15));
return combined; return combined;
} }

2
forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java
View File

@ -163,7 +163,7 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
byte[] ids = ls.getBlockLSBArray(); byte[] ids = ls.getBlockLSBArray();
NibbleArray datasNibble = ls.getBlockMSBArray(); NibbleArray datasNibble = ls.getBlockMSBArray();
int i = FaweCache.CACHE_J[y & 15][z & 15][x & 15]; int i = FaweCache.CACHE_J[y & 15][z & 15][x & 15];
int combined = (ids[i] << 4) + (datasNibble == null ? 0 : datasNibble.get(x & 15, y & 15, z & 15)); int combined = ((ids[i] & 0xFF) << 4) + (datasNibble == null ? 0 : datasNibble.get(x & 15, y & 15, z & 15));
return combined; return combined;
} }