Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Project modernization (#630)

Browse Source 
* 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
This commit is contained in:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Minecraft.World/FireworksChargeItem.cpp
View File

@@ -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);
}