summaryrefslogtreecommitdiffstats
path: root/src/WorldStorage
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-07-19 13:29:50 +0200
committerMattes D <github@xoft.cz>2014-07-19 13:29:50 +0200
commite9a9bbf02e563b9ea121aefe0f82ed5dd74d1686 (patch)
treeca52fbde3b744760e8dd9c1845d0ac7714a432ce /src/WorldStorage
parentRenamed AllToLua_lua script. (diff)
parentSplash potions: Renamed PotionParticleType to PotionColor for clarity (diff)
downloadcuberite-e9a9bbf02e563b9ea121aefe0f82ed5dd74d1686.tar
cuberite-e9a9bbf02e563b9ea121aefe0f82ed5dd74d1686.tar.gz
cuberite-e9a9bbf02e563b9ea121aefe0f82ed5dd74d1686.tar.bz2
cuberite-e9a9bbf02e563b9ea121aefe0f82ed5dd74d1686.tar.lz
cuberite-e9a9bbf02e563b9ea121aefe0f82ed5dd74d1686.tar.xz
cuberite-e9a9bbf02e563b9ea121aefe0f82ed5dd74d1686.tar.zst
cuberite-e9a9bbf02e563b9ea121aefe0f82ed5dd74d1686.zip
Diffstat (limited to '')
-rw-r--r--src/WorldStorage/NBTChunkSerializer.cpp2
-rw-r--r--src/WorldStorage/WSSAnvil.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/WorldStorage/NBTChunkSerializer.cpp b/src/WorldStorage/NBTChunkSerializer.cpp
index e68903b26..62db302ef 100644
--- a/src/WorldStorage/NBTChunkSerializer.cpp
+++ b/src/WorldStorage/NBTChunkSerializer.cpp
@@ -613,7 +613,7 @@ void cNBTChunkSerializer::AddProjectileEntity(cProjectileEntity * a_Projectile)
m_Writer.AddInt("EffectDuration", (Int16)Potion->GetEntityEffect().GetDuration());
m_Writer.AddShort("EffectIntensity", Potion->GetEntityEffect().GetIntensity());
m_Writer.AddDouble("EffectDistanceModifier", Potion->GetEntityEffect().GetDistanceModifier());
- m_Writer.AddInt("PotionName", Potion->GetPotionParticleType());
+ m_Writer.AddInt("PotionName", Potion->GetPotionColor());
}
case cProjectileEntity::pkGhastFireball:
{
diff --git a/src/WorldStorage/WSSAnvil.cpp b/src/WorldStorage/WSSAnvil.cpp
index b4048b097..663d489bc 100644
--- a/src/WorldStorage/WSSAnvil.cpp
+++ b/src/WorldStorage/WSSAnvil.cpp
@@ -1681,7 +1681,7 @@ void cWSSAnvil::LoadSplashPotionFromNBT(cEntityList & a_Entities, const cParsedN
SplashPotion->SetEntityEffectType((cEntityEffect::eType) a_NBT.FindChildByName(a_TagIdx, "EffectType"));
SplashPotion->SetEntityEffect(cEntityEffect(EffectDuration, EffectIntensity, EffectDistanceModifier));
- SplashPotion->SetPotionParticleType(a_NBT.FindChildByName(a_TagIdx, "PotionName"));
+ SplashPotion->SetPotionColor(a_NBT.FindChildByName(a_TagIdx, "PotionName"));
// Store the new splash potion in the entities list:
a_Entities.push_back(SplashPotion.release());