From 69580d86b069d9cc3e3c20a44f718f961ffbb2e4 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Thu, 13 Nov 2014 22:18:12 +0000 Subject: [PATCH] Having Night Vision on a Tainted Blood Pendant will no longer make the brightness blink obnoxiously. Closes #368. --- .../common/item/equipment/bauble/ItemBloodPendant.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java index 5647ab445..1e1f06a57 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java @@ -131,8 +131,9 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre boolean doRand = cost < 1; if(ManaItemHandler.requestManaExact(stack, eplayer, (int) Math.ceil(cost), false)) { PotionEffect currentEffect = player.getActivePotionEffect(Potion.potionTypes[effect.getPotionID()]); - if(currentEffect == null || currentEffect.getDuration() < 3) { - PotionEffect applyEffect = new PotionEffect(effect.getPotionID(), 80, effect.getAmplifier()); + boolean nightVision = effect.getPotionID() == Potion.nightVision.id; + if(currentEffect == null || currentEffect.getDuration() < (nightVision ? 205 : 3)) { + PotionEffect applyEffect = new PotionEffect(effect.getPotionID(), nightVision ? 285 : 80, effect.getAmplifier()); player.addPotionEffect(applyEffect); }