LegacyConsole/4jcraft
2
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-05-24 00:15:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: unglob std::shared_ptr

Browse Source
This commit is contained in:
Tropical
2026-03-06 11:20:45 -06:00
parent 0dd1654dec
commit 67ceccf2d4
1065 changed files with 5754 additions and 5749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Minecraft.World/Containers/SimpleContainer.cpp
View File

@@ -34,24 +34,24 @@ void SimpleContainer::removeListener(net_minecraft_world::ContainerListener *lis
listeners->erase( it );
}
shared_ptr<ItemInstance> SimpleContainer::getItem(unsigned int slot)
std::shared_ptr<ItemInstance> SimpleContainer::getItem(unsigned int slot)
{
return (*items)[slot];
}
shared_ptr<ItemInstance> SimpleContainer::removeItem(unsigned int slot, int count)
std::shared_ptr<ItemInstance> SimpleContainer::removeItem(unsigned int slot, int count)
{
if ((*items)[slot] != NULL) {
if ((*items)[slot]->count <= count)
{
shared_ptr<ItemInstance> item = (*items)[slot];
std::shared_ptr<ItemInstance> item = (*items)[slot];
(*items)[slot] = nullptr;
this->setChanged();
return item;
}
else
{
shared_ptr<ItemInstance> i = (*items)[slot]->remove(count);
std::shared_ptr<ItemInstance> i = (*items)[slot]->remove(count);
if ((*items)[slot]->count == 0) (*items)[slot] = nullptr;
this->setChanged();
return i;
@@ -60,18 +60,18 @@ shared_ptr<ItemInstance> SimpleContainer::removeItem(unsigned int slot, int coun
return nullptr;
}
shared_ptr<ItemInstance> SimpleContainer::removeItemNoUpdate(int slot)
std::shared_ptr<ItemInstance> SimpleContainer::removeItemNoUpdate(int slot)
{
if ((*items)[slot] != NULL)
{
shared_ptr<ItemInstance> item = (*items)[slot];
std::shared_ptr<ItemInstance> item = (*items)[slot];
(*items)[slot] = nullptr;
return item;
}
return nullptr;
}
void SimpleContainer::setItem(unsigned int slot, shared_ptr<ItemInstance> item)
void SimpleContainer::setItem(unsigned int slot, std::shared_ptr<ItemInstance> item)
{
(*items)[slot] = item;
if (item != NULL && item->count > getMaxStackSize()) item->count = getMaxStackSize();
@@ -104,7 +104,7 @@ void SimpleContainer::setChanged()
#endif
}
bool SimpleContainer::stillValid(shared_ptr<Player> player)
bool SimpleContainer::stillValid(std::shared_ptr<Player> player)
{
return true;
}