Fix animals stuck in panic state #514 (#519)

2 files changed, 13 insertions, 4 deletions

diff --git a/Minecraft.World/PanicGoal.cpp b/Minecraft.World/PanicGoal.cpp
index 564fa59d..cb9fc3f3 100644
--- a/Minecraft.World/PanicGoal.cpp
+++ b/Minecraft.World/PanicGoal.cpp
@@ -10,17 +10,24 @@ PanicGoal::PanicGoal(PathfinderMob *mob, double speedModifier)
 {
 	this->mob = mob;
 	this->speedModifier = speedModifier;
-	setRequiredControlFlags(Control::MoveControlFlag);
+    Goal::setRequiredControlFlags(Control::MoveControlFlag);
 }
 
 bool PanicGoal::canUse()
 {
-	if (mob->getLastHurtByMob() == NULL && !mob->isOnFire()) return false;
-	Vec3 *pos = RandomPos::getPos(dynamic_pointer_cast<PathfinderMob>(mob->shared_from_this()), 5, 4);
-	if (pos == NULL) return false;
+	if (mob->getLastHurtByMob() == nullptr && !mob->isOnFire()) return false;
+	const int hurtTimeout = mob->getLastHurtByMobTimestamp();
+	if (hurtTimeout == 0) return false;
+    static thread_local std::mt19937 rng(std::random_device{}());
+	std::uniform_int_distribution<int> dist(60, 100);
+	const int panicDuration = dist(rng);
+	if (mob->tickCount - hurtTimeout > panicDuration) return false;
+	const Vec3* pos = RandomPos::getPos(dynamic_pointer_cast<PathfinderMob>(mob->shared_from_this()), 5, 4);
+	if (pos == nullptr) return false;
 	posX = pos->x;
 	posY = pos->y;
 	posZ = pos->z;
+
 	return true;
 }
 
@@ -31,5 +38,6 @@ void PanicGoal::start()
 
 bool PanicGoal::canContinueToUse()
 {
+	if (mob->getLastHurtByMob() == nullptr && !mob->isOnFire()) return false;
 	return !mob->getNavigation()->isDone();
 }
\ No newline at end of file
diff --git a/Minecraft.World/PanicGoal.h b/Minecraft.World/PanicGoal.h
index 2db64a75..65a4e6d8 100644
--- a/Minecraft.World/PanicGoal.h
+++ b/Minecraft.World/PanicGoal.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Goal.h"
+#include <random>
 
 class PathfinderMob;