aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/ClientSideMerchant.h
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.World/ClientSideMerchant.h')
-rw-r--r--Minecraft.World/ClientSideMerchant.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/Minecraft.World/ClientSideMerchant.h b/Minecraft.World/ClientSideMerchant.h
index 33f0c0b1..fa02c486 100644
--- a/Minecraft.World/ClientSideMerchant.h
+++ b/Minecraft.World/ClientSideMerchant.h
@@ -10,21 +10,21 @@ class ClientSideMerchant : public Merchant, public enable_shared_from_this<Clien
{
private:
MerchantContainer *container;
- shared_ptr<Player> source;
+ std::shared_ptr<Player> source;
MerchantRecipeList *currentOffers;
int m_name;
public:
- ClientSideMerchant(shared_ptr<Player> source, int name);
+ ClientSideMerchant(std::shared_ptr<Player> source, int name);
~ClientSideMerchant();
void createContainer(); // 4J Added
Container *getContainer();
- shared_ptr<Player> getTradingPlayer();
- void setTradingPlayer(shared_ptr<Player> player);
- MerchantRecipeList *getOffers(shared_ptr<Player> forPlayer);
+ std::shared_ptr<Player> getTradingPlayer();
+ void setTradingPlayer(std::shared_ptr<Player> player);
+ MerchantRecipeList *getOffers(std::shared_ptr<Player> forPlayer);
void overrideOffers(MerchantRecipeList *recipeList);
void notifyTrade(MerchantRecipe *activeRecipe);
- void notifyTradeUpdated(shared_ptr<ItemInstance> item);
+ void notifyTradeUpdated(std::shared_ptr<ItemInstance> item);
int getDisplayName();
}; \ No newline at end of file