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

Revert "shared_ptr -> std::shared_ptr"

Browse source 
This reverts commit 7074f35e4b.
This commit is contained in:
void_17 2026-03-02 17:37:16 +07:00
parent 8a2a62ea1d
commit 119bff3514
1373 changed files with 12049 additions and 12049 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Minecraft.World/SimpleContainer.cpp
View file

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