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

removing an assert + correcting a distance calculation bug

Browse Source
This commit is contained in:
mgueydan 2013-09-08 12:04:20 +02:00
parent 668b6edaa7
commit e6e85168bc
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/MobProximityCounter.cpp
View File

@ -14,12 +14,18 @@ void cMobProximityCounter::CollectMob(cEntity& a_Monster, cChunk& a_Chunk, doubl
{ {
sDistanceAndChunk newDistanceAndChunck(a_Distance,a_Chunk); sDistanceAndChunk newDistanceAndChunck(a_Distance,a_Chunk);
std::pair<tMonsterToDistance::iterator,bool> result = m_MonsterToDistance.insert(tMonsterToDistance::value_type(&a_Monster,newDistanceAndChunck)); std::pair<tMonsterToDistance::iterator,bool> result = m_MonsterToDistance.insert(tMonsterToDistance::value_type(&a_Monster,newDistanceAndChunck));
assert(result.second); if (!result.second)
{
ASSERT("A collected Monster was not found inside distance map using find(), but insert() said there already is a key for it");
}
} }
else else
{ {
it->second.m_Distance = a_Distance; if (a_Distance < it->second.m_Distance)
it->second.m_Chunk = a_Chunk; {
it->second.m_Distance = a_Distance;
it->second.m_Chunk = a_Chunk;
}
} }
m_EligibleForSpawnChunks.insert(&a_Chunk); m_EligibleForSpawnChunks.insert(&a_Chunk);