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

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

1 files changed, 7 insertions, 8 deletions

diff --git a/Minecraft.World/LookControl.cpp b/Minecraft.World/LookControl.cpp
index 829c3e4a..1e0d5258 100644
--- a/Minecraft.World/LookControl.cpp
+++ b/Minecraft.World/LookControl.cpp
@@ -15,11 +15,10 @@ LookControl::LookControl(Mob *mob)
 
 void LookControl::setLookAt(shared_ptr<Entity> target, float yMax, float xMax)
 {
-	this->wantedX = target->x;
-	shared_ptr<Mob> targetMob = dynamic_pointer_cast<Mob>(target);
-	if (targetMob != NULL) this->wantedY = target->y + targetMob->getHeadHeight();
-	else this->wantedY = (target->bb->y0 + target->bb->y1) / 2;
-	this->wantedZ = target->z;
+	wantedX = target->x;
+	if ( target->instanceof(eTYPE_LIVINGENTITY) ) wantedY = target->y + dynamic_pointer_cast<LivingEntity>(target)->getHeadHeight();
+	else wantedY = (target->bb->y0 + target->bb->y1) / 2;
+	wantedZ = target->z;
 	this->yMax = yMax;
 	this->xMax = xMax;
 	hasWanted = true;
@@ -27,9 +26,9 @@ void LookControl::setLookAt(shared_ptr<Entity> target, float yMax, float xMax)
 
 void LookControl::setLookAt(double x, double y, double z, float yMax, float xMax)
 {
-	this->wantedX = x;
-	this->wantedY = y;
-	this->wantedZ = z;
+	wantedX = x;
+	wantedY = y;
+	wantedZ = z;
 	this->yMax = yMax;
 	this->xMax = xMax;
 	hasWanted = true;