From a945201cecc2bbd0b0edd0ab9e2d7aed6d91c776 Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Wed, 15 Jul 2020 00:21:37 +0100 Subject: [PATCH] Use the same test in the new spell icon as the new spell book tooltip --- .../wizardry/client/gui/WizardTradeTweaksHandler.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/electroblob/wizardry/client/gui/WizardTradeTweaksHandler.java b/src/main/java/electroblob/wizardry/client/gui/WizardTradeTweaksHandler.java index 87dd9988..c68d7f1f 100644 --- a/src/main/java/electroblob/wizardry/client/gui/WizardTradeTweaksHandler.java +++ b/src/main/java/electroblob/wizardry/client/gui/WizardTradeTweaksHandler.java @@ -95,9 +95,11 @@ public class WizardTradeTweaksHandler { if(recipe != null && recipe.getItemToSell().getItem() instanceof ItemSpellBook){ EntityPlayer player = Minecraft.getMinecraft().player; + Spell spell = Spell.byMetadata(recipe.getItemToSell().getMetadata()); - if(!WizardData.get(player).hasSpellBeenDiscovered(Spell.byMetadata(recipe.getItemToSell().getMetadata()))){ - + if(Wizardry.settings.discoveryMode && !player.isCreative() && Wizardry.proxy.shouldDisplayDiscovered(spell, recipe.getItemToSell()) + && WizardData.get(player) != null && !WizardData.get(player).hasSpellBeenDiscovered(spell)){ + int x = gui.inventorySlots.getSlot(2).xPos + 14; int y = gui.inventorySlots.getSlot(2).yPos - 17;