diff options
| author | ModMaker101 <119018978+ModMaker101@users.noreply.github.com> | 2026-03-08 19:08:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-08 18:08:36 -0500 |
| commit | 28614b922fb77149a54da1a87bebfbc98736f296 (patch) | |
| tree | 7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.World/FireworksItem.cpp | |
| parent | 88798b501d0cf6287b6f87acb2592676e3cec58d (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/FireworksItem.cpp')
| -rw-r--r-- | Minecraft.World/FireworksItem.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Minecraft.World/FireworksItem.cpp b/Minecraft.World/FireworksItem.cpp index f81b4588..f1cdf309 100644 --- a/Minecraft.World/FireworksItem.cpp +++ b/Minecraft.World/FireworksItem.cpp @@ -26,7 +26,7 @@ bool FireworksItem::useOn(shared_ptr<ItemInstance> instance, shared_ptr<Player> if (!level->isClientSide) { - shared_ptr<FireworksRocketEntity> f = shared_ptr<FireworksRocketEntity>( new FireworksRocketEntity(level, x + clickX, y + clickY, z + clickZ, instance) ); + shared_ptr<FireworksRocketEntity> f(new FireworksRocketEntity(level, x + clickX, y + clickY, z + clickZ, instance)); level->addEntity(f); if (!player->abilities.instabuild) @@ -46,7 +46,7 @@ void FireworksItem::appendHoverText(shared_ptr<ItemInstance> itemInstance, share return; } CompoundTag *fireTag = itemInstance->getTag()->getCompound(TAG_FIREWORKS); - if (fireTag == NULL) + if (fireTag == nullptr) { return; } @@ -56,7 +56,7 @@ void FireworksItem::appendHoverText(shared_ptr<ItemInstance> itemInstance, share } ListTag<CompoundTag> *explosions = (ListTag<CompoundTag> *) fireTag->getList(TAG_EXPLOSIONS); - if (explosions != NULL && explosions->size() > 0) + if (explosions != nullptr && explosions->size() > 0) { for (int i = 0; i < explosions->size(); i++) @@ -69,7 +69,7 @@ void FireworksItem::appendHoverText(shared_ptr<ItemInstance> itemInstance, share if (eLines.size() > 0) { // Indent lines after first line - for (int i = 1; i < eLines.size(); i++) + for (size_t i = 1; i < eLines.size(); i++) { eLines[i].indent = true; } |
