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/Village.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

diff --git a/Minecraft.World/Village.h b/Minecraft.World/Village.h
index 07858ef9..e1ee2d4b 100644
--- a/Minecraft.World/Village.h
+++ b/Minecraft.World/Village.h
@@ -19,10 +19,10 @@ private:
 	class Aggressor
 	{
 	public:
-		shared_ptr<Mob> mob;
+		shared_ptr<LivingEntity> mob;
 		int timeStamp;
 
-		Aggressor(shared_ptr<Mob> mob, int timeStamp);
+		Aggressor(shared_ptr<LivingEntity> mob, int timeStamp);
 	};
 
 	vector<Aggressor *> aggressors;
@@ -57,9 +57,9 @@ public:
 	shared_ptr<DoorInfo> getDoorInfo(int x, int y, int z);
 	void addDoorInfo(shared_ptr<DoorInfo> di);
 	bool canRemove();
-	void addAggressor(shared_ptr<Mob> mob);
-	shared_ptr<Mob> getClosestAggressor(shared_ptr<Mob> from);
-	shared_ptr<Player> getClosestBadStandingPlayer(shared_ptr<Mob> from); // 4J Stu - Should be LivingEntity when we add that
+	void addAggressor(shared_ptr<LivingEntity> mob);
+	shared_ptr<LivingEntity> getClosestAggressor(shared_ptr<LivingEntity> from);
+	shared_ptr<Player> getClosestBadStandingPlayer(shared_ptr<LivingEntity> from);
 
 private:
 	void updateAggressors();
-- 
cgit v1.2.3