Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a.
This commit is contained in:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Minecraft.World/SimpleContainer.cpp
View File

@@ -13,12 +13,12 @@ SimpleContainer::SimpleContainer(int name, wstring stringName, bool customName,
this->size = size;
items = new ItemInstanceArray( size );
listeners = nullptr;
listeners = NULL;
}
void SimpleContainer::addListener(net_minecraft_world::ContainerListener *listener)
{
if (listeners == nullptr) listeners = new vector<net_minecraft_world::ContainerListener *>();
if (listeners == NULL) listeners = new vector<net_minecraft_world::ContainerListener *>();
listeners->push_back(listener);
}
@@ -43,7 +43,7 @@ shared_ptr<ItemInstance> SimpleContainer::getItem(unsigned int slot)
shared_ptr<ItemInstance> SimpleContainer::removeItem(unsigned int slot, int count)
{
if ((*items)[slot] != nullptr) {
if ((*items)[slot] != NULL) {
if ((*items)[slot]->count <= count)
{
shared_ptr<ItemInstance> item = (*items)[slot];
@@ -64,7 +64,7 @@ shared_ptr<ItemInstance> SimpleContainer::removeItem(unsigned int slot, int coun
shared_ptr<ItemInstance> SimpleContainer::removeItemNoUpdate(int slot)
{
if ((*items)[slot] != nullptr)
if ((*items)[slot] != NULL)
{
shared_ptr<ItemInstance> item = (*items)[slot];
(*items)[slot] = nullptr;
@@ -76,7 +76,7 @@ shared_ptr<ItemInstance> SimpleContainer::removeItemNoUpdate(int slot)
void SimpleContainer::setItem(unsigned int slot, shared_ptr<ItemInstance> item)
{
(*items)[slot] = item;
if (item != nullptr && item->count > getMaxStackSize()) item->count = getMaxStackSize();
if (item != NULL && item->count > getMaxStackSize()) item->count = getMaxStackSize();
setChanged();
}
@@ -113,7 +113,7 @@ int SimpleContainer::getMaxStackSize() const
void SimpleContainer::setChanged()
{
if (listeners != nullptr) for (unsigned int i = 0; i < listeners->size(); i++)
if (listeners != NULL) for (unsigned int i = 0; i < listeners->size(); i++)
{
listeners->at(i)->containerChanged();//shared_from_this());
}