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

Merge branch 'master' into potions

Browse Source
This commit is contained in:
madmaxoft
2014-07-15 09:01:32 +02:00
parent 40bb98510a e2a1118f88
commit 8e946da8ac
72 changed files with 700 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Entities/ProjectileEntity.cpp
View File

@@ -244,7 +244,7 @@ cProjectileEntity::cProjectileEntity(eKind a_Kind, cEntity * a_Creator, const Ve
cProjectileEntity * cProjectileEntity::Create(eKind a_Kind, cEntity * a_Creator, double a_X, double a_Y, double a_Z, const cItem & a_Item, const Vector3d * a_Speed)
cProjectileEntity * cProjectileEntity::Create(eKind a_Kind, cEntity * a_Creator, double a_X, double a_Y, double a_Z, const cItem * a_Item, const Vector3d * a_Speed)
{
Vector3d Speed;
if (a_Speed != NULL)
@@ -264,12 +264,13 @@ cProjectileEntity * cProjectileEntity::Create(eKind a_Kind, cEntity * a_Creator,
case pkWitherSkull: return new cWitherSkullEntity (a_Creator, a_X, a_Y, a_Z, Speed);
case pkFirework:
{
if (a_Item.m_FireworkItem.m_Colours.empty())
ASSERT(a_Item != NULL);
if (a_Item->m_FireworkItem.m_Colours.empty())
{
return NULL;
}
return new cFireworkEntity(a_Creator, a_X, a_Y, a_Z, a_Item);
return new cFireworkEntity(a_Creator, a_X, a_Y, a_Z, *a_Item);
}
}