From b3feddfef372618c8a9d7a0abcaf18cfad866c18 Mon Sep 17 00:00:00 2001
From: daoge <3523206925@qq.com>
Date: Tue, 3 Mar 2026 03:04:10 +0800
Subject: feat: TU19 (Dec 2014) Features & Content (#155)

* try to resolve merge conflict

* feat: TU19 (Dec 2014) Features & Content (#32)

* December 2014 files

* Working release build

* Fix compilation issues

* Add sound to Windows64Media

* Add DLC content and force Tutorial DLC

* Revert "Add DLC content and force Tutorial DLC"

This reverts commit 97a43994725008e35fceb984d5549df9c8cea470.

* Disable broken light packing

* Disable breakpoint during DLC texture map load

Allows DLC loading but the DLC textures are still broken

* Fix post build not working

* ...

* fix vs2022 build

* fix cmake build

---------

Co-authored-by: Loki <lokirautio@gmail.com>
---
 Minecraft.World/CombatTracker.h | 54 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 Minecraft.World/CombatTracker.h

(limited to 'Minecraft.World/CombatTracker.h')

diff --git a/Minecraft.World/CombatTracker.h b/Minecraft.World/CombatTracker.h
new file mode 100644
index 00000000..8c3b7717
--- /dev/null
+++ b/Minecraft.World/CombatTracker.h
@@ -0,0 +1,54 @@
+#pragma once
+
+#include "SharedConstants.h"
+
+class CombatEntry;
+class LivingEntity;
+class ChatPacket;
+
+class CombatTracker
+{
+public:
+	static const int RESET_DAMAGE_STATUS_TIME = SharedConstants::TICKS_PER_SECOND * 5;
+	static const int RESET_COMBAT_STATUS_TIME = SharedConstants::TICKS_PER_SECOND * 15;
+
+	// 4J: This enum replaces 
+	enum eLOCATION
+	{
+		eLocation_GENERIC = 0, 
+		eLocation_LADDER,
+		eLocation_VINES,
+		eLocation_WATER,
+
+		eLocation_COUNT,
+	};
+
+private:
+	vector<CombatEntry *> entries;
+	LivingEntity *mob; //Owner
+	int lastDamageTime;
+	bool inCombat;
+	bool takingDamage;
+	eLOCATION nextLocation; // 4J: Location is now an enum, not a string
+
+public:
+	CombatTracker(LivingEntity *mob);
+	~CombatTracker();
+
+	void prepareForDamage();
+	void recordDamage(DamageSource *source, float health, float damage);
+	shared_ptr<ChatPacket> getDeathMessagePacket(); // 4J: Changed this to return a chat packet
+	shared_ptr<LivingEntity> getKiller();
+
+private:
+	CombatEntry *getMostSignificantFall();
+	eLOCATION getFallLocation(CombatEntry *entry);
+
+public:
+	bool isTakingDamage();
+	bool isInCombat();
+
+private:
+	void resetPreparedStatus();
+	void recheckStatus();
+};
\ No newline at end of file
-- 
cgit v1.2.3