aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/FireworksMenu.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/FireworksMenu.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/FireworksMenu.cpp')
-rw-r--r--Minecraft.World/FireworksMenu.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/FireworksMenu.cpp b/Minecraft.World/FireworksMenu.cpp
index 68c9e0f2..cd9196af 100644
--- a/Minecraft.World/FireworksMenu.cpp
+++ b/Minecraft.World/FireworksMenu.cpp
@@ -15,8 +15,8 @@ FireworksMenu::FireworksMenu(shared_ptr<Inventory> inventory, Level *level, int
m_canMakeCharge = false;
m_canMakeFade = false;
- craftSlots = shared_ptr<CraftingContainer>( new CraftingContainer(this, 3, 3) );
- resultSlots = shared_ptr<ResultContainer>( new ResultContainer() );
+ craftSlots = std::make_shared<CraftingContainer>(this, 3, 3);
+ resultSlots = std::make_shared<ResultContainer>();
this->level = level;
x = xt;
@@ -61,7 +61,7 @@ void FireworksMenu::removed(shared_ptr<Player> player)
for (int i = 0; i < 9; i++)
{
shared_ptr<ItemInstance> item = craftSlots->removeItemNoUpdate(i);
- if (item != NULL)
+ if (item != nullptr)
{
player->drop(item);
}
@@ -77,7 +77,7 @@ shared_ptr<ItemInstance> FireworksMenu::quickMoveStack(shared_ptr<Player> player
{
shared_ptr<ItemInstance> clicked = nullptr;
Slot *slot = slots.at(slotIndex);
- if (slot != NULL && slot->hasItem())
+ if (slot != nullptr && slot->hasItem())
{
shared_ptr<ItemInstance> stack = slot->getItem();
clicked = stack->copy();
@@ -145,6 +145,6 @@ bool FireworksMenu::canTakeItemForPickAll(shared_ptr<ItemInstance> carried, Slot
bool FireworksMenu::isValidIngredient(shared_ptr<ItemInstance> item, int slotId)
{
- if(item == NULL || slotId == RESULT_SLOT) return true;
+ if(item == nullptr || slotId == RESULT_SLOT) return true;
return FireworksRecipe::isValidIngredient(item, m_canMakeFireworks, m_canMakeCharge, m_canMakeFade);
} \ No newline at end of file