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

6
Minecraft.World/ResultSlot.cpp
View File

@@ -60,13 +60,13 @@ void ResultSlot::onTake(shared_ptr<Player> player, shared_ptr<ItemInstance> carr
for (unsigned int i = 0; i < craftSlots->getContainerSize(); i++)
{
shared_ptr<ItemInstance> item = craftSlots->getItem(i);
if (item != NULL)
if (item != nullptr)
{
craftSlots->removeItem(i, 1);
if (item->getItem()->hasCraftingRemainingItem())
{
shared_ptr<ItemInstance> craftResult = shared_ptr<ItemInstance>(new ItemInstance(item->getItem()->getCraftingRemainingItem()));
shared_ptr<ItemInstance> craftResult = std::make_shared<ItemInstance>(item->getItem()->getCraftingRemainingItem());
/*
* Try to place this in the player's inventory (See we.java for new method)
@@ -77,7 +77,7 @@ void ResultSlot::onTake(shared_ptr<Player> player, shared_ptr<ItemInstance> carr
}
// If this slot is now empty, place it there (current behavior)
if (craftSlots->getItem(i) == NULL)
if (craftSlots->getItem(i) == nullptr)
{
craftSlots->setItem(i, craftResult);
}