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

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

1 files changed, 19 insertions, 0 deletions

diff --git a/Minecraft.World/DropperTileEntity.cpp b/Minecraft.World/DropperTileEntity.cpp
new file mode 100644
index 00000000..51bf6abf
--- /dev/null
+++ b/Minecraft.World/DropperTileEntity.cpp
@@ -0,0 +1,19 @@
+#include "stdafx.h"
+
+#include "DropperTileEntity.h"
+
+wstring DropperTileEntity::getName()
+{
+	return hasCustomName() ? name : app.GetString(IDS_CONTAINER_DROPPER);
+}
+
+// 4J Added
+shared_ptr<TileEntity> DropperTileEntity::clone()
+{
+	shared_ptr<DropperTileEntity> result = shared_ptr<DropperTileEntity>( new DropperTileEntity() );
+	TileEntity::clone(result);
+
+	result->name = name;
+
+	return result;
+}
\ No newline at end of file