summaryrefslogtreecommitdiffstats
path: root/src/Entities/SplashPotionEntity.cpp
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-07-19 11:51:39 +0200
committerarchshift <admin@archshift.com>2014-07-19 11:51:39 +0200
commitf5bcfdc58c7b5d69abbb222787bb2229c0b54088 (patch)
treeca52fbde3b744760e8dd9c1845d0ac7714a432ce /src/Entities/SplashPotionEntity.cpp
parentFixed splash potion color on toss (diff)
downloadcuberite-f5bcfdc58c7b5d69abbb222787bb2229c0b54088.tar
cuberite-f5bcfdc58c7b5d69abbb222787bb2229c0b54088.tar.gz
cuberite-f5bcfdc58c7b5d69abbb222787bb2229c0b54088.tar.bz2
cuberite-f5bcfdc58c7b5d69abbb222787bb2229c0b54088.tar.lz
cuberite-f5bcfdc58c7b5d69abbb222787bb2229c0b54088.tar.xz
cuberite-f5bcfdc58c7b5d69abbb222787bb2229c0b54088.tar.zst
cuberite-f5bcfdc58c7b5d69abbb222787bb2229c0b54088.zip
Diffstat (limited to 'src/Entities/SplashPotionEntity.cpp')
-rw-r--r--src/Entities/SplashPotionEntity.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Entities/SplashPotionEntity.cpp b/src/Entities/SplashPotionEntity.cpp
index c379ab3fb..056700629 100644
--- a/src/Entities/SplashPotionEntity.cpp
+++ b/src/Entities/SplashPotionEntity.cpp
@@ -76,12 +76,12 @@ cSplashPotionEntity::cSplashPotionEntity(
const Vector3d & a_Speed,
cEntityEffect::eType a_EntityEffectType,
cEntityEffect a_EntityEffect,
- int a_PotionParticleType
+ int a_PotionColor
) :
super(pkSplashPotion, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25),
m_EntityEffectType(a_EntityEffectType),
m_EntityEffect(a_EntityEffect),
- m_PotionParticleType(a_PotionParticleType)
+ m_PotionColor(a_PotionColor)
{
SetSpeed(a_Speed);
}
@@ -116,7 +116,7 @@ void cSplashPotionEntity::Splash(const Vector3d & a_HitPos)
cSplashPotionCallback Callback(a_HitPos, m_EntityEffectType, m_EntityEffect);
m_World->ForEachEntity(Callback);
- m_World->BroadcastSoundParticleEffect(2002, (int)a_HitPos.x, (int)a_HitPos.y, (int)a_HitPos.z, m_PotionParticleType);
+ m_World->BroadcastSoundParticleEffect(2002, (int)a_HitPos.x, (int)a_HitPos.y, (int)a_HitPos.z, m_PotionColor);
}
@@ -125,7 +125,7 @@ void cSplashPotionEntity::Splash(const Vector3d & a_HitPos)
void cSplashPotionEntity::SpawnOn(cClientHandle & a_Client)
{
- a_Client.SendSpawnObject(*this, 73, m_PotionParticleType, ANGLE_TO_PROTO(GetYaw()), ANGLE_TO_PROTO(GetPitch()));
+ a_Client.SendSpawnObject(*this, 73, m_PotionColor, ANGLE_TO_PROTO(GetYaw()), ANGLE_TO_PROTO(GetPitch()));
a_Client.SendEntityMetadata(*this);
}