Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ModMaker101
2026-03-05 02:23:56 -05:00
committed by GitHub
parent 981c87732c
commit 91e50aa346
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Minecraft.World/PanicGoal.cpp
View File

@@ -10,17 +10,24 @@ PanicGoal::PanicGoal(PathfinderMob *mob, double speedModifier)
{ {
this->mob = mob; this->mob = mob;
this->speedModifier = speedModifier; this->speedModifier = speedModifier;
setRequiredControlFlags(Control::MoveControlFlag); Goal::setRequiredControlFlags(Control::MoveControlFlag);
} }
bool PanicGoal::canUse() bool PanicGoal::canUse()
{ {
if (mob->getLastHurtByMob() == NULL && !mob->isOnFire()) return false; if (mob->getLastHurtByMob() == nullptr && !mob->isOnFire()) return false;
Vec3 *pos = RandomPos::getPos(dynamic_pointer_cast<PathfinderMob>(mob->shared_from_this()), 5, 4); const int hurtTimeout = mob->getLastHurtByMobTimestamp();
if (pos == NULL) return false; 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; posX = pos->x;
posY = pos->y; posY = pos->y;
posZ = pos->z; posZ = pos->z;
return true; return true;
} }
@@ -31,5 +38,6 @@ void PanicGoal::start()
bool PanicGoal::canContinueToUse() bool PanicGoal::canContinueToUse()
{ {
if (mob->getLastHurtByMob() == nullptr && !mob->isOnFire()) return false;
return !mob->getNavigation()->isDone(); return !mob->getNavigation()->isDone();
} }

1
Minecraft.World/PanicGoal.h
View File

@@ -1,6 +1,7 @@
#pragma once #pragma once
#include "Goal.h" #include "Goal.h"
#include <random>
class PathfinderMob; class PathfinderMob;