Merge branch 'smartcmd:main' into main

1 files changed, 6 insertions, 6 deletions

diff --git a/Minecraft.World/GameCommandPacket.cpp b/Minecraft.World/GameCommandPacket.cpp
index 98cdd312..ada5b04c 100644
--- a/Minecraft.World/GameCommandPacket.cpp
+++ b/Minecraft.World/GameCommandPacket.cpp
@@ -15,7 +15,7 @@ GameCommandPacket::GameCommandPacket(EGameCommand command, byteArray data)
 	this->data = data;
 	length = 0;
 
-	if (data.data != NULL)
+	if (data.data != nullptr)
 	{
 		length = data.length;
 
@@ -37,12 +37,12 @@ GameCommandPacket::~GameCommandPacket()
 
 void GameCommandPacket::read(DataInputStream *dis)
 {
-	command = (EGameCommand)dis->readInt();
+	command = static_cast<EGameCommand>(dis->readInt());
 	length = dis->readShort();
 
-	if (length > 0 && length < Short::MAX_VALUE)
+	if (length > 0 && length <= Short::MAX_VALUE)
 	{
-		if(data.data != NULL)
+		if(data.data != nullptr)
 		{
 			delete [] data.data;
 		}
@@ -54,8 +54,8 @@ void GameCommandPacket::read(DataInputStream *dis)
 void GameCommandPacket::write(DataOutputStream *dos)
 {
 	dos->writeInt(command);
-	dos->writeShort((short) length);
-	if (data.data != NULL)
+	dos->writeShort(static_cast<short>(length));
+	if (data.data != nullptr)
 	{
 		dos->write(data);
 	}