Merge branch 'smartcmd:main' into main

1 files changed, 4 insertions, 4 deletions

diff --git a/Minecraft.World/DataLayer.cpp b/Minecraft.World/DataLayer.cpp
index a5e7d088..f3916320 100644
--- a/Minecraft.World/DataLayer.cpp
+++ b/Minecraft.World/DataLayer.cpp
@@ -40,21 +40,21 @@ void DataLayer::set(int x, int y, int z, int val)
 
     if (part == 0)
 	{
-        data[slot] = (byte) ((data[slot] & 0xf0) | (val & 0xf));
+        data[slot] = static_cast<byte>((data[slot] & 0xf0) | (val & 0xf));
     } else
 	{
-        data[slot] = (byte) ((data[slot] & 0x0f) | ((val & 0xf) << 4));
+        data[slot] = static_cast<byte>((data[slot] & 0x0f) | ((val & 0xf) << 4));
     }
 }
 
 bool DataLayer::isValid()
 {
-	return data.data != NULL;
+	return data.data != nullptr;
 }
 
 void DataLayer::setAll(int br)
 {
-    byte val = (byte) (br & (br << 4));
+    byte val = static_cast<byte>(br & (br << 4));
     for (unsigned int i = 0; i < data.length; i++)
 	{
         data[i] = val;