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

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

1 files changed, 3 insertions, 4 deletions

diff --git a/Minecraft.World/NonTameRandomTargetGoal.cpp b/Minecraft.World/NonTameRandomTargetGoal.cpp
index 734d637f..5fb6c79d 100644
--- a/Minecraft.World/NonTameRandomTargetGoal.cpp
+++ b/Minecraft.World/NonTameRandomTargetGoal.cpp
@@ -2,13 +2,12 @@
 #include "net.minecraft.world.entity.animal.h"
 #include "NonTameRandomTargetGoal.h"
 
-NonTameRandomTargetGoal::NonTameRandomTargetGoal(TamableAnimal *mob, const type_info& targetType, float within, int randomInterval, bool mustSee) : NearestAttackableTargetGoal(mob, targetType, within, randomInterval, mustSee)
+NonTameRandomTargetGoal::NonTameRandomTargetGoal(TamableAnimal *mob, const type_info& targetType, int randomInterval, bool mustSee) : NearestAttackableTargetGoal(mob, targetType, randomInterval, mustSee)
 {
-	this->tamableMob = mob;
+	tamableMob = mob;
 }
 
 bool NonTameRandomTargetGoal::canUse()
 {
-	if (tamableMob->isTame()) return false;
-	return NearestAttackableTargetGoal::canUse();
+	return !tamableMob->isTame() && NearestAttackableTargetGoal::canUse();
 }