* 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
36 lines
1.1 KiB
C++
36 lines
1.1 KiB
C++
#include "stdafx.h"
|
|
#include "net.minecraft.world.entity.h"
|
|
#include "net.minecraft.world.entity.animal.h"
|
|
#include "OwnerHurtByTargetGoal.h"
|
|
|
|
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<LivingEntity> owner = dynamic_pointer_cast<LivingEntity>( tameAnimal->getOwner() );
|
|
if (owner == nullptr) return 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 != nullptr)
|
|
{
|
|
timestamp = owner->getLastHurtByMobTimestamp();
|
|
}
|
|
|
|
TargetGoal::start();
|
|
} |