aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/DyePowderItem.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/DyePowderItem.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/DyePowderItem.cpp')
-rw-r--r--Minecraft.World/DyePowderItem.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/Minecraft.World/DyePowderItem.cpp b/Minecraft.World/DyePowderItem.cpp
index b4ab86fa..3392da98 100644
--- a/Minecraft.World/DyePowderItem.cpp
+++ b/Minecraft.World/DyePowderItem.cpp
@@ -18,7 +18,7 @@ DyePowderItem::DyePowderItem(int id) : Item( id )
{
setStackedByData(true);
setMaxDamage(0);
- icons = NULL;
+ icons = nullptr;
}
const unsigned int DyePowderItem::COLOR_DESCS[] =
@@ -177,7 +177,7 @@ bool DyePowderItem::growCrop(shared_ptr<ItemInstance> itemInstance, Level *level
{
if (!level->isClientSide)
{
- if (level->random->nextFloat() < 0.45) ((Sapling *) Tile::sapling)->advanceTree(level, x, y, z, level->random);
+ if (level->random->nextFloat() < 0.45) static_cast<Sapling *>(Tile::sapling)->advanceTree(level, x, y, z, level->random);
itemInstance->count--;
}
}
@@ -189,7 +189,7 @@ bool DyePowderItem::growCrop(shared_ptr<ItemInstance> itemInstance, Level *level
{
if (!level->isClientSide)
{
- if (level->random->nextFloat() < 0.4) ((Mushroom *) Tile::tiles[tile])->growTree(level, x, y, z, level->random);
+ if (level->random->nextFloat() < 0.4) static_cast<Mushroom *>(Tile::tiles[tile])->growTree(level, x, y, z, level->random);
itemInstance->count--;
}
}
@@ -202,7 +202,7 @@ bool DyePowderItem::growCrop(shared_ptr<ItemInstance> itemInstance, Level *level
{
if (!level->isClientSide)
{
- ((StemTile *) Tile::tiles[tile])->growCrops(level, x, y, z);
+ static_cast<StemTile *>(Tile::tiles[tile])->growCrops(level, x, y, z);
itemInstance->count--;
}
}
@@ -215,7 +215,7 @@ bool DyePowderItem::growCrop(shared_ptr<ItemInstance> itemInstance, Level *level
{
if (!level->isClientSide)
{
- ((CropTile *) Tile::tiles[tile])->growCrops(level, x, y, z);
+ static_cast<CropTile *>(Tile::tiles[tile])->growCrops(level, x, y, z);
itemInstance->count--;
}
}
@@ -228,7 +228,7 @@ bool DyePowderItem::growCrop(shared_ptr<ItemInstance> itemInstance, Level *level
{
if (!level->isClientSide)
{
- ((CropTile *) Tile::tiles[tile])->growCrops(level, x, y, z);
+ static_cast<CropTile *>(Tile::tiles[tile])->growCrops(level, x, y, z);
itemInstance->count--;
}
}
@@ -306,9 +306,9 @@ void DyePowderItem::addGrowthParticles(Level *level, int x, int y, int z, int co
{
int id = level->getTile(x, y, z);
if (count == 0) count = 15;
- Tile *tile = id > 0 && id < Tile::TILE_NUM_COUNT ? Tile::tiles[id] : NULL;
+ Tile *tile = id > 0 && id < Tile::TILE_NUM_COUNT ? Tile::tiles[id] : nullptr;
- if (tile == NULL) return;
+ if (tile == nullptr) return;
tile->updateShape(level, x, y, z);
for (int i = 0; i < count; i++)
@@ -322,7 +322,7 @@ void DyePowderItem::addGrowthParticles(Level *level, int x, int y, int z, int co
bool DyePowderItem::interactEnemy(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, shared_ptr<LivingEntity> mob)
{
- if (dynamic_pointer_cast<Sheep>( mob ) != NULL)
+ if (dynamic_pointer_cast<Sheep>( mob ) != nullptr)
{
shared_ptr<Sheep> sheep = dynamic_pointer_cast<Sheep>(mob);
// convert to tile-based color value (0 is white instead of black)