Merge branch 'smartcmd:main' into main

1 files changed, 8 insertions, 8 deletions

diff --git a/Minecraft.World/TamableAnimal.cpp b/Minecraft.World/TamableAnimal.cpp
index 2a3ea037..1fb41df3 100644
--- a/Minecraft.World/TamableAnimal.cpp
+++ b/Minecraft.World/TamableAnimal.cpp
@@ -13,13 +13,13 @@ TamableAnimal::TamableAnimal(Level *level) : Animal(level)
 
 TamableAnimal::~TamableAnimal()
 {
-	if(sitGoal != NULL) delete sitGoal;
+	if(sitGoal != nullptr) delete sitGoal;
 }
 
 void TamableAnimal::defineSynchedData()
 {
 	Animal::defineSynchedData();
-	entityData->define(DATA_FLAGS_ID, (byte) 0);
+	entityData->define(DATA_FLAGS_ID, static_cast<byte>(0));
 	entityData->define(DATA_OWNERUUID_ID, L"");
 }
 
@@ -113,11 +113,11 @@ void TamableAnimal::setTame(bool value)
 	byte current = entityData->getByte(DATA_FLAGS_ID);
 	if (value)
 	{
-		entityData->set(DATA_FLAGS_ID, (byte) (current | 0x04));
+		entityData->set(DATA_FLAGS_ID, static_cast<byte>(current | 0x04));
 	}
 	else
 	{
-		entityData->set(DATA_FLAGS_ID, (byte) (current & ~0x04));
+		entityData->set(DATA_FLAGS_ID, static_cast<byte>(current & ~0x04));
 	}
 }
 
@@ -131,11 +131,11 @@ void TamableAnimal::setSitting(bool value)
 	byte current = entityData->getByte(DATA_FLAGS_ID);
 	if (value)
 	{
-		entityData->set(DATA_FLAGS_ID, (byte) (current | 0x01));
+		entityData->set(DATA_FLAGS_ID, static_cast<byte>(current | 0x01));
 	}
 	else
 	{
-		entityData->set(DATA_FLAGS_ID, (byte) (current & ~0x01));
+		entityData->set(DATA_FLAGS_ID, static_cast<byte>(current & ~0x01));
 	}
 }
 
@@ -169,7 +169,7 @@ Team *TamableAnimal::getTeam()
 	if (isTame())
 	{
 		shared_ptr<LivingEntity> owner = dynamic_pointer_cast<LivingEntity>(getOwner());
-		if (owner != NULL)
+		if (owner != nullptr)
 		{
 			return owner->getTeam();
 		}
@@ -186,7 +186,7 @@ bool TamableAnimal::isAlliedTo(shared_ptr<LivingEntity> other)
 		{
 			return true;
 		}
-		if (owner != NULL)
+		if (owner != nullptr)
 		{
 			return owner->isAlliedTo(other);
 		}