spawnrys/MinecraftConsoles
1
0
Fork 0
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-03-23 21:38:13 +05:00
Code Issues Packages Projects Releases 1 Wiki Activity

Modernize project codebase (#906)

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

* Add safety checks and fix a issue with vector going OOR
This commit is contained in:
ModMaker101
2026-03-08 19:08:36 -04:00
committed by GitHub
parent 88798b501d
commit 28614b922f
1373 changed files with 20086 additions and 19527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Minecraft.World/ContainerMenu.cpp
View File

@@ -46,14 +46,14 @@ shared_ptr<ItemInstance> ContainerMenu::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();
if (slotIndex < containerRows * 9)
{
if(!moveItemStackTo(stack, containerRows * 9, (int)slots.size(), true))
if(!moveItemStackTo(stack, containerRows * 9, static_cast<int>(slots.size()), true))
{
// 4J Stu - Brought forward from 1.2
return nullptr;
@@ -97,7 +97,7 @@ shared_ptr<ItemInstance> ContainerMenu::clicked(int slotIndex, int buttonNum, in
#ifdef _EXTENDED_ACHIEVEMENTS
shared_ptr<LocalPlayer> localPlayer = dynamic_pointer_cast<LocalPlayer>(player);
if (localPlayer != NULL) // 4J-JEV: For "Chestful o'Cobblestone" achievement.
if (localPlayer != nullptr) // 4J-JEV: For "Chestful o'Cobblestone" achievement.
{
int cobblecount = 0;
for (int i = 0; i < container->getContainerSize(); i++)