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

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

1 files changed, 26 insertions, 0 deletions

diff --git a/Minecraft.World/Objective.h b/Minecraft.World/Objective.h
new file mode 100644
index 00000000..eebec31a
--- /dev/null
+++ b/Minecraft.World/Objective.h
@@ -0,0 +1,26 @@
+#pragma once
+
+class Scoreboard;
+class ObjectiveCriteria;
+
+class Objective
+{
+public:
+	static const int MAX_NAME_LENGTH = 16;
+	static const int MAX_DISPLAY_NAME_LENGTH = 32;
+
+private:
+	Scoreboard *scoreboard;
+	wstring name;
+	ObjectiveCriteria *criteria;
+	wstring displayName;
+
+public:
+	Objective(Scoreboard *scoreboard, const wstring &name, ObjectiveCriteria *criteria);
+
+	Scoreboard *getScoreboard();
+	wstring getName();
+	ObjectiveCriteria *getCriteria();
+	wstring getDisplayName();
+	void setDisplayName(const wstring &name);
+};
\ No newline at end of file