Merge branch 'smartcmd:main' into main

1 files changed, 2 insertions, 2 deletions

diff --git a/Minecraft.World/MinecartRideable.cpp b/Minecraft.World/MinecartRideable.cpp
index a006a2bc..5578fe3f 100644
--- a/Minecraft.World/MinecartRideable.cpp
+++ b/Minecraft.World/MinecartRideable.cpp
@@ -23,8 +23,8 @@ MinecartRideable::MinecartRideable(Level *level, double x, double y, double z) :
 
 bool MinecartRideable::interact(shared_ptr<Player> player)
 {
-	if (rider.lock() != NULL && rider.lock()->instanceof(eTYPE_PLAYER) && rider.lock() != player) return true;
-	if (rider.lock() != NULL && rider.lock() != player) return false;
+	if (rider.lock() != nullptr && rider.lock()->instanceof(eTYPE_PLAYER) && rider.lock() != player) return true;
+	if (rider.lock() != nullptr && rider.lock() != player) return false;
 	if (!level->isClientSide)
 	{
 		player->ride(shared_from_this());