From 69e48d116e1ed8f77c19c37277aff775d4d63586 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 13 May 2017 22:53:06 -0500 Subject: [PATCH] Fix #2262 --- src/main/java/vazkii/botania/common/item/ItemManaGun.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/ItemManaGun.java b/src/main/java/vazkii/botania/common/item/ItemManaGun.java index 650bd0a36..c24e3e714 100644 --- a/src/main/java/vazkii/botania/common/item/ItemManaGun.java +++ b/src/main/java/vazkii/botania/common/item/ItemManaGun.java @@ -200,7 +200,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { String name; TextFormatting formatting = i == pos ? TextFormatting.GREEN : TextFormatting.GRAY; ItemStack lensAt = getLensAtPos(par1ItemStack, i); - if(lensAt == null) + if(lensAt.isEmpty()) name = I18n.format("botaniamisc.clipEmpty"); else name = lensAt.getDisplayName(); addStringToTooltip(formatting + " - " + name, stacks); @@ -237,7 +237,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { public static void rotatePos(ItemStack stack) { int currPos = getClipPos(stack); - boolean acceptEmpty = getLensAtPos(stack, currPos) != null; + boolean acceptEmpty = !getLensAtPos(stack, currPos).isEmpty(); int[] slots = new int[CLIP_SLOTS - 1]; int index = 0; @@ -248,7 +248,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem { for(int i : slots) { ItemStack lensAt = getLensAtPos(stack, i); - if(acceptEmpty || lensAt != null) { + if(acceptEmpty || !lensAt.isEmpty()) { setClipPos(stack, i); return; }