EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Check if input is a water bottle first

Browse Source
This commit is contained in:
TfT_02 2014-06-09 22:55:03 +02:00
parent b107a8dc7c
commit 1becc874ba
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java
View File

@ -33,13 +33,17 @@ public enum PotionStage {
public static PotionStage getPotionStage(AlchemyPotion input, AlchemyPotion output) { public static PotionStage getPotionStage(AlchemyPotion input, AlchemyPotion output) {
PotionStage potionStage = getPotionStage(output); PotionStage potionStage = getPotionStage(output);
if (getPotionStage(input) == potionStage) { if (!isWaterBottle(input) && getPotionStage(input) == potionStage) {
potionStage = PotionStage.FIVE; potionStage = PotionStage.FIVE;
} }
return potionStage; return potionStage;
} }
private static boolean isWaterBottle(AlchemyPotion input) {
return input.getEffects().isEmpty();
}
public static PotionStage getPotionStage(AlchemyPotion alchemyPotion) { public static PotionStage getPotionStage(AlchemyPotion alchemyPotion) {
Potion potion = Potion.fromItemStack(new ItemStack(Material.POTION, 1, alchemyPotion.getDataValue())); Potion potion = Potion.fromItemStack(new ItemStack(Material.POTION, 1, alchemyPotion.getDataValue()));