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

Various fixed

Browse Source 
* Fixed potential invalid pointer dereferencing, fixes #1117
* Fixed ender pearls not being loaded properly
This commit is contained in:
Tiger Wang
2014-07-04 16:49:24 +01:00
parent f635066241
commit f4e3c01a71
4 changed files with 111 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/WorldStorage/NBTChunkSerializer.cpp
View File

@@ -619,14 +619,11 @@ void cNBTChunkSerializer::AddProjectileEntity(cProjectileEntity * a_Projectile)
{
ASSERT(!"Unsaved projectile entity!");
}
} // switch (ProjectileKind)
cEntity * Creator = a_Projectile->GetCreator();
if (Creator != NULL)
} // switch (ProjectileKind)
if (!a_Projectile->GetCreatorName().empty())
{
if (Creator->GetEntityType() == cEntity::etPlayer)
{
m_Writer.AddString("ownerName", ((cPlayer *)Creator)->GetName());
}
m_Writer.AddString("ownerName", a_Projectile->GetCreatorName());
}
m_Writer.EndCompound();
}