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

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

1 files changed, 24 insertions, 0 deletions

diff --git a/Minecraft.World/DummyCriteria.cpp b/Minecraft.World/DummyCriteria.cpp
new file mode 100644
index 00000000..5ae7dad9
--- /dev/null
+++ b/Minecraft.World/DummyCriteria.cpp
@@ -0,0 +1,24 @@
+#include "stdafx.h"
+
+#include "DummyCriteria.h"
+
+DummyCriteria::DummyCriteria(const wstring &name)
+{
+	this->name = name;
+	ObjectiveCriteria::CRITERIA_BY_NAME[name] = this;
+}
+
+wstring DummyCriteria::getName()
+{
+	return name;
+}
+
+int DummyCriteria::getScoreModifier(vector<shared_ptr<Player> > *players)
+{
+	return 0;
+}
+
+bool DummyCriteria::isReadOnly()
+{
+	return false;
+}
\ No newline at end of file