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

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

1 files changed, 14 insertions, 3 deletions

diff --git a/Minecraft.World/OwnerHurtByTargetGoal.cpp b/Minecraft.World/OwnerHurtByTargetGoal.cpp
index e576f575..8250dc18 100644
--- a/Minecraft.World/OwnerHurtByTargetGoal.cpp
+++ b/Minecraft.World/OwnerHurtByTargetGoal.cpp
@@ -6,20 +6,31 @@
 OwnerHurtByTargetGoal::OwnerHurtByTargetGoal(TamableAnimal *tameAnimal) : TargetGoal(tameAnimal, 32, false)
 {
 	this->tameAnimal = tameAnimal;
+	timestamp = 0;
 	setRequiredControlFlags(TargetGoal::TargetFlag);
 }
 
 bool OwnerHurtByTargetGoal::canUse()
 {
 	if (!tameAnimal->isTame()) return false;
-	shared_ptr<Mob> owner = tameAnimal->getOwner();
+	shared_ptr<LivingEntity> owner = dynamic_pointer_cast<LivingEntity>( tameAnimal->getOwner() );
 	if (owner == NULL) return false;
-	ownerLastHurtBy = weak_ptr<Mob>(owner->getLastHurtByMob());
-	return canAttack(ownerLastHurtBy.lock(), false);
+	ownerLastHurtBy = weak_ptr<LivingEntity>(owner->getLastHurtByMob());
+	int ts = owner->getLastHurtByMobTimestamp();
+
+	shared_ptr<LivingEntity> locked = ownerLastHurtBy.lock();
+	return ts != timestamp && canAttack(locked, false) && tameAnimal->wantsToAttack(locked, owner);
 }
 
 void OwnerHurtByTargetGoal::start()
 {
 	mob->setTarget(ownerLastHurtBy.lock());
+
+	shared_ptr<LivingEntity> owner = dynamic_pointer_cast<LivingEntity>( tameAnimal->getOwner() );
+	if (owner != NULL)
+	{
+		timestamp = owner->getLastHurtByMobTimestamp();
+	}
+
 	TargetGoal::start();
 }
\ No newline at end of file