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

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

1 files changed, 16 insertions, 2 deletions

diff --git a/Minecraft.World/AvoidPlayerGoal.h b/Minecraft.World/AvoidPlayerGoal.h
index 0b17ee4f..267ccf7e 100644
--- a/Minecraft.World/AvoidPlayerGoal.h
+++ b/Minecraft.World/AvoidPlayerGoal.h
@@ -1,24 +1,38 @@
 #pragma once
 
 #include "Goal.h"
+#include "EntitySelector.h"
 
 class PathNavigation;
 class PathfinderMob;
 class Path;
+class AvoidPlayerGoal;
+
+class AvoidPlayerGoalEntitySelector : public EntitySelector
+{
+private:
+	AvoidPlayerGoal *m_parent;
+
+public:
+	AvoidPlayerGoalEntitySelector(AvoidPlayerGoal *parent);
+	bool matches(shared_ptr<Entity> entity) const;
+};
 
 class AvoidPlayerGoal : public Goal
 {
+	friend class AvoidPlayerGoalEntitySelector;
 private:
 	PathfinderMob *mob; // Owner of this goal
-	float walkSpeed, sprintSpeed;
+	double walkSpeedModifier, sprintSpeedModifier;
 	weak_ptr<Entity> toAvoid;
 	float maxDist;
 	Path *path;
 	PathNavigation *pathNav;
 	const type_info& avoidType;
+	EntitySelector *entitySelector;
 
 public:
-	AvoidPlayerGoal(PathfinderMob *mob, const type_info& avoidType, float maxDist, float walkSpeed, float sprintSpeed);
+	AvoidPlayerGoal(PathfinderMob *mob, const type_info& avoidType, float maxDist, double walkSpeedModifier, double sprintSpeedModifier);
 	~AvoidPlayerGoal();
 
 	virtual bool canUse();