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

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

1 files changed, 36 insertions, 0 deletions

diff --git a/Minecraft.World/ComparatorTileEntity.cpp b/Minecraft.World/ComparatorTileEntity.cpp
new file mode 100644
index 00000000..9a58d23c
--- /dev/null
+++ b/Minecraft.World/ComparatorTileEntity.cpp
@@ -0,0 +1,36 @@
+#include "stdafx.h"
+
+#include "ComparatorTileEntity.h"
+
+void ComparatorTileEntity::save(CompoundTag *tag)
+{
+	TileEntity::save(tag);
+	tag->putInt(L"OutputSignal", output);
+}
+
+void ComparatorTileEntity::load(CompoundTag *tag)
+{
+	TileEntity::load(tag);
+	output = tag->getInt(L"OutputSignal");
+}
+
+int ComparatorTileEntity::getOutputSignal()
+{
+	return output;
+}
+
+void ComparatorTileEntity::setOutputSignal(int value)
+{
+	output = value;
+}
+
+// 4J Added
+shared_ptr<TileEntity> ComparatorTileEntity::clone()
+{
+	shared_ptr<ComparatorTileEntity> result = shared_ptr<ComparatorTileEntity>( new ComparatorTileEntity() );
+	TileEntity::clone(result);
+
+	result->output = output;
+
+	return result;
+}
\ No newline at end of file