Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-14 11:21:23 +01:00
Code Issues Projects Releases Wiki Activity

fix full light data is not sent (#2191)

Browse Source 
* fix full light data is not sent

* remove fullLightCache
This commit is contained in:
bea4dev 2024-06-13 21:28:36 -04:00 committed by GitHub
parent a909985d8e
commit 0f81bc31ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/net/minestom/server/instance/DynamicChunk.java
View File

@ -264,15 +264,15 @@ public class DynamicChunk extends Chunk {
return new ChunkDataPacket(chunkX, chunkZ,
new ChunkData(heightmapsNBT, data, entries),
createLightData()
createLightData(true)
);
}
@NotNull UpdateLightPacket createLightPacket() {
return new UpdateLightPacket(chunkX, chunkZ, createLightData());
return new UpdateLightPacket(chunkX, chunkZ, createLightData(false));
}
protected LightData createLightData() {
protected LightData createLightData(boolean requiredFullChunk) {
BitSet skyMask = new BitSet();
BitSet blockMask = new BitSet();
BitSet emptySkyMask = new BitSet();

43
src/main/java/net/minestom/server/instance/LightingChunk.java
View File

@ -37,8 +37,9 @@ public class LightingChunk extends DynamicChunk {
private static final ExecutorService pool = Executors.newWorkStealingPool();
private int[] occlusionMap;
final CachedPacket lightCache = new CachedPacket(this::createLightPacket);
private LightData lightData;
final CachedPacket partialLightCache = new CachedPacket(this::createLightPacket);
private LightData partialLightData;
private LightData fullLightData;
private int highestBlock;
private boolean freezeInvalidation = false;
@ -86,9 +87,10 @@ public class LightingChunk extends DynamicChunk {
);
public void invalidate() {
this.lightCache.invalidate();
this.partialLightCache.invalidate();
this.chunkCache.invalidate();
this.lightData = null;
this.partialLightData = null;
this.fullLightData = null;
}
public LightingChunk(@NotNull Instance instance, int chunkX, int chunkZ) {
@ -160,13 +162,13 @@ public class LightingChunk extends DynamicChunk {
if (doneInit && !freezeInvalidation) {
invalidateNeighborsSection(coordinate);
invalidateResendDelay();
this.lightCache.invalidate();
this.partialLightCache.invalidate();
}
}
public void sendLighting() {
if (!isLoaded()) return;
sendPacketToViewers(lightCache);
sendPacketToViewers(partialLightCache);
}
@Override
@ -235,11 +237,18 @@ public class LightingChunk extends DynamicChunk {
}
@Override
protected LightData createLightData() {
protected LightData createLightData(boolean requiredFullChunk) {
packetGenerationLock.lock();
if (lightData != null) {
packetGenerationLock.unlock();
return lightData;
if (requiredFullChunk) {
if (fullLightData != null) {
packetGenerationLock.unlock();
return fullLightData;
}
} else {
if (partialLightData != null) {
packetGenerationLock.unlock();
return partialLightData;
}
}
BitSet skyMask = new BitSet();
@ -271,14 +280,14 @@ public class LightingChunk extends DynamicChunk {
if (section.blockLight().requiresUpdate()) {
relightSection(instance, this.chunkX, index + minSection, chunkZ, LightType.BLOCK);
wasUpdatedBlock = true;
} else if (section.blockLight().requiresSend()) {
} else if (requiredFullChunk || section.blockLight().requiresSend()) {
wasUpdatedBlock = true;
}
if (section.skyLight().requiresUpdate()) {
relightSection(instance, this.chunkX, index + minSection, chunkZ, LightType.SKY);
wasUpdatedSky = true;
} else if (section.skyLight().requiresSend()) {
} else if (requiredFullChunk || section.skyLight().requiresSend()) {
wasUpdatedSky = true;
}
@ -308,13 +317,19 @@ public class LightingChunk extends DynamicChunk {
}
}
this.lightData = new LightData(skyMask, blockMask,
LightData lightData = new LightData(skyMask, blockMask,
emptySkyMask, emptyBlockMask,
skyLights, blockLights);
if (requiredFullChunk) {
this.fullLightData = lightData;
} else {
this.partialLightData = lightData;
}
packetGenerationLock.unlock();
return this.lightData;
return lightData;
}
@Override