aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/CraftingContainer.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/CraftingContainer.cpp
parent255a18fe8e9b57377975f82e2b227afe2a12eda0 (diff)
parent5a59f5d146b43811dde6a5a0245ee9875d7b5cd1 (diff)
Merge branch 'smartcmd:main' into main
Diffstat (limited to 'Minecraft.World/CraftingContainer.cpp')
-rw-r--r--Minecraft.World/CraftingContainer.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Minecraft.World/CraftingContainer.cpp b/Minecraft.World/CraftingContainer.cpp
index 47a11eb4..3ec1b039 100644
--- a/Minecraft.World/CraftingContainer.cpp
+++ b/Minecraft.World/CraftingContainer.cpp
@@ -58,7 +58,7 @@ bool CraftingContainer::hasCustomName()
shared_ptr<ItemInstance> CraftingContainer::removeItemNoUpdate(int slot)
{
- if ((*items)[slot] != NULL)
+ if ((*items)[slot] != nullptr)
{
shared_ptr<ItemInstance> item = (*items)[slot];
(*items)[slot] = nullptr;
@@ -69,7 +69,7 @@ shared_ptr<ItemInstance> CraftingContainer::removeItemNoUpdate(int slot)
shared_ptr<ItemInstance> CraftingContainer::removeItem(unsigned int slot, int count)
{
- if ((*items)[slot] != NULL)
+ if ((*items)[slot] != nullptr)
{
if ((*items)[slot]->count <= count)
{