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

10
Minecraft.World/ArmorItem.cpp
View File

@@ -170,9 +170,9 @@ int ArmorItem::getColor(shared_ptr<ItemInstance> item)
if (armorType != ArmorMaterial::CLOTH) return -1;
CompoundTag *tag = item->getTag();
if (tag == nullptr) return Minecraft::GetInstance()->getColourTable()->getColor( DEFAULT_LEATHER_COLOR );
if (tag == NULL) return Minecraft::GetInstance()->getColourTable()->getColor( DEFAULT_LEATHER_COLOR );
CompoundTag *display = tag->getCompound(L"display");
if (display == nullptr) return Minecraft::GetInstance()->getColourTable()->getColor( DEFAULT_LEATHER_COLOR );
if (display == NULL) return Minecraft::GetInstance()->getColourTable()->getColor( DEFAULT_LEATHER_COLOR );
if (display->contains(L"color"))
{
@@ -197,7 +197,7 @@ void ArmorItem::clearColor(shared_ptr<ItemInstance> item)
{
if (armorType != ArmorMaterial::CLOTH) return;
CompoundTag *tag = item->getTag();
if (tag == nullptr) return;
if (tag == NULL) return;
CompoundTag *display = tag->getCompound(L"display");
if (display->contains(L"color")) display->remove(L"color");
}
@@ -215,7 +215,7 @@ void ArmorItem::setColor(shared_ptr<ItemInstance> item, int color)
CompoundTag *tag = item->getTag();
if (tag == nullptr)
if (tag == NULL)
{
tag = new CompoundTag();
item->setTag(tag);
@@ -262,5 +262,5 @@ Icon *ArmorItem::getEmptyIcon(int slot)
return Item::boots_diamond->iconEmpty;
}
return nullptr;
return NULL;
}