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/AvoidPlayerGoal.cpp | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'Minecraft.World/AvoidPlayerGoal.cpp')

diff --git a/Minecraft.World/AvoidPlayerGoal.cpp b/Minecraft.World/AvoidPlayerGoal.cpp
index c94d5cb1..53aebe89 100644
--- a/Minecraft.World/AvoidPlayerGoal.cpp
+++ b/Minecraft.World/AvoidPlayerGoal.cpp
@@ -10,16 +10,28 @@
 #include "net.minecraft.world.phys.h"
 #include "AvoidPlayerGoal.h"
 
-AvoidPlayerGoal::AvoidPlayerGoal(PathfinderMob *mob, const type_info& avoidType, float maxDist, float walkSpeed, float sprintSpeed) : avoidType(avoidType)
+AvoidPlayerGoalEntitySelector::AvoidPlayerGoalEntitySelector(AvoidPlayerGoal *parent)
+{
+	m_parent = parent;
+}
+
+bool AvoidPlayerGoalEntitySelector::matches(shared_ptr<Entity> entity) const
+{
+	return entity->isAlive() && m_parent->mob->getSensing()->canSee(entity);
+}
+
+AvoidPlayerGoal::AvoidPlayerGoal(PathfinderMob *mob, const type_info& avoidType, float maxDist, double walkSpeedModifier, double sprintSpeedModifier) : avoidType(avoidType)
 {
 	this->mob = mob;
 	//this->avoidType = avoidType;
 	this->maxDist = maxDist;
-	this->walkSpeed = walkSpeed;
-	this->sprintSpeed = sprintSpeed;
+	this->walkSpeedModifier = walkSpeedModifier;
+	this->sprintSpeedModifier = sprintSpeedModifier;
 	this->pathNav = mob->getNavigation();
 	setRequiredControlFlags(Control::MoveControlFlag);
 
+	entitySelector = new AvoidPlayerGoalEntitySelector(this);
+
 	toAvoid = weak_ptr<Entity>();
 	path = NULL;
 }
@@ -27,6 +39,7 @@ AvoidPlayerGoal::AvoidPlayerGoal(PathfinderMob *mob, const type_info& avoidType,
 AvoidPlayerGoal::~AvoidPlayerGoal()
 {
 	if(path != NULL) delete path;
+	delete entitySelector;
 }
 
 bool AvoidPlayerGoal::canUse()
@@ -40,7 +53,7 @@ bool AvoidPlayerGoal::canUse()
 	}
 	else
 	{
-		vector<shared_ptr<Entity> > *entities = mob->level->getEntitiesOfClass(avoidType, mob->bb->grow(maxDist, 3, maxDist));
+		vector<shared_ptr<Entity> > *entities = mob->level->getEntitiesOfClass(avoidType, mob->bb->grow(maxDist, 3, maxDist), entitySelector);
 		if (entities->empty())
 		{
 			delete entities;
@@ -50,8 +63,6 @@ bool AvoidPlayerGoal::canUse()
 		delete entities;
 	}
 
-	if (!mob->getSensing()->canSee(toAvoid.lock())) return false;
-
 	Vec3 *pos = RandomPos::getPosAvoid(dynamic_pointer_cast<PathfinderMob>(mob->shared_from_this()), 16, 7, Vec3::newTemp(toAvoid.lock()->x, toAvoid.lock()->y, toAvoid.lock()->z));
 	if (pos == NULL) return false;
 	if (toAvoid.lock()->distanceToSqr(pos->x, pos->y, pos->z) < toAvoid.lock()->distanceToSqr(mob->shared_from_this())) return false;
@@ -69,7 +80,7 @@ bool AvoidPlayerGoal::canContinueToUse()
 
 void AvoidPlayerGoal::start()
 {
-	pathNav->moveTo(path, walkSpeed);
+	pathNav->moveTo(path, walkSpeedModifier);
 	path = NULL;
 }
 
@@ -80,6 +91,6 @@ void AvoidPlayerGoal::stop()
 
 void AvoidPlayerGoal::tick()
 {
-	if (mob->distanceToSqr(toAvoid.lock()) < 7 * 7) mob->getNavigation()->setSpeed(sprintSpeed);
-	else mob->getNavigation()->setSpeed(walkSpeed);
+	if (mob->distanceToSqr(toAvoid.lock()) < 7 * 7) mob->getNavigation()->setSpeedModifier(sprintSpeedModifier);
+	else mob->getNavigation()->setSpeedModifier(walkSpeedModifier);
 }
\ No newline at end of file
-- 
cgit v1.2.3