December 2014 files

2026-03-01 11:00:23 -06:00
parent b691c43c44
commit 8fd3ac6e37
2049 changed files with 260190 additions and 134787 deletions
--- 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;
 }