Merge branch 'smartcmd:main' into main

1 files changed, 2 insertions, 2 deletions

diff --git a/Minecraft.World/FenceGateTile.cpp b/Minecraft.World/FenceGateTile.cpp
index a8de450e..bd1326a9 100644
--- a/Minecraft.World/FenceGateTile.cpp
+++ b/Minecraft.World/FenceGateTile.cpp
@@ -25,7 +25,7 @@ AABB *FenceGateTile::getAABB(Level *level, int x, int y, int z)
 	int data = level->getData(x, y, z);
 	if (isOpen(data))
 	{
-		return NULL;
+		return nullptr;
 	}
 	// 4J Brought forward change from 1.2.3 to fix hit box rotation
 	if (data == Direction::NORTH || data == Direction::SOUTH)
@@ -86,7 +86,7 @@ bool FenceGateTile::use(Level *level, int x, int y, int z, shared_ptr<Player> pl
 	if (soundOnly)
 	{
 		// 4J - added - just do enough to play the sound
-		level->levelEvent(player, LevelEvent::SOUND_OPEN_DOOR, x, y, z, 0);	// 4J - changed event to pass player rather than NULL as the source of the event so we can filter the broadcast properly
+		level->levelEvent(player, LevelEvent::SOUND_OPEN_DOOR, x, y, z, 0);	// 4J - changed event to pass player rather than nullptr as the source of the event so we can filter the broadcast properly
 		return false;
 	}