Upstream
/
Minestom
mirror of https://github.com/Minestom/Minestom.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

maxIndex cleanup

This commit is contained in:
themode 2022-01-07 04:40:55 +01:00 committed by TheMode
parent 29017c1d9b
commit c949bdd5ba
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/minestom/server/instance/palette/PaletteImpl.java
View File

@ -118,13 +118,12 @@ final class PaletteImpl implements Palette, Cloneable {
final int shiftedDimensionBitCount = dimensionBitCount << 1;
for (int i = 0; i < values.length; i++) {
final long value = values[i];
final int startIndex = i * valuesPerLong;
final int maxIndex = startIndex + valuesPerLong > size ? size - startIndex : valuesPerLong;
int index = i * valuesPerLong;
final int maxIndex = Math.min(index + valuesPerLong, size);
if (value == 0) {
// No values in this long, skip
if (consumeEmpty) {
for (int j = 0; j < maxIndex; j++) {
final int index = startIndex + j;
for (; index < maxIndex; index++) {
final int y = index >> shiftedDimensionBitCount;
final int z = index >> dimensionBitCount & dimensionMinus;
final int x = index & dimensionMinus;
@ -133,9 +132,8 @@ final class PaletteImpl implements Palette, Cloneable {
}
continue;
}
for (int j = 0; j < maxIndex; j++) {
final int index = startIndex + j;
final int bitIndex = j * bitsPerEntry;
int bitIndex = 0;
for (; index < maxIndex; index++) {
final short paletteIndex = (short) (value >> bitIndex & magicMask);
if (paletteIndex != 0 || consumeEmpty) {
final int result = ids != null ? ids[paletteIndex] : paletteIndex;
@ -144,6 +142,7 @@ final class PaletteImpl implements Palette, Cloneable {
final int x = index & dimensionMinus;
consumer.accept(x, y, z, result);
}
bitIndex += bitsPerEntry;
}
}
}