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

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

1 files changed, 15 insertions, 0 deletions

diff --git a/Minecraft.World/DropperTileEntity.h b/Minecraft.World/DropperTileEntity.h
new file mode 100644
index 00000000..d04113c8
--- /dev/null
+++ b/Minecraft.World/DropperTileEntity.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include "DispenserTileEntity.h"
+
+class DropperTileEntity : public DispenserTileEntity
+{
+public:
+	eINSTANCEOF GetType() { return eTYPE_DROPPERTILEENTITY; }
+	static TileEntity *create() { return new DropperTileEntity(); }
+	// 4J Added
+	virtual shared_ptr<TileEntity> clone();
+
+public:
+	wstring getName();
+};
\ No newline at end of file