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

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

1 files changed, 9 insertions, 8 deletions

diff --git a/Minecraft.World/PathNavigation.h b/Minecraft.World/PathNavigation.h
index b8a8cfd6..9b68637a 100644
--- a/Minecraft.World/PathNavigation.h
+++ b/Minecraft.World/PathNavigation.h
@@ -10,8 +10,8 @@ private:
 	Mob *mob;
 	Level *level;
 	Path *path;
-	float speed;
-	float maxDist;
+	double speedModifier;
+	AttributeInstance *dist;
 	bool avoidSun;
 	int _tick;
 	int lastStuckCheck;
@@ -23,7 +23,7 @@ private:
 	bool canFloat;
 
 public:
-	PathNavigation(Mob *mob, Level *level, float maxDist);
+	PathNavigation(Mob *mob, Level *level);
 	~PathNavigation();
 
 	void setAvoidWater(bool avoidWater);
@@ -33,13 +33,14 @@ public:
 	void setCanPassDoors(bool canPass);
 	bool canOpenDoors();
 	void setAvoidSun(bool avoidSun);
-	void setSpeed(float speed);
+	void setSpeedModifier(double speedModifier);
 	void setCanFloat(bool canFloat);
+	float getMaxDist();
 	Path *createPath(double x, double y, double z);
-	bool moveTo(double x, double y, double z, float speed);
-	Path *createPath(shared_ptr<Mob> target);
-	bool moveTo(shared_ptr<Mob> target, float speed);
-	bool moveTo(Path *newPath, float speed);
+	bool moveTo(double x, double y, double z, double speedModifier);
+	Path *createPath(shared_ptr<Entity> target);
+	bool moveTo(shared_ptr<Entity> target, double speedModifier);
+	bool moveTo(Path *newPath, double speedModifier);
 	Path *getPath();
 	void tick();