From 1ca6fd6b961ea730c1691c74b591247f5a07ccb2 Mon Sep 17 00:00:00 2001 From: Rasheeq Date: Sun, 13 Dec 2015 06:51:39 -0500 Subject: [PATCH] Fix #1588: chordata ring stops player from drowning with no mana. --- .../botania/common/item/equipment/bauble/ItemWaterRing.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java index 6ccc36259..3b3c5d645 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemWaterRing.java @@ -58,7 +58,8 @@ public class ItemWaterRing extends ItemBauble implements IManaUsingItem { if(player.getAir() <= 1 && player instanceof EntityPlayer) { int mana = ManaItemHandler.requestMana(stack, (EntityPlayer) player, 300, true); - player.setAir(mana); + if(mana > 0) // If zero gets in the player has no air but won't drown. + player.setAir(mana); } } else onUnequipped(stack, player); }