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

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

1 files changed, 17 insertions, 2 deletions

diff --git a/Minecraft.World/MerchantContainer.cpp b/Minecraft.World/MerchantContainer.cpp
index cadbe4e3..7ceb4745 100644
--- a/Minecraft.World/MerchantContainer.cpp
+++ b/Minecraft.World/MerchantContainer.cpp
@@ -90,12 +90,22 @@ void MerchantContainer::setItem(unsigned int slot, shared_ptr<ItemInstance> item
 	}
 }
 
-int MerchantContainer::getName()
+wstring MerchantContainer::getName()
 {
 	return merchant->getDisplayName();
 }
 
-int MerchantContainer::getMaxStackSize()
+wstring MerchantContainer::getCustomName()
+{
+	return L"";
+}
+
+bool MerchantContainer::hasCustomName()
+{
+	return false;
+}
+
+int MerchantContainer::getMaxStackSize() const
 {
 	return Container::LARGE_MAX_STACK_SIZE;
 }
@@ -113,6 +123,11 @@ void MerchantContainer::stopOpen()
 {
 }
 
+bool MerchantContainer::canPlaceItem(int slot, shared_ptr<ItemInstance> item)
+{
+	return true;
+}
+
 void MerchantContainer::setChanged()
 {
 	updateSellItem();