From dedbdf890aee5363285e889954ca6f1285e52c67 Mon Sep 17 00:00:00 2001
From: TfT_02 <tft_02@hotmail.com>
Date: Tue, 15 Jul 2014 17:50:39 +0200
Subject: [PATCH] Fixed broken isWaterBottle() check

---
 .../nossr50/datatypes/skills/alchemy/AlchemyPotion.java     | 5 +++++
 .../gmail/nossr50/datatypes/skills/alchemy/PotionStage.java | 6 ++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java b/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java
index f67d27cb6..69d2d5baa 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java
@@ -7,6 +7,7 @@ import java.util.Map.Entry;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.PotionMeta;
+import org.bukkit.potion.Potion;
 import org.bukkit.potion.PotionEffect;
 
 public class AlchemyPotion {
@@ -50,6 +51,10 @@ public class AlchemyPotion {
         return potion;
     }
 
+    public Potion toPotion(int amount) {
+        return Potion.fromItemStack(this.toItemStack(amount));
+    }
+
     public short getDataValue() {
         return dataValue;
     }
diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java b/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java
index 68ec76428..d77cf6f38 100644
--- a/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java
+++ b/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java
@@ -1,7 +1,5 @@
 package com.gmail.nossr50.datatypes.skills.alchemy;
 
-import org.bukkit.Material;
-import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.Potion;
 
 public enum PotionStage {
@@ -41,11 +39,11 @@ public enum PotionStage {
     }
 
     private static boolean isWaterBottle(AlchemyPotion input) {
-        return input.getEffects().isEmpty();
+        return input.toPotion(1).getEffects().isEmpty();
     }
 
     public static PotionStage getPotionStage(AlchemyPotion alchemyPotion) {
-        Potion potion = Potion.fromItemStack(new ItemStack(Material.POTION, 1, alchemyPotion.getDataValue()));
+        Potion potion = alchemyPotion.toPotion(1);
 
         int stage = 1;