a9be52c41a
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
96 lines
3.0 KiB
C++
96 lines
3.0 KiB
C++
#include "stdafx.h"
|
|
#include "net.minecraft.world.entity.ai.control.h"
|
|
#include "net.minecraft.world.entity.ai.navigation.h"
|
|
#include "net.minecraft.world.entity.ai.sensing.h"
|
|
#include "net.minecraft.world.entity.ai.util.h"
|
|
#include "net.minecraft.world.entity.h"
|
|
#include "net.minecraft.world.entity.animal.h"
|
|
#include "net.minecraft.world.level.h"
|
|
#include "net.minecraft.world.level.pathfinder.h"
|
|
#include "net.minecraft.world.phys.h"
|
|
#include "AvoidPlayerGoal.h"
|
|
|
|
AvoidPlayerGoalEntitySelector::AvoidPlayerGoalEntitySelector(AvoidPlayerGoal *parent)
|
|
{
|
|
m_parent = parent;
|
|
}
|
|
|
|
bool AvoidPlayerGoalEntitySelector::matches(shared_ptr<Entity> entity) const
|
|
{
|
|
return entity->isAlive() && m_parent->mob->getSensing()->canSee(entity);
|
|
}
|
|
|
|
AvoidPlayerGoal::AvoidPlayerGoal(PathfinderMob *mob, const type_info& avoidType, float maxDist, double walkSpeedModifier, double sprintSpeedModifier) : avoidType(avoidType)
|
|
{
|
|
this->mob = mob;
|
|
//this->avoidType = avoidType;
|
|
this->maxDist = maxDist;
|
|
this->walkSpeedModifier = walkSpeedModifier;
|
|
this->sprintSpeedModifier = sprintSpeedModifier;
|
|
this->pathNav = mob->getNavigation();
|
|
setRequiredControlFlags(Control::MoveControlFlag);
|
|
|
|
entitySelector = new AvoidPlayerGoalEntitySelector(this);
|
|
|
|
toAvoid = weak_ptr<Entity>();
|
|
path = nullptr;
|
|
}
|
|
|
|
AvoidPlayerGoal::~AvoidPlayerGoal()
|
|
{
|
|
if(path != nullptr) delete path;
|
|
delete entitySelector;
|
|
}
|
|
|
|
bool AvoidPlayerGoal::canUse()
|
|
{
|
|
if (avoidType == typeid(Player))
|
|
{
|
|
shared_ptr<TamableAnimal> tamableAnimal = dynamic_pointer_cast<TamableAnimal>(mob->shared_from_this());
|
|
if (tamableAnimal != nullptr && tamableAnimal->isTame()) return false;
|
|
toAvoid = weak_ptr<Entity>(mob->level->getNearestPlayer(mob->shared_from_this(), maxDist));
|
|
if (toAvoid.lock() == nullptr) return false;
|
|
}
|
|
else
|
|
{
|
|
vector<shared_ptr<Entity> > *entities = mob->level->getEntitiesOfClass(avoidType, mob->bb->grow(maxDist, 3, maxDist), entitySelector);
|
|
if (entities->empty())
|
|
{
|
|
delete entities;
|
|
return false;
|
|
}
|
|
toAvoid = weak_ptr<Entity>(entities->at(0));
|
|
delete entities;
|
|
}
|
|
|
|
Vec3 *pos = RandomPos::getPosAvoid(dynamic_pointer_cast<PathfinderMob>(mob->shared_from_this()), 16, 7, Vec3::newTemp(toAvoid.lock()->x, toAvoid.lock()->y, toAvoid.lock()->z));
|
|
if (pos == nullptr) return false;
|
|
if (toAvoid.lock()->distanceToSqr(pos->x, pos->y, pos->z) < toAvoid.lock()->distanceToSqr(mob->shared_from_this())) return false;
|
|
delete path;
|
|
path = pathNav->createPath(pos->x, pos->y, pos->z);
|
|
if (path == nullptr) return false;
|
|
if (!path->endsInXZ(pos)) return false;
|
|
return true;
|
|
}
|
|
|
|
bool AvoidPlayerGoal::canContinueToUse()
|
|
{
|
|
return toAvoid.lock() != nullptr && !pathNav->isDone();
|
|
}
|
|
|
|
void AvoidPlayerGoal::start()
|
|
{
|
|
pathNav->moveTo(path, walkSpeedModifier);
|
|
path = nullptr;
|
|
}
|
|
|
|
void AvoidPlayerGoal::stop()
|
|
{
|
|
toAvoid = weak_ptr<Entity>();
|
|
}
|
|
|
|
void AvoidPlayerGoal::tick()
|
|
{
|
|
if (mob->distanceToSqr(toAvoid.lock()) < 7 * 7) mob->getNavigation()->setSpeedModifier(sprintSpeedModifier);
|
|
else mob->getNavigation()->setSpeedModifier(walkSpeedModifier);
|
|
} |