summaryrefslogtreecommitdiffstats
path: root/src/Protocol
diff options
context:
space:
mode:
authorMat <mail@mathias.is>2020-04-04 16:16:36 +0200
committerGitHub <noreply@github.com>2020-04-04 16:16:36 +0200
commit3eaab7354097616fc451023b72e540e430d228ce (patch)
treea88b4e6253806809370cbb0eca4b08ef963fed72 /src/Protocol
parentImplement wither skeletons (#4563) (diff)
downloadcuberite-3eaab7354097616fc451023b72e540e430d228ce.tar
cuberite-3eaab7354097616fc451023b72e540e430d228ce.tar.gz
cuberite-3eaab7354097616fc451023b72e540e430d228ce.tar.bz2
cuberite-3eaab7354097616fc451023b72e540e430d228ce.tar.lz
cuberite-3eaab7354097616fc451023b72e540e430d228ce.tar.xz
cuberite-3eaab7354097616fc451023b72e540e430d228ce.tar.zst
cuberite-3eaab7354097616fc451023b72e540e430d228ce.zip
Diffstat (limited to 'src/Protocol')
-rw-r--r--src/Protocol/Protocol_1_9.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Protocol/Protocol_1_9.cpp b/src/Protocol/Protocol_1_9.cpp
index b6fa567fd..b6dba378b 100644
--- a/src/Protocol/Protocol_1_9.cpp
+++ b/src/Protocol/Protocol_1_9.cpp
@@ -3265,19 +3265,13 @@ void cProtocol_1_9_0::ParseItemMetadata(cItem & a_Item, const AString & a_Metada
continue;
}
- if (PotionEffect.find("water") != AString::npos)
- {
- a_Item.m_ItemDamage = 0;
- // Water bottles shouldn't have other bits set on them; exit early.
- continue;
- }
if (PotionEffect.find("empty") != AString::npos)
{
a_Item.m_ItemDamage = 0;
}
else if (PotionEffect.find("mundane") != AString::npos)
{
- a_Item.m_ItemDamage = 0;
+ a_Item.m_ItemDamage = 64;
}
else if (PotionEffect.find("thick") != AString::npos)
{
@@ -3339,6 +3333,12 @@ void cProtocol_1_9_0::ParseItemMetadata(cItem & a_Item, const AString & a_Metada
{
a_Item.m_ItemDamage = 14;
}
+ else if (PotionEffect.find("water") != AString::npos)
+ {
+ a_Item.m_ItemDamage = 0;
+ // Water bottles shouldn't have other bits set on them; exit early.
+ continue;
+ }
else
{
// Note: luck potions are not handled and will reach this location