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

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

1 files changed, 12 insertions, 9 deletions

diff --git a/Minecraft.World/BreedGoal.cpp b/Minecraft.World/BreedGoal.cpp
index 2145d371..ce2d8fff 100644
--- a/Minecraft.World/BreedGoal.cpp
+++ b/Minecraft.World/BreedGoal.cpp
@@ -4,19 +4,20 @@
 #include "net.minecraft.world.entity.animal.h"
 #include "net.minecraft.world.level.h"
 #include "net.minecraft.world.phys.h"
+#include "BasicTypeContainers.h"
 #include "BreedGoal.h"
 #include "ExperienceOrb.h"
 
 #include "GenericStats.h"
 
-BreedGoal::BreedGoal(Animal *animal, float speed)
+BreedGoal::BreedGoal(Animal *animal, double speedModifier)
 {
 	partner = weak_ptr<Animal>();
 	loveTime = 0;
 
 	this->animal = animal;
 	this->level = animal->level;
-	this->speed = speed;
+	this->speedModifier = speedModifier;
 	setRequiredControlFlags(Control::MoveControlFlag | Control::LookControlFlag);
 }
 
@@ -41,26 +42,28 @@ void BreedGoal::stop()
 void BreedGoal::tick()
 {
 	animal->getLookControl()->setLookAt(partner.lock(), 10, animal->getMaxHeadXRot());
-	animal->getNavigation()->moveTo(partner.lock(), speed);
+	animal->getNavigation()->moveTo(partner.lock(), speedModifier);
 	++loveTime;
-	if (loveTime == 20 * 3) breed();
+	if (loveTime >= 20 * 3 && animal->distanceToSqr(partner.lock()) < 3*3) breed();
 }
 
 shared_ptr<Animal> BreedGoal::getFreePartner()
 {
 	float r = 8;
 	vector<shared_ptr<Entity> > *others = level->getEntitiesOfClass(typeid(*animal), animal->bb->grow(r, r, r));
+	double dist = Double::MAX_VALUE;
+	shared_ptr<Animal> partner = nullptr;
 	for(AUTO_VAR(it, others->begin()); it != others->end(); ++it)
 	{
 		shared_ptr<Animal> p = dynamic_pointer_cast<Animal>(*it);
-		if (animal->canMate(p))
+		if (animal->canMate(p) && animal->distanceToSqr(p) < dist)
 		{
-			delete others;
-			return p;
+			partner = p;
+			dist = animal->distanceToSqr(p);
 		}
 	}
 	delete others;
-	return nullptr;
+	return partner;
 }
 
 void BreedGoal::breed()
@@ -97,7 +100,7 @@ void BreedGoal::breed()
 	partner.lock()->setAge(5 * 60 * 20);
 	animal->resetLove();
 	partner.lock()->resetLove();
-	offspring->setAge(-20 * 60 * 20);
+	offspring->setAge(AgableMob::BABY_START_AGE);
 	offspring->moveTo(animal->x, animal->y, animal->z, 0, 0);
 	offspring->setDespawnProtected();
 	level->addEntity(offspring);