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

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

1 files changed, 27 insertions, 0 deletions

diff --git a/Minecraft.World/HealthCriteria.cpp b/Minecraft.World/HealthCriteria.cpp
new file mode 100644
index 00000000..52db9f11
--- /dev/null
+++ b/Minecraft.World/HealthCriteria.cpp
@@ -0,0 +1,27 @@
+#include "stdafx.h"
+#include "net.minecraft.world.entity.player.h"
+#include "HealthCriteria.h"
+
+HealthCriteria::HealthCriteria(const wstring &id) : DummyCriteria(id)
+{
+}
+
+int HealthCriteria::getScoreModifier(vector<shared_ptr<Player> > *players)
+{
+	float health = 0;
+
+	for (AUTO_VAR(it,players->begin()); it != players->end(); ++it)
+	{
+		shared_ptr<Player> player = *it;
+		health += player->getHealth() + player->getAbsorptionAmount();
+	}
+
+	if (players->size() > 0) health /= players->size();
+
+	return Mth::ceil(health);
+}
+
+bool HealthCriteria::isReadOnly()
+{
+	return true;
+}
\ No newline at end of file