aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/VineTile.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.World/VineTile.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides * Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.World/VineTile.cpp')
-rw-r--r--Minecraft.World/VineTile.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Minecraft.World/VineTile.cpp b/Minecraft.World/VineTile.cpp
index 25600cbd..8f16a921 100644
--- a/Minecraft.World/VineTile.cpp
+++ b/Minecraft.World/VineTile.cpp
@@ -102,7 +102,7 @@ void VineTile::updateShape(LevelSource *level, int x, int y, int z, int forceDat
AABB *VineTile::getAABB(Level *level, int x, int y, int z)
{
- return NULL;
+ return nullptr;
}
bool VineTile::mayPlace(Level *level, int x, int y, int z, int face)
@@ -259,7 +259,7 @@ testLoop: if(noSideSpread) break;
int edgeTile = level->getTile(x + Direction::STEP_X[testDirection], y, z + Direction::STEP_Z[testDirection]);
- if (edgeTile == 0 || Tile::tiles[edgeTile] == NULL)
+ if (edgeTile == 0 || Tile::tiles[edgeTile] == nullptr)
{
// if the edge tile is air, we could possibly cling
// to something
@@ -371,7 +371,7 @@ int VineTile::getResourceCount(Random *random)
void VineTile::playerDestroy(Level *level, shared_ptr<Player>player, int x, int y, int z, int data)
{
- if (!level->isClientSide && player->getSelectedItem() != NULL && player->getSelectedItem()->id == Item::shears->id)
+ if (!level->isClientSide && player->getSelectedItem() != nullptr && player->getSelectedItem()->id == Item::shears->id)
{
player->awardStat(
GenericStats::blocksMined(id),
@@ -379,7 +379,7 @@ void VineTile::playerDestroy(Level *level, shared_ptr<Player>player, int x, int
);
// drop leaf block instead of sapling
- popResource(level, x, y, z, shared_ptr<ItemInstance>(new ItemInstance(Tile::vine, 1, 0)));
+ popResource(level, x, y, z, std::make_shared<ItemInstance>(Tile::vine, 1, 0));
}
else
{