diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-09-02 20:11:38 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-09-02 20:11:38 +0200 |
| commit | e431bb4e63b03a4137e4264beccfab0fffea6e36 (patch) | |
| tree | e5442606b9e5be82070dc733b6162a76ed89ac87 /src/Entities/ProjectileEntity.cpp | |
| parent | Changed the IsEnchantable() comment. (diff) | |
| parent | Re-added alternate spellings of darkgraywool. (diff) | |
| download | cuberite-e431bb4e63b03a4137e4264beccfab0fffea6e36.tar cuberite-e431bb4e63b03a4137e4264beccfab0fffea6e36.tar.gz cuberite-e431bb4e63b03a4137e4264beccfab0fffea6e36.tar.bz2 cuberite-e431bb4e63b03a4137e4264beccfab0fffea6e36.tar.lz cuberite-e431bb4e63b03a4137e4264beccfab0fffea6e36.tar.xz cuberite-e431bb4e63b03a4137e4264beccfab0fffea6e36.tar.zst cuberite-e431bb4e63b03a4137e4264beccfab0fffea6e36.zip | |
Diffstat (limited to 'src/Entities/ProjectileEntity.cpp')
| -rw-r--r-- | src/Entities/ProjectileEntity.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp index 43023ec28..acc9bd674 100644 --- a/src/Entities/ProjectileEntity.cpp +++ b/src/Entities/ProjectileEntity.cpp @@ -222,7 +222,8 @@ cProjectileEntity::cProjectileEntity(eKind a_Kind, cEntity * a_Creator, double a m_ProjectileKind(a_Kind), m_CreatorData( ((a_Creator != NULL) ? a_Creator->GetUniqueID() : -1), - ((a_Creator != NULL) ? (a_Creator->IsPlayer() ? ((cPlayer *)a_Creator)->GetName() : "") : "") + ((a_Creator != NULL) ? (a_Creator->IsPlayer() ? ((cPlayer *)a_Creator)->GetName() : "") : ""), + ((a_Creator != NULL) ? a_Creator->GetEquippedWeapon().m_Enchantments : cEnchantments()) ), m_IsInGround(false) { @@ -235,7 +236,7 @@ cProjectileEntity::cProjectileEntity(eKind a_Kind, cEntity * a_Creator, double a cProjectileEntity::cProjectileEntity(eKind a_Kind, cEntity * a_Creator, const Vector3d & a_Pos, const Vector3d & a_Speed, double a_Width, double a_Height) : super(etProjectile, a_Pos.x, a_Pos.y, a_Pos.z, a_Width, a_Height), m_ProjectileKind(a_Kind), - m_CreatorData(a_Creator->GetUniqueID(), a_Creator->IsPlayer() ? ((cPlayer *)a_Creator)->GetName() : ""), + m_CreatorData(a_Creator->GetUniqueID(), a_Creator->IsPlayer() ? ((cPlayer *)a_Creator)->GetName() : "", a_Creator->GetEquippedWeapon().m_Enchantments), m_IsInGround(false) { SetSpeed(a_Speed); |