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

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

12
Minecraft.World/ClientSideMerchant.cpp
View File

@@ -3,10 +3,10 @@
#include "net.minecraft.world.inventory.h"
#include "ClientSideMerchant.h"
ClientSideMerchant::ClientSideMerchant(std::shared_ptr<Player> source, int name)
ClientSideMerchant::ClientSideMerchant(shared_ptr<Player> source, int name)
{
this->source = source;
// 4J Stu - Need to do this after creating as a std::shared_ptr
// 4J Stu - Need to do this after creating as a shared_ptr
container = NULL; //new MerchantContainer(source, this);
currentOffers = NULL;
m_name = name;
@@ -28,17 +28,17 @@ Container *ClientSideMerchant::getContainer()
return container;
}
std::shared_ptr<Player> ClientSideMerchant::getTradingPlayer()
shared_ptr<Player> ClientSideMerchant::getTradingPlayer()
{
return source;
}
void ClientSideMerchant::setTradingPlayer(std::shared_ptr<Player> player)
void ClientSideMerchant::setTradingPlayer(shared_ptr<Player> player)
{
}
MerchantRecipeList *ClientSideMerchant::getOffers(std::shared_ptr<Player> forPlayer)
MerchantRecipeList *ClientSideMerchant::getOffers(shared_ptr<Player> forPlayer)
{
return currentOffers;
}
@@ -54,7 +54,7 @@ void ClientSideMerchant::notifyTrade(MerchantRecipe *activeRecipe)
activeRecipe->increaseUses();
}
void ClientSideMerchant::notifyTradeUpdated(std::shared_ptr<ItemInstance> item)
void ClientSideMerchant::notifyTradeUpdated(shared_ptr<ItemInstance> item)
{
}