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

8
Minecraft.World/MerchantResultSlot.cpp
View File

@@ -42,7 +42,7 @@ void MerchantResultSlot::onTake(shared_ptr<Player> player, shared_ptr<ItemInstan
checkTakeAchievements(carried);
MerchantRecipe *activeRecipe = slots->getActiveRecipe();
if (activeRecipe != NULL)
if (activeRecipe != nullptr)
{
shared_ptr<ItemInstance> item1 = slots->getItem(MerchantMenu::PAYMENT1_SLOT);
shared_ptr<ItemInstance> item2 = slots->getItem(MerchantMenu::PAYMENT2_SLOT);
@@ -76,15 +76,15 @@ bool MerchantResultSlot::removePaymentItemsIfMatching(MerchantRecipe *activeReci
shared_ptr<ItemInstance> buyA = activeRecipe->getBuyAItem();
shared_ptr<ItemInstance> buyB = activeRecipe->getBuyBItem();
if (a != NULL && a->id == buyA->id)
if (a != nullptr && a->id == buyA->id)
{
if (buyB != NULL && b != NULL && buyB->id == b->id)
if (buyB != nullptr && b != nullptr && buyB->id == b->id)
{
a->count -= buyA->count;
b->count -= buyB->count;
return true;
}
else if (buyB == NULL && b == NULL)
else if (buyB == nullptr && b == nullptr)
{
a->count -= buyA->count;
return true;