diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-07-13 17:03:29 +0200 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-07-13 17:03:29 +0200 |
| commit | 6892b448db5f897876657a865fd5bea2785d30a9 (patch) | |
| tree | f93708e65288648bda310c2b9e11c55663a2fa30 /src/Entities/ProjectileEntity.cpp | |
| parent | Fixed Issue with Comparing agast the wrong chest, potentially causing crashes. (diff) | |
| parent | Merge pull request #1178 from mc-server/projectilefix (diff) | |
| download | cuberite-6892b448db5f897876657a865fd5bea2785d30a9.tar cuberite-6892b448db5f897876657a865fd5bea2785d30a9.tar.gz cuberite-6892b448db5f897876657a865fd5bea2785d30a9.tar.bz2 cuberite-6892b448db5f897876657a865fd5bea2785d30a9.tar.lz cuberite-6892b448db5f897876657a865fd5bea2785d30a9.tar.xz cuberite-6892b448db5f897876657a865fd5bea2785d30a9.tar.zst cuberite-6892b448db5f897876657a865fd5bea2785d30a9.zip | |
Diffstat (limited to 'src/Entities/ProjectileEntity.cpp')
| -rw-r--r-- | src/Entities/ProjectileEntity.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp index 0bb34019e..b5ef5c90a 100644 --- a/src/Entities/ProjectileEntity.cpp +++ b/src/Entities/ProjectileEntity.cpp @@ -243,7 +243,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) @@ -262,12 +262,13 @@ cProjectileEntity * cProjectileEntity::Create(eKind a_Kind, cEntity * a_Creator, case pkExpBottle: return new cExpBottleEntity (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); } } |