Fixed the invisibility cloak not using up mana properly. Closes #1992

This commit is contained in:
Vasco Lavos committed 2016-10-29 20:52:39 +01:00
1 parent 5c3a2c700b
commit 936f02ffc9
1 file changed
+13 -7
@@ -11,8 +11,6 @@
package vazkii.botania.common.item.equipment.bauble;
import baubles.api.BaubleType;
import baubles.api.BaublesApi;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
@@ -36,7 +34,7 @@ public class ItemInvisibilityCloak extends ItemBauble implements IManaUsingItem
@Override
public void onUnequipped(ItemStack stack, EntityLivingBase player) {
PotionEffect effect = player.getActivePotionEffect(MobEffects.INVISIBILITY);
if(effect != null && player instanceof EntityPlayer && effect.getAmplifier() == -42 && ManaItemHandler.requestManaExact(stack, (EntityPlayer) player, 2, true))
if(effect != null && player instanceof EntityPlayer && effect.getAmplifier() == -42)
player.removePotionEffect(MobEffects.INVISIBILITY);
}
@@ -44,10 +42,18 @@ public class ItemInvisibilityCloak extends ItemBauble implements IManaUsingItem
public void onWornTick(ItemStack stack, EntityLivingBase player) {
super.onWornTick(stack, player);
PotionEffect effect = player.getActivePotionEffect(MobEffects.NIGHT_VISION);
if(effect == null) {
PotionEffect neweffect = new PotionEffect(MobEffects.INVISIBILITY, Integer.MAX_VALUE, -42, true, true);
player.addPotionEffect(neweffect);
if(player instanceof EntityPlayer && !player.worldObj.isRemote) {
int manaCost = 2;
boolean hasMana = ManaItemHandler.requestManaExact(stack, (EntityPlayer) player, manaCost, false);
if(!hasMana)
onUnequipped(stack, player);
else {
if(player.getActivePotionEffect(MobEffects.INVISIBILITY) != null)
player.removePotionEffect(MobEffects.INVISIBILITY);
player.addPotionEffect(new PotionEffect(MobEffects.INVISIBILITY, Integer.MAX_VALUE, -42, true, true));
}
}
}