Merge branch 'smartcmd:main' into main

1 files changed, 2 insertions, 2 deletions

diff --git a/Minecraft.World/ButtonTile.cpp b/Minecraft.World/ButtonTile.cpp
index 045d5597..b05d597d 100644
--- a/Minecraft.World/ButtonTile.cpp
+++ b/Minecraft.World/ButtonTile.cpp
@@ -21,7 +21,7 @@ Icon *ButtonTile::getTexture(int face, int data)
 
 AABB *ButtonTile::getAABB(Level *level, int x, int y, int z)
 {
-	return NULL;
+	return nullptr;
 }
 
 int ButtonTile::getTickDelay(Level *level)
@@ -302,7 +302,7 @@ void ButtonTile::checkPressed(Level *level, int x, int y, int z)
 	bool shouldBePressed;
 
 	updateShape(data);
-	Tile::ThreadStorage *tls = (Tile::ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
+	Tile::ThreadStorage *tls = static_cast<Tile::ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
 	vector<shared_ptr<Entity> > *entities = level->getEntitiesOfClass(typeid(Arrow), AABB::newTemp(x + tls->xx0, y + tls->yy0, z + tls->zz0, x + tls->xx1, y + tls->yy1, z + tls->zz1));
 	shouldBePressed = !entities->empty();
 	delete entities;