feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict * feat: TU19 (Dec 2014) Features & Content (#32) * December 2014 files * Working release build * Fix compilation issues * Add sound to Windows64Media * Add DLC content and force Tutorial DLC * Revert "Add DLC content and force Tutorial DLC" This reverts commit 97a43994725008e35fceb984d5549df9c8cea470. * Disable broken light packing * Disable breakpoint during DLC texture map load Allows DLC loading but the DLC textures are still broken * Fix post build not working * ... * fix vs2022 build * fix cmake build --------- Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
#include "net.minecraft.world.entity.animal.h"
|
||||
#include "DefendVillageTargetGoal.h"
|
||||
|
||||
DefendVillageTargetGoal::DefendVillageTargetGoal(VillagerGolem *golem) : TargetGoal(golem, 16, false, true)
|
||||
DefendVillageTargetGoal::DefendVillageTargetGoal(VillagerGolem *golem) : TargetGoal(golem, false, true)
|
||||
{
|
||||
this->golem = golem;
|
||||
setRequiredControlFlags(TargetGoal::TargetFlag);
|
||||
@@ -13,8 +13,22 @@ bool DefendVillageTargetGoal::canUse()
|
||||
{
|
||||
shared_ptr<Village> village = golem->getVillage();
|
||||
if (village == NULL) return false;
|
||||
potentialTarget = weak_ptr<Mob>(village->getClosestAggressor(dynamic_pointer_cast<Mob>(golem->shared_from_this())));
|
||||
return canAttack(potentialTarget.lock(), false);
|
||||
potentialTarget = weak_ptr<LivingEntity>(village->getClosestAggressor(dynamic_pointer_cast<LivingEntity>(golem->shared_from_this())));
|
||||
shared_ptr<LivingEntity> potTarget = potentialTarget.lock();
|
||||
if (!canAttack(potTarget, false))
|
||||
{
|
||||
// look for bad players
|
||||
if (mob->getRandom()->nextInt(20) == 0)
|
||||
{
|
||||
potentialTarget = village->getClosestBadStandingPlayer(dynamic_pointer_cast<LivingEntity>(golem->shared_from_this() ));
|
||||
return canAttack(potTarget, false);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
void DefendVillageTargetGoal::start()
|
||||
|
||||
Reference in New Issue
Block a user