aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/BoundingBox.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/BoundingBox.cpp
parent255a18fe8e9b57377975f82e2b227afe2a12eda0 (diff)
parent5a59f5d146b43811dde6a5a0245ee9875d7b5cd1 (diff)
Merge branch 'smartcmd:main' into main
Diffstat (limited to 'Minecraft.World/BoundingBox.cpp')
-rw-r--r--Minecraft.World/BoundingBox.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Minecraft.World/BoundingBox.cpp b/Minecraft.World/BoundingBox.cpp
index 74dba470..e93158f2 100644
--- a/Minecraft.World/BoundingBox.cpp
+++ b/Minecraft.World/BoundingBox.cpp
@@ -115,7 +115,7 @@ BoundingBox *BoundingBox::getIntersection(BoundingBox *other)
{
if (!intersects(other))
{
- return NULL;
+ return nullptr;
}
BoundingBox *result = new BoundingBox();
result->x0 = Math::_max(x0, other->x0);