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

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

1 files changed, 114 insertions, 0 deletions

diff --git a/Minecraft.World/SetPlayerTeamPacket.cpp b/Minecraft.World/SetPlayerTeamPacket.cpp
new file mode 100644
index 00000000..8c605784
--- /dev/null
+++ b/Minecraft.World/SetPlayerTeamPacket.cpp
@@ -0,0 +1,114 @@
+#include "stdafx.h"
+#include "net.minecraft.world.scores.h"
+#include "net.minecraft.world.entity.player.h"
+#include "PacketListener.h"
+#include "SetPlayerTeamPacket.h"
+
+SetPlayerTeamPacket::SetPlayerTeamPacket()
+{
+	name = L"";
+	displayName = L"";
+	prefix = L"";
+	suffix = L"";
+	method = 0;
+	options = 0;
+}
+
+SetPlayerTeamPacket::SetPlayerTeamPacket(PlayerTeam *team, int method)
+{
+	name = team->getName();
+	this->method = method;
+
+	if (method == METHOD_ADD || method == METHOD_CHANGE)
+	{
+		displayName = team->getDisplayName();
+		prefix = team->getPrefix();
+		suffix = team->getSuffix();
+		options = team->packOptions();
+	}
+	if (method == METHOD_ADD)
+	{
+		unordered_set<wstring> *playerNames = team->getPlayers();
+		players.insert(players.end(), playerNames->begin(), playerNames->end());
+	}
+}
+
+SetPlayerTeamPacket::SetPlayerTeamPacket(PlayerTeam *team, vector<wstring> *playerNames, int method)
+{
+	if (method != METHOD_JOIN && method != METHOD_LEAVE)
+	{
+		app.DebugPrintf("Method must be join or leave for player constructor");
+#ifndef _CONTENT_PACKAGE
+		__debugbreak();
+#endif
+	}
+	if (playerNames == NULL || playerNames->empty())
+	{
+		app.DebugPrintf("Players cannot be null/empty");
+#ifndef _CONTENT_PACKAGE
+		__debugbreak();
+#endif
+	}
+
+	this->method = method;
+	name = team->getName();
+	this->players.insert(players.end(), playerNames->begin(), playerNames->end());
+}
+
+void SetPlayerTeamPacket::read(DataInputStream *dis)
+{
+	name = readUtf(dis, Objective::MAX_NAME_LENGTH);
+	method = dis->readByte();
+
+	if (method == METHOD_ADD || method == METHOD_CHANGE)
+	{
+		displayName = readUtf(dis, PlayerTeam::MAX_DISPLAY_NAME_LENGTH);
+		prefix = readUtf(dis, PlayerTeam::MAX_PREFIX_LENGTH);
+		suffix = readUtf(dis, PlayerTeam::MAX_SUFFIX_LENGTH);
+		options = dis->readByte();
+	}
+
+	if (method == METHOD_ADD || method == METHOD_JOIN || method == METHOD_LEAVE)
+	{
+		int count = dis->readShort();
+
+		for (int i = 0; i < count; i++)
+		{
+			players.push_back(readUtf(dis, Player::MAX_NAME_LENGTH));
+		}
+	}
+}
+
+void SetPlayerTeamPacket::write(DataOutputStream *dos)
+{
+	writeUtf(name, dos);
+	dos->writeByte(method);
+
+	if (method == METHOD_ADD || method == METHOD_CHANGE)
+	{
+		writeUtf(displayName, dos);
+		writeUtf(prefix, dos);
+		writeUtf(suffix, dos);
+		dos->writeByte(options);
+	}
+
+	if (method == METHOD_ADD || method == METHOD_JOIN || method == METHOD_LEAVE)
+	{
+		dos->writeShort(players.size());
+
+		for (AUTO_VAR(it,players.begin()); it != players.end(); ++it)
+		{
+			writeUtf(*it, dos);
+		}
+	}
+}
+
+void SetPlayerTeamPacket::handle(PacketListener *listener)
+{
+	listener->handleSetPlayerTeamPacket(shared_from_this());
+}
+
+int SetPlayerTeamPacket::getEstimatedSize()
+{
+	return 1 + 2 + name.length();
+}
\ No newline at end of file