summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-07-12 03:58:11 +0200
committerarchshift <admin@archshift.com>2014-07-12 03:58:11 +0200
commit8cbd43e0434323dcb1ccba6e1b95a3ca16d35d44 (patch)
tree1941b42b2892b873f498193e677df1f0e37dd2b2 /src/Entities
parentMerge remote-tracking branch 'origin/master' into potions (diff)
downloadcuberite-8cbd43e0434323dcb1ccba6e1b95a3ca16d35d44.tar
cuberite-8cbd43e0434323dcb1ccba6e1b95a3ca16d35d44.tar.gz
cuberite-8cbd43e0434323dcb1ccba6e1b95a3ca16d35d44.tar.bz2
cuberite-8cbd43e0434323dcb1ccba6e1b95a3ca16d35d44.tar.lz
cuberite-8cbd43e0434323dcb1ccba6e1b95a3ca16d35d44.tar.xz
cuberite-8cbd43e0434323dcb1ccba6e1b95a3ca16d35d44.tar.zst
cuberite-8cbd43e0434323dcb1ccba6e1b95a3ca16d35d44.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/ProjectileEntity.cpp2
-rw-r--r--src/Entities/SplashPotionEntity.h8
2 files changed, 9 insertions, 1 deletions
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp
index c2d97589f..9c1161ac3 100644
--- a/src/Entities/ProjectileEntity.cpp
+++ b/src/Entities/ProjectileEntity.cpp
@@ -312,7 +312,7 @@ AString cProjectileEntity::GetMCAClassName(void) const
case pkFireCharge: return "SmallFireball";
case pkEnderPearl: return "ThrownEnderpearl";
case pkExpBottle: return "ThrownExpBottle";
- case pkSplashPotion: return "ThrownPotion";
+ case pkSplashPotion: return "SplashPotion";
case pkWitherSkull: return "WitherSkull";
case pkFirework: return "Firework";
case pkFishingFloat: return ""; // Unknown, perhaps MC doesn't save this?
diff --git a/src/Entities/SplashPotionEntity.h b/src/Entities/SplashPotionEntity.h
index 548ba3a3e..ad656d8ab 100644
--- a/src/Entities/SplashPotionEntity.h
+++ b/src/Entities/SplashPotionEntity.h
@@ -27,6 +27,14 @@ public:
cSplashPotionEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed, cEntityEffect::eType a_EntityEffectType, cEntityEffect a_EntityEffect, int a_PotionName);
+ cEntityEffect::eType GetEntityEffectType() { return m_EntityEffectType; }
+ cEntityEffect GetEntityEffect() { return m_EntityEffect; }
+ int GetPotionName() { return m_PotionName; }
+
+ void SetEntityEffectType(cEntityEffect::eType a_EntityEffectType) { m_EntityEffectType = a_EntityEffectType; }
+ void SetEntityEffect(cEntityEffect a_EntityEffect) { m_EntityEffect = a_EntityEffect; }
+ void SetPotionName(int a_PotionName) { m_PotionName = a_PotionName; }
+
protected:
// cProjectileEntity overrides: