Merge branch 'smartcmd:main' into main

1 files changed, 3 insertions, 3 deletions

diff --git a/Minecraft.World/PistonExtensionTile.cpp b/Minecraft.World/PistonExtensionTile.cpp
index 25c5adb9..bf5e6e60 100644
--- a/Minecraft.World/PistonExtensionTile.cpp
+++ b/Minecraft.World/PistonExtensionTile.cpp
@@ -7,7 +7,7 @@
 PistonExtensionTile::PistonExtensionTile(int id) : Tile(id, Material::piston,isSolidRender() )
 {
 	// 4J added initialiser
-	overrideTopTexture = NULL;
+	overrideTopTexture = nullptr;
 
 	setSoundType(SOUND_STONE);
 	setDestroyTime(0.5f);
@@ -20,7 +20,7 @@ void PistonExtensionTile::setOverrideTopTexture(Icon *overrideTopTexture)
 
 void PistonExtensionTile::clearOverrideTopTexture()
 {
-	this->overrideTopTexture = NULL;
+	this->overrideTopTexture = nullptr;
 }
 
 void PistonExtensionTile::playerWillDestroy(Level *level, int x, int y, int z, int data, shared_ptr<Player> player)
@@ -65,7 +65,7 @@ Icon *PistonExtensionTile::getTexture(int face, int data)
 
 	if (face == facing)
 	{
-		if (overrideTopTexture != NULL)
+		if (overrideTopTexture != nullptr)
 		{
 			return overrideTopTexture;
 		}