Remove AUTO_VAR macro and _toString function (#592)
This commit is contained in:
@@ -24,24 +24,31 @@ bool TakeFlowerGoal::canUse()
|
||||
if (!villager->level->isDay()) return false;
|
||||
|
||||
vector<shared_ptr<Entity> > *golems = villager->level->getEntitiesOfClass(typeid(VillagerGolem), villager->bb->grow(6, 2, 6));
|
||||
if (golems->size() == 0)
|
||||
if ( golems == nullptr )
|
||||
return false;
|
||||
|
||||
if ( golems->size() == 0)
|
||||
{
|
||||
delete golems;
|
||||
return false;
|
||||
}
|
||||
|
||||
//for (Entity e : golems)
|
||||
for(AUTO_VAR(it,golems->begin()); it != golems->end(); ++it)
|
||||
{
|
||||
shared_ptr<VillagerGolem> vg = dynamic_pointer_cast<VillagerGolem>(*it);
|
||||
if (vg->getOfferFlowerTick() > 0)
|
||||
for (auto entity : *golems )
|
||||
{
|
||||
if ( entity == nullptr )
|
||||
continue;
|
||||
|
||||
// safe to call std::static_pointer_cast because of getEntitiesOfClass(typeid(VillagerGolem), ...) makes sure we do not have entities of any other type.
|
||||
auto vg = std::static_pointer_cast<VillagerGolem>(entity);
|
||||
if ( vg && vg->getOfferFlowerTick() > 0)
|
||||
{
|
||||
golem = weak_ptr<VillagerGolem>(vg);
|
||||
break;
|
||||
golem = vg;
|
||||
delete golems;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
delete golems;
|
||||
return golem.lock() != NULL;
|
||||
return false;
|
||||
}
|
||||
|
||||
bool TakeFlowerGoal::canContinueToUse()
|
||||
|
||||
Reference in New Issue
Block a user