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

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

1 files changed, 38 insertions, 0 deletions

diff --git a/Minecraft.World/Objective.cpp b/Minecraft.World/Objective.cpp
new file mode 100644
index 00000000..243713d4
--- /dev/null
+++ b/Minecraft.World/Objective.cpp
@@ -0,0 +1,38 @@
+#include "stdafx.h"
+#include "net.minecraft.world.scores.h"
+#include "Objective.h"
+
+Objective::Objective(Scoreboard *scoreboard, const wstring &name, ObjectiveCriteria *criteria)
+{
+	this->scoreboard = scoreboard;
+	this->name = name;
+	this->criteria = criteria;
+
+	displayName = name;
+}
+
+Scoreboard *Objective::getScoreboard()
+{
+	return scoreboard;
+}
+
+wstring Objective::getName()
+{
+	return name;
+}
+
+ObjectiveCriteria *Objective::getCriteria()
+{
+	return criteria;
+}
+
+wstring Objective::getDisplayName()
+{
+	return displayName;
+}
+
+void Objective::setDisplayName(const wstring &name)
+{
+	displayName = name;
+	scoreboard->onObjectiveChanged(this);
+}
\ No newline at end of file