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

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

1 files changed, 29 insertions, 0 deletions

diff --git a/Minecraft.World/CombatEntry.h b/Minecraft.World/CombatEntry.h
new file mode 100644
index 00000000..5d5be6ae
--- /dev/null
+++ b/Minecraft.World/CombatEntry.h
@@ -0,0 +1,29 @@
+#pragma once
+#include "CombatTracker.h"
+
+class DamageSource;
+
+class CombatEntry
+{
+private:
+	DamageSource *source;
+	int time;
+	float damage;
+	float health;
+	CombatTracker::eLOCATION location; // 4J: Location is now an enum, not a string
+	float fallDistance;
+
+public:
+	CombatEntry(DamageSource *source, int time, float health, float damage, CombatTracker::eLOCATION nextLocation, float fallDistance);
+	~CombatEntry();
+
+	DamageSource *getSource();
+	int getTime();
+	float getDamage();
+	float getHealthBeforeDamage();
+	float getHealthAfterDamage();
+	bool isCombatRelated();
+	CombatTracker::eLOCATION getLocation();
+	wstring getAttackerName();
+	float getFallDistance();
+};
\ No newline at end of file