2 files changed, 21 insertions, 101 deletions

diff --git a/Server/brewing.txt b/Server/brewing.txt
index d5fb5b8d6..d19e40e3a 100644
--- a/Server/brewing.txt
+++ b/Server/brewing.txt
@@ -12,10 +12,10 @@
 
 ### Primary ###
 # Akward Potion
-0 + netherwart = 16
+0 + netherwart = 8208
 
 # Mundane Potion
-0 + redstonedust = 64
+0 + redstonedust = 8192
 0 + ghasttear = 8192
 0 + glisteringmelon = 8192
 0 + blazepowder = 8192
@@ -25,10 +25,10 @@
 0 + rabbitsfoot = 8192
 
 # Thick Potion
-0 + glowstonedust = 32
+0 + glowstonedust = 8224
 
 # Potion of Weakness
-0 + fermentedspidereye = 8264
+0 + fermentedspidereye = 8200
 
 
 
@@ -38,42 +38,37 @@
 ## Positive ##
 
 # Potion of Healing
-16 + glisteringmelon = 8197
+8208 + glisteringmelon = 8197
 
 # Potion of Fire Resistance
-16 + magmacream = 8195
+8208 + magmacream = 8195
 
 # Potion of Regeneration
-16 + ghasttear = 8193
+8208 + ghasttear = 8193
 
 # Potion of Strength
-16 + blazepowder = 8201
+8208 + blazepowder = 8201
 
 # Potion of Swiftness
-16 + sugar = 8194
+8208 + sugar = 8194
 
 # Potion of Night Vision
-16 + goldencarrot = 8198
+8208 + goldencarrot = 8198
 
 # Potion of Water Breathing
-16 + pufferfish = 8205
+8208 + pufferfish = 8205
 
 # Potion of Leaping
-16 + rabbitsfoot = 8203
+8208 + rabbitsfoot = 8203
 
 
 ## Negative ##
 
 # Potion of Poison
-16 + spidereye = 8196
-
-# Potion of Weakness
-16 + fermentedspidereye = 8200
-32 + fermentedspidereye = 8200
-64 + fermentedspidereye = 8200
+8208 + spidereye = 8196
 
 # Potion of Weakness (extended)
-8192 + fermentedspidereye = 8264
+8200 + redstonedust = 8264
 
 
 
@@ -84,35 +79,27 @@
 
 # Potion of Fire Resistance (extended)
 8195 + redstonedust = 8259
-8227 + redstonedust = 8259
 
 # Potion of Healing II
 8197 + glowstonedust = 8229
-8261 + glowstonedust = 8229
 
 # Potion of Regeneration (extended)
 8193 + redstonedust = 8257
-8225 + redstonedust = 8257
 
 # Potion of Regeneration II
 8193 + glowstonedust = 8225
-8257 + glowstonedust = 8225
 
 # Potion of Strength (extended)
 8201 + redstonedust = 8265
-8233 + redstonedust = 8265
 
 # Potion of Strength II
 8201 + glowstonedust = 8233
-8265 + glowstonedust = 8233
 
 # Potion of Swiftness (extended)
 8194 + redstonedust = 8258
-8226 + redstonedust = 8258
 
 # Potion of Swiftness II
 8194 + glowstonedust = 8226
-8258 + glowstonedust = 8226
 
 # Potion of Night Vision (extended)
 8198 + redstonedust = 8262
@@ -128,15 +115,12 @@
 
 # Potion of Water Breathing (extended)
 8205 + redstonedust = 8269
-8237 + redstonedust = 8269
 
 # Potion of Leaping II
 8203 + glowstonedust = 8235
-8267 + glowstonedust = 8235
 
 # Potion of Leaping (extended)
 8203 + redstonedust = 8267
-8235 + redstonedust = 8267
 
 
 ## Negative ##
@@ -152,84 +136,20 @@
 
 # Potion of Harming II
 8204 + glowstonedust = 8236
-8268 + glowstonedust = 8236
 
 # Potion of Poison (extended)
 8196 + redstonedust = 8260
-8228 + redstonedust = 8260
 
 # Potion of Poison II
 8196 + glowstonedust = 8228
-8260 + glowstonedust = 8228
 
 # Potion of Slowness
 8194 + fermentedspidereye = 8202
-8195 + fermentedspidereye = 8202
 8203 + fermentedspidereye = 8202
 
 # Potion of Slowness (extended)
 8202 + redstonedust = 8266
-8234 + redstonedust = 8266
 
 # Potion of Slowness (extended)
 8258 + fermentedspidereye = 8266
-8259 + fermentedspidereye = 8266
 8267 + fermentedspidereye = 8266
-
-# Potion of Weakness
-8193 + fermentedspidereye = 8200
-8201 + fermentedspidereye = 8200
-
-# Potion of Weakness (extended)
-8257 + fermentedspidereye = 8264
-8265 + fermentedspidereye = 8264
-
-# Potion of Weakness (extended)
-8200 + redstonedust = 8264
-8232 + redstonedust = 8264
-
-
-
-
-### Reverted ###
-
-## Glowstone ##
-
-# Potion of Fire Resistance (reverted)
-8259 + glowstonedust = 8227
-
-# Potion of Night Vision (reverted)
-8262 + glowstonedust = 8230
-
-# Potion of Weakness (reverted)
-8264 + glowstonedust = 8232
-
-# Potion of Slowness (reverted)
-8266 + glowstonedust = 8234
-
-# Potion of Water Breathing (reverted)
-8269 + glowstonedust = 8237
-
-
-## Redstone ##
-
-# Potion of Healing (reverted)
-8229 + redstonedust = 8261
-
-# Potion of Harming (reverted)
-8236 + redstonedust = 8268
-
-
-## Fermented Spider Eye ##
-
-# Potion of Harming (reverted)
-8260 + fermentedspidereye = 8268
-8261 + fermentedspidereye = 8268
-
-# Potion of Slowness (reverted)
-8226 + fermentedspidereye = 8234
-8227 + fermentedspidereye = 8234
-
-# Potion of Weakness (reverted)
-8225 + fermentedspidereye = 8232
-8233 + fermentedspidereye = 8232
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