aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/ClientSideMerchant.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.World/ClientSideMerchant.cpp')
-rw-r--r--Minecraft.World/ClientSideMerchant.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Minecraft.World/ClientSideMerchant.cpp b/Minecraft.World/ClientSideMerchant.cpp
index 5d021c22..ba179300 100644
--- a/Minecraft.World/ClientSideMerchant.cpp
+++ b/Minecraft.World/ClientSideMerchant.cpp
@@ -3,7 +3,7 @@
#include "net.minecraft.world.inventory.h"
#include "ClientSideMerchant.h"
-ClientSideMerchant::ClientSideMerchant(shared_ptr<Player> source, int name)
+ClientSideMerchant::ClientSideMerchant(shared_ptr<Player> source, const wstring &name)
{
this->source = source;
// 4J Stu - Need to do this after creating as a shared_ptr
@@ -58,7 +58,7 @@ void ClientSideMerchant::notifyTradeUpdated(shared_ptr<ItemInstance> item)
{
}
-int ClientSideMerchant::getDisplayName()
+wstring ClientSideMerchant::getDisplayName()
{
return m_name;
} \ No newline at end of file