aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/FireworksChargeItem.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/FireworksChargeItem.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/FireworksChargeItem.cpp')
-rw-r--r--Minecraft.World/FireworksChargeItem.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/FireworksChargeItem.cpp b/Minecraft.World/FireworksChargeItem.cpp
index 2de2be04..8b12c98c 100644
--- a/Minecraft.World/FireworksChargeItem.cpp
+++ b/Minecraft.World/FireworksChargeItem.cpp
@@ -21,9 +21,9 @@ int FireworksChargeItem::getColor(shared_ptr<ItemInstance> item, int spriteLayer
if (spriteLayer == 1)
{
Tag *colorTag = getExplosionTagField(item, FireworksItem::TAG_E_COLORS);
- if (colorTag != NULL)
+ if (colorTag != nullptr)
{
- IntArrayTag *colors = (IntArrayTag *) colorTag;
+ IntArrayTag *colors = static_cast<IntArrayTag *>(colorTag);
if (colors->data.length == 1)
{
return colors->data[0];
@@ -58,12 +58,12 @@ Tag *FireworksChargeItem::getExplosionTagField(shared_ptr<ItemInstance> instance
if (instance->hasTag())
{
CompoundTag *explosion = instance->getTag()->getCompound(FireworksItem::TAG_EXPLOSION);
- if (explosion != NULL)
+ if (explosion != nullptr)
{
return explosion->get(field);
}
}
- return NULL;
+ return nullptr;
}
void FireworksChargeItem::appendHoverText(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, vector<HtmlString> *lines, bool advanced)
@@ -71,7 +71,7 @@ void FireworksChargeItem::appendHoverText(shared_ptr<ItemInstance> itemInstance,
if (itemInstance->hasTag())
{
CompoundTag *explosion = itemInstance->getTag()->getCompound(FireworksItem::TAG_EXPLOSION);
- if (explosion != NULL)
+ if (explosion != nullptr)
{
appendHoverText(explosion, lines);
}