From 52046de8abc2f167cdbc7b1245f76390296983b3 Mon Sep 17 00:00:00 2001
From: Bixilon <bixilon@bixilon.de>
Date: Thu, 22 Apr 2021 19:33:29 +0200
Subject: [PATCH] fix nether/end joining in 1.16+

---
 .../minosoft/protocol/packets/s2c/play/PacketTimeUpdate.java   | 2 +-
 src/main/java/de/bixilon/minosoft/util/chunk/LightUtil.kt      | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketTimeUpdate.java b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketTimeUpdate.java
index 04cfb47f3..6d5329e4c 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketTimeUpdate.java
+++ b/src/main/java/de/bixilon/minosoft/protocol/packets/s2c/play/PacketTimeUpdate.java
@@ -37,7 +37,7 @@ public class PacketTimeUpdate extends PlayS2CPacket {
 
     @Override
     public void log() {
-        Log.protocol(String.format("[IN] Time Update packet received. Time is now %st (total %st, moving=%s)", Math.abs(this.timeOfDay), this.worldAge, this.timeOfDay > 0));
+        Log.protocol(String.format("[IN] Time update packet received. Time is now %st (total %st, moving=%s)", Math.abs(this.timeOfDay), this.worldAge, this.timeOfDay > 0));
     }
 
     public long getWorldAge() {
diff --git a/src/main/java/de/bixilon/minosoft/util/chunk/LightUtil.kt b/src/main/java/de/bixilon/minosoft/util/chunk/LightUtil.kt
index 3a47e3729..6b674a36e 100644
--- a/src/main/java/de/bixilon/minosoft/util/chunk/LightUtil.kt
+++ b/src/main/java/de/bixilon/minosoft/util/chunk/LightUtil.kt
@@ -18,13 +18,14 @@ import de.bixilon.minosoft.data.world.light.ChunkLightAccessor
 import de.bixilon.minosoft.data.world.light.LightAccessor
 import de.bixilon.minosoft.protocol.protocol.PlayInByteBuffer
 import de.bixilon.minosoft.protocol.protocol.ProtocolVersions
+import de.bixilon.minosoft.protocol.protocol.ProtocolVersions.V_1_16
 import java.util.*
 
 object LightUtil {
 
     fun readLightPacket(buffer: PlayInByteBuffer, skyLightMask: BitSet, blockLightMask: BitSet, dimension: Dimension): LightAccessor {
         // ToDo
-        val skyLight = if (dimension.hasSkyLight) {
+        val skyLight = if (dimension.hasSkyLight || buffer.versionId > V_1_16) { // ToDo: find out version
             readLightArray(buffer, skyLightMask, dimension)
         } else {
             mutableMapOf()