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

Merge pull request #3489 from cuberite/EntityOwnership

Browse Source 
* Changed entity ownership model to use smart pointers
This commit is contained in:
Tiger Wang
2017-08-18 11:17:56 +01:00
committed by GitHub
parent 05045860c2 4ef47aed62
commit 72d7027861
39 changed files with 484 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ChunkMap.cpp
+12 -11
View File
@@ -1495,38 +1495,38 @@ void cChunkMap::RemoveClientFromChunks(cClientHandle * a_Client)
void cChunkMap::AddEntity(cEntity * a_Entity)
void cChunkMap::AddEntity(OwnedEntity a_Entity)
{
cCSLock Lock(m_CSChunks);
cChunkPtr Chunk = GetChunk(a_Entity->GetChunkX(), a_Entity->GetChunkZ());
if (Chunk == nullptr) // This will assert inside GetChunk in Debug builds
{
LOGWARNING("Entity at %p (%s, ID %d) spawning in a non-existent chunk, the entity is lost.",
static_cast<void *>(a_Entity), a_Entity->GetClass(), a_Entity->GetUniqueID()
static_cast<void *>(a_Entity.get()), a_Entity->GetClass(), a_Entity->GetUniqueID()
);
return;
}
Chunk->AddEntity(a_Entity);
Chunk->AddEntity(std::move(a_Entity));
}
void cChunkMap::AddEntityIfNotPresent(cEntity * a_Entity)
void cChunkMap::AddEntityIfNotPresent(OwnedEntity a_Entity)
{
cCSLock Lock(m_CSChunks);
cChunkPtr Chunk = GetChunk(a_Entity->GetChunkX(), a_Entity->GetChunkZ());
if (Chunk == nullptr) // This will assert inside GetChunk in Debug builds
{
LOGWARNING("Entity at %p (%s, ID %d) spawning in a non-existent chunk, the entity is lost.",
static_cast<void *>(a_Entity), a_Entity->GetClass(), a_Entity->GetUniqueID()
static_cast<void *>(a_Entity.get()), a_Entity->GetClass(), a_Entity->GetUniqueID()
);
return;
}
if (!Chunk->HasEntity(a_Entity->GetUniqueID()))
{
Chunk->AddEntity(a_Entity);
Chunk->AddEntity(std::move(a_Entity));
}
}
@@ -1551,17 +1551,18 @@ bool cChunkMap::HasEntity(UInt32 a_UniqueID)
void cChunkMap::RemoveEntity(cEntity * a_Entity)
OwnedEntity cChunkMap::RemoveEntity(cEntity & a_Entity)
{
cCSLock Lock(m_CSChunks);
cChunkPtr Chunk = a_Entity->GetParentChunk();
cChunkPtr Chunk = a_Entity.GetParentChunk();
// Even if a chunk is not valid, it may still contain entities such as players; make sure to remove them (#1190)
if (Chunk == nullptr)
{
return;
return nullptr;
}
Chunk->RemoveEntity(a_Entity);
// Remove the entity no matter whether the chunk itself is valid or not (#1190)
return Chunk->RemoveEntity(a_Entity);
}