aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/WaterLilyTileItem.cpp
diff options
context:
space:
mode:
authorqwasdrizzel <145519042+qwasdrizzel@users.noreply.github.com>2026-03-16 21:44:26 -0500
committerGitHub <noreply@github.com>2026-03-16 21:44:26 -0500
commitce739f6045ec72127491286ea3f3f21e537c1b55 (patch)
treef33bd42a47c1b4a7b2153a7fb77127ee3b407db9 /Minecraft.World/WaterLilyTileItem.cpp
parent255a18fe8e9b57377975f82e2b227afe2a12eda0 (diff)
parent5a59f5d146b43811dde6a5a0245ee9875d7b5cd1 (diff)
Merge branch 'smartcmd:main' into main
Diffstat (limited to 'Minecraft.World/WaterLilyTileItem.cpp')
-rw-r--r--Minecraft.World/WaterLilyTileItem.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Minecraft.World/WaterLilyTileItem.cpp b/Minecraft.World/WaterLilyTileItem.cpp
index fe523c05..978a611f 100644
--- a/Minecraft.World/WaterLilyTileItem.cpp
+++ b/Minecraft.World/WaterLilyTileItem.cpp
@@ -13,7 +13,7 @@ WaterLilyTileItem::WaterLilyTileItem(int id) : ColoredTileItem(id, false)
bool WaterLilyTileItem::TestUse(shared_ptr<ItemInstance> itemInstance, Level *level, shared_ptr<Player> player)
{
HitResult *hr = getPlayerPOVHitResult(level, player, true);
- if (hr == NULL) return false;
+ if (hr == nullptr) return false;
if (hr->type == HitResult::TILE)
{
@@ -47,7 +47,7 @@ bool WaterLilyTileItem::TestUse(shared_ptr<ItemInstance> itemInstance, Level *le
shared_ptr<ItemInstance> WaterLilyTileItem::use(shared_ptr<ItemInstance> itemInstance, Level *level, shared_ptr<Player> player)
{
HitResult *hr = getPlayerPOVHitResult(level, player, true);
- if (hr == NULL) return itemInstance;
+ if (hr == nullptr) return itemInstance;
if (hr->type == HitResult::TILE)
{