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

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

1 files changed, 46 insertions, 0 deletions

diff --git a/Minecraft.World/SetDisplayObjectivePacket.cpp b/Minecraft.World/SetDisplayObjectivePacket.cpp
new file mode 100644
index 00000000..f1cffa4b
--- /dev/null
+++ b/Minecraft.World/SetDisplayObjectivePacket.cpp
@@ -0,0 +1,46 @@
+#include "stdafx.h"
+#include "PacketListener.h"
+#include "net.minecraft.world.scores.h"
+#include "SetDisplayObjectivePacket.h"
+
+SetDisplayObjectivePacket::SetDisplayObjectivePacket()
+{
+	slot = 0;
+	objectiveName = L"";
+}
+
+SetDisplayObjectivePacket::SetDisplayObjectivePacket(int slot, Objective *objective)
+{
+	this->slot = slot;
+
+	if (objective == NULL)
+	{
+		objectiveName = L"";
+	}
+	else
+	{
+		objectiveName = objective->getName();
+	}
+}
+
+void SetDisplayObjectivePacket::read(DataInputStream *dis)
+{
+	slot = dis->readByte();
+	objectiveName = readUtf(dis, Objective::MAX_NAME_LENGTH);
+}
+
+void SetDisplayObjectivePacket::write(DataOutputStream *dos)
+{
+	dos->writeByte(slot);
+	writeUtf(objectiveName, dos);
+}
+
+void SetDisplayObjectivePacket::handle(PacketListener *listener)
+{
+	listener->handleSetDisplayObjective(shared_from_this());
+}
+
+int SetDisplayObjectivePacket::getEstimatedSize()
+{
+	return 1 + 2 + objectiveName.length();
+}
\ No newline at end of file