Merge branch 'smartcmd:main' into main

1 files changed, 16 insertions, 14 deletions

diff --git a/Minecraft.World/ExplodePacket.cpp b/Minecraft.World/ExplodePacket.cpp
index 30d09e46..88bf00c6 100644
--- a/Minecraft.World/ExplodePacket.cpp
+++ b/Minecraft.World/ExplodePacket.cpp
@@ -34,9 +34,9 @@ ExplodePacket::ExplodePacket(double x, double y, double z, float r, unordered_se
 
 	if (knockback != nullptr)
 	{
-		knockbackX = (float) knockback->x;
-		knockbackY = (float) knockback->y;
-		knockbackZ = (float) knockback->z;
+		knockbackX = static_cast<float>(knockback->x);
+		knockbackY = static_cast<float>(knockback->y);
+		knockbackZ = static_cast<float>(knockback->z);
 	}
 }
 
@@ -52,14 +52,16 @@ void ExplodePacket::read(DataInputStream *dis) //throws IOException
 		r = dis->readFloat();
 		int count = dis->readInt();
 
-		int xp = (int)x;
-		int yp = (int)y;
-		int zp = (int)z;
+		if (count < 0 || count > 32768) count = 0;
+
+		int xp = static_cast<int>(x);
+		int yp = static_cast<int>(y);
+		int zp = static_cast<int>(z);
 		for (int i=0; i<count; i++) 
 		{
-			int xx = ((signed char)dis->readByte())+xp;
-			int yy = ((signed char)dis->readByte())+yp;
-			int zz = ((signed char)dis->readByte())+zp;
+			int xx = static_cast<signed char>(dis->readByte())+xp;
+			int yy = static_cast<signed char>(dis->readByte())+yp;
+			int zz = static_cast<signed char>(dis->readByte())+zp;
 			toBlow.push_back( TilePos(xx, yy, zz) );
 		}
 	}
@@ -79,11 +81,11 @@ void ExplodePacket::write(DataOutputStream *dos) //throws IOException
 		dos->writeDouble(y);
 		dos->writeDouble(z);
 		dos->writeFloat(r);
-		dos->writeInt((int)toBlow.size());
+		dos->writeInt(static_cast<int>(toBlow.size()));
 
-		int xp = (int)x;
-		int yp = (int)y;
-		int zp = (int)z;
+		int xp = static_cast<int>(x);
+		int yp = static_cast<int>(y);
+		int zp = static_cast<int>(z);
 
 		for ( const TilePos& tp : toBlow )
 		{
@@ -108,7 +110,7 @@ void ExplodePacket::handle(PacketListener *listener)
 
 int ExplodePacket::getEstimatedSize() 
 {
-	return 8*3+4+4+(int)toBlow.size()*3+12;
+	return 8*3+4+4+static_cast<int>(toBlow.size())*3+12;
 }
 
 float ExplodePacket::getKnockbackX()