Merge branch 'main' into pr/win64-world-saves

# Conflicts:
#	Minecraft.Client/MinecraftServer.cpp
#	README.md

1 files changed, 11 insertions, 11 deletions

diff --git a/Minecraft.World/ClientSideMerchant.h b/Minecraft.World/ClientSideMerchant.h
index 33f0c0b1..085768ca 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;
-    MerchantRecipeList *currentOffers;
-	int m_name;
+	shared_ptr<Player> source;
+	MerchantRecipeList *currentOffers;
+	wstring m_name;
 
 public:
-	ClientSideMerchant(shared_ptr<Player> source, int name);
+	ClientSideMerchant(shared_ptr<Player> source, const wstring &name);
 	~ClientSideMerchant();
 
 	void createContainer(); // 4J Added
-    Container *getContainer();
-    shared_ptr<Player> getTradingPlayer();
-    void setTradingPlayer(shared_ptr<Player> player);
-    MerchantRecipeList *getOffers(shared_ptr<Player> forPlayer);
-    void overrideOffers(MerchantRecipeList *recipeList);
-    void notifyTrade(MerchantRecipe *activeRecipe);
+	Container *getContainer();
+	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(shared_ptr<ItemInstance> item);
-	int getDisplayName();
+	wstring getDisplayName();
 };
\ No newline at end of file