From 6b9f6c29ec312e23cebd9bc697462cd394b53c93 Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Thu, 17 Jul 2014 00:14:06 +0200 Subject: [PATCH] Actually fix the isWaterBottle() check Fixes #2134 For some reason Bukkit wanted to use Potion(PotionType type, int level) when calling .toPotion(), even though .getDataValue() is 0. --- .../com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d77cf6f38..a0d0fa4bb 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 @@ -39,7 +39,7 @@ public enum PotionStage { } private static boolean isWaterBottle(AlchemyPotion input) { - return input.toPotion(1).getEffects().isEmpty(); + return input.getDataValue() == 0; } public static PotionStage getPotionStage(AlchemyPotion alchemyPotion) {