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.h
View File

@@ -10,21 +10,21 @@ class ClientSideMerchant : public Merchant, public enable_shared_from_this<Clien
{
private:
MerchantContainer *container;
std::shared_ptr<Player> source;
shared_ptr<Player> source;
MerchantRecipeList *currentOffers;
int m_name;
public:
ClientSideMerchant(std::shared_ptr<Player> source, int name);
ClientSideMerchant(shared_ptr<Player> source, int name);
~ClientSideMerchant();
void createContainer(); // 4J Added
Container *getContainer();
std::shared_ptr<Player> getTradingPlayer();
void setTradingPlayer(std::shared_ptr<Player> player);
MerchantRecipeList *getOffers(std::shared_ptr<Player> forPlayer);
shared_ptr<Player> getTradingPlayer();
void setTradingPlayer(shared_ptr<Player> player);
MerchantRecipeList *getOffers(shared_ptr<Player> forPlayer);
void overrideOffers(MerchantRecipeList *recipeList);
void notifyTrade(MerchantRecipe *activeRecipe);
void notifyTradeUpdated(std::shared_ptr<ItemInstance> item);
void notifyTradeUpdated(shared_ptr<ItemInstance> item);
int getDisplayName();
};