summaryrefslogtreecommitdiffstats
path: root/src/Entities/ProjectileEntity.cpp
diff options
context:
space:
mode:
authorJaume Aloy <hircine45@gmail.com>2014-08-19 17:57:32 +0200
committerJaume Aloy <hircine45@gmail.com>2014-08-19 17:57:32 +0200
commit596203e692e6322c7f989b1625cbe03dc1eb6a6c (patch)
tree3c3b53fa00e31a10f68fd96984b59114d041dac5 /src/Entities/ProjectileEntity.cpp
parentChanged if for switch (diff)
downloadcuberite-596203e692e6322c7f989b1625cbe03dc1eb6a6c.tar
cuberite-596203e692e6322c7f989b1625cbe03dc1eb6a6c.tar.gz
cuberite-596203e692e6322c7f989b1625cbe03dc1eb6a6c.tar.bz2
cuberite-596203e692e6322c7f989b1625cbe03dc1eb6a6c.tar.lz
cuberite-596203e692e6322c7f989b1625cbe03dc1eb6a6c.tar.xz
cuberite-596203e692e6322c7f989b1625cbe03dc1eb6a6c.tar.zst
cuberite-596203e692e6322c7f989b1625cbe03dc1eb6a6c.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/ProjectileEntity.cpp5
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);