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

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

1 files changed, 16 insertions, 0 deletions

diff --git a/Minecraft.World/Team.cpp b/Minecraft.World/Team.cpp
new file mode 100644
index 00000000..f3f6e04e
--- /dev/null
+++ b/Minecraft.World/Team.cpp
@@ -0,0 +1,16 @@
+#include "stdafx.h"
+
+#include "Team.h"
+
+bool Team::isAlliedTo(Team *other)
+{
+	if (other == NULL)
+	{
+		return false;
+	}
+	if (this == other)
+	{
+		return true;
+	}
+	return false;
+}