flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Rewrite mob tick code

Browse Source
This commit is contained in:
LogicParrot 2016-02-19 11:08:55 +02:00
parent fa53e98419
commit ebd80805ca
1 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/World.cpp
View File

@ -1135,28 +1135,51 @@ void cWorld::TickMobs(std::chrono::milliseconds a_Dt)
} // for i - AllFamilies[] } // for i - AllFamilies[]
} // if (Spawning enabled) } // if (Spawning enabled)
// move close mobs class cCallback : public cEntityCallback
cMobProximityCounter::sIterablePair allCloseEnoughToMoveMobs = MobCensus.GetProximityCounter().getMobWithinThosesDistances(-1, 64 * 16);// MG TODO : deal with this magic number (the 16 is the size of a block)
for (cMobProximityCounter::tDistanceToMonster::const_iterator itr = allCloseEnoughToMoveMobs.m_Begin; itr != allCloseEnoughToMoveMobs.m_End; ++itr)
{ {
cEntity & Entity = itr->second.m_Monster; virtual bool Item(cEntity * a_Entity) override
cChunk * Chunk = Entity.GetParentChunk();
if (!Entity.IsTicking())
{ {
++itr; if (!a_Entity->IsMob())
continue; {
} return false;
ASSERT(Chunk == &(itr->second.m_Chunk)); }
Entity.Tick(a_Dt, *Chunk); if (!a_Entity->IsTicking())
ASSERT(Chunk == &(itr->second.m_Chunk)); {
} return false;
}
// remove too far mobs auto Monster = static_cast<cMonster *>(a_Entity);
cMobProximityCounter::sIterablePair allTooFarMobs = MobCensus.GetProximityCounter().getMobWithinThosesDistances(128 * 16, -1);// MG TODO : deal with this magic number (the 16 is the size of a block) ASSERT(Monster->GetParentChunk() != nullptr); // A ticking entity must have a valid parent chunk
for (cMobProximityCounter::tDistanceToMonster::const_iterator itr = allTooFarMobs.m_Begin; itr != allTooFarMobs.m_End; ++itr)
{ // Tick close mobs
itr->second.m_Monster.Destroy(true); if (Monster->GetParentChunk()->HasAnyClients())
} {
Monster->Tick(m_Dt, *(a_Entity->GetParentChunk()));
}
// Destroy far hostile mobs
else if ((Monster->GetMobFamily() == cMonster::eFamily::mfHostile))
{
if (Monster->GetMobType() != eMonsterType::mtWolf)
{
Monster->Destroy(true);
}
else
{
auto Wolf = static_cast<cWolf *>(Monster);
if (Wolf->IsAngry())
{
Monster->Destroy(true);
}
}
}
return false;
}
public:
std::chrono::milliseconds m_Dt;
} Callback;
Callback.m_Dt = a_Dt;
ForEachEntity(Callback);
} }