Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2024-09-29 15:07:36 +02:00
Code Issues Projects Releases Wiki Activity

Reduce lighting issues

Browse Source
This commit is contained in:
TheMode 2021-06-23 15:52:27 +02:00
parent 1ae057428b
commit 33300e978c
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/net/minestom/server/instance/Chunk.java
View File

@ -265,12 +265,9 @@ public abstract class Chunk implements BlockGetter, BlockSetter, Viewable, Ticka
public UpdateLightPacket getLightPacket() { public UpdateLightPacket getLightPacket() {
long skyMask = 0; long skyMask = 0;
long blockMask = 0; long blockMask = 0;
long emptySkyMask = 0;
long emptyBlockMask = 0;
List<byte[]> skyLights = new ArrayList<>(); List<byte[]> skyLights = new ArrayList<>();
List<byte[]> blockLights = new ArrayList<>(); List<byte[]> blockLights = new ArrayList<>();
UpdateLightPacket updateLightPacket = new UpdateLightPacket(getIdentifier(), getLastChangeTime()); UpdateLightPacket updateLightPacket = new UpdateLightPacket(getIdentifier(), getLastChangeTime());
updateLightPacket.chunkX = getChunkX(); updateLightPacket.chunkX = getChunkX();
updateLightPacket.chunkZ = getChunkZ(); updateLightPacket.chunkZ = getChunkZ();
@ -278,11 +275,6 @@ public abstract class Chunk implements BlockGetter, BlockSetter, Viewable, Ticka
updateLightPacket.skyLight = skyLights; updateLightPacket.skyLight = skyLights;
updateLightPacket.blockLight = blockLights; updateLightPacket.blockLight = blockLights;
emptySkyMask |= 1L << 0;
emptyBlockMask |= 1L << 0;
emptySkyMask |= 1L << 17;
emptyBlockMask |= 1L << 17;
final var sections = getSections(); final var sections = getSections();
for (var entry : sections.entrySet()) { for (var entry : sections.entrySet()) {
final int index = entry.getKey() + 1; final int index = entry.getKey() + 1;
@ -294,23 +286,17 @@ public abstract class Chunk implements BlockGetter, BlockSetter, Viewable, Ticka
if (!ArrayUtils.empty(skyLight)) { if (!ArrayUtils.empty(skyLight)) {
skyLights.add(skyLight); skyLights.add(skyLight);
skyMask |= 1L << index; skyMask |= 1L << index;
} else {
emptySkyMask |= 1L << index;
} }
if (!ArrayUtils.empty(blockLight)) { if (!ArrayUtils.empty(blockLight)) {
blockLights.add(blockLight); blockLights.add(blockLight);
blockMask |= 1L << index; blockMask |= 1L << index;
} else {
emptyBlockMask |= 1L << index;
} }
} }
updateLightPacket.skyLightMask = new long[]{skyMask}; updateLightPacket.skyLightMask = new long[]{skyMask};
updateLightPacket.blockLightMask = new long[]{blockMask}; updateLightPacket.blockLightMask = new long[]{blockMask};
updateLightPacket.emptySkyLightMask = new long[]{emptySkyMask}; updateLightPacket.emptySkyLightMask = new long[0];
updateLightPacket.emptyBlockLightMask = new long[]{emptyBlockMask}; updateLightPacket.emptyBlockLightMask = new long[0];
return updateLightPacket; return updateLightPacket;
} }