From be17ae69a04203978a833bd050e5ec168647115d Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sat, 19 Sep 2015 22:40:46 +0100 Subject: [PATCH] Fixed the Mana in a Bottle allowing for water to be placed in the nether and for the roof of the nether being accessed. Closes #1362 --- .../vazkii/botania/common/item/ItemBottledMana.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java index 5fa53d5b9..b831a8bb3 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBottledMana.java +++ b/src/main/java/vazkii/botania/common/item/ItemBottledMana.java @@ -57,7 +57,7 @@ public class ItemBottledMana extends ItemMod { break; } case 1 : { // Water - if(!player.worldObj.isRemote) + if(!player.worldObj.isRemote && !player.worldObj.provider.isHellWorld) player.worldObj.setBlock(MathHelper.floor_double(player.posX), MathHelper.floor_double(player.posY), MathHelper.floor_double(player.posZ), Blocks.flowing_water); break; } @@ -72,9 +72,12 @@ public class ItemBottledMana extends ItemMod { break; } case 4 : { // Mega Jump - if(!player.worldObj.isRemote) - player.addPotionEffect(new PotionEffect(Potion.resistance.id, 300, 5)); - player.motionY = 6; + if(!player.worldObj.provider.isHellWorld) { + if(!player.worldObj.isRemote) + player.addPotionEffect(new PotionEffect(Potion.resistance.id, 300, 5)); + player.motionY = 6; + } + break; } case 5 : { // Randomly set HP @@ -103,7 +106,6 @@ public class ItemBottledMana extends ItemMod { player.rotationPitch = (float) Math.random() * 360F; player.rotationYaw = (float) Math.random() * 180F; - break; } case 9 : { // Highest Possible