diff options
| author | qwasdrizzel <145519042+qwasdrizzel@users.noreply.github.com> | 2026-03-16 21:44:26 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-03-16 21:44:26 -0500 |
| commit | ce739f6045ec72127491286ea3f3f21e537c1b55 (patch) | |
| tree | f33bd42a47c1b4a7b2153a7fb77127ee3b407db9 /Minecraft.World/FireworksMenu.cpp | |
| parent | 255a18fe8e9b57377975f82e2b227afe2a12eda0 (diff) | |
| parent | 5a59f5d146b43811dde6a5a0245ee9875d7b5cd1 (diff) | |
Merge branch 'smartcmd:main' into main
Diffstat (limited to 'Minecraft.World/FireworksMenu.cpp')
| -rw-r--r-- | Minecraft.World/FireworksMenu.cpp | 10 |
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 |