From ab96d8f46f9afa3523434856cee93769ff8b3b32 Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Sat, 21 Feb 2015 20:49:19 +0100 Subject: [PATCH] Fix night-vision being activateable without upgrade #1377 --- src/main/java/tconstruct/client/ArmorControls.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/tconstruct/client/ArmorControls.java b/src/main/java/tconstruct/client/ArmorControls.java index d0a7a39e..ce72ed12 100644 --- a/src/main/java/tconstruct/client/ArmorControls.java +++ b/src/main/java/tconstruct/client/ArmorControls.java @@ -158,12 +158,13 @@ public class ArmorControls { if (mc.currentScreen == null) { if (key == ArmorControls.toggleGoggles) { ItemStack goggles = mc.thePlayer.getCurrentArmor(3); - if (goggles != null && goggles - .getItem() instanceof TravelGear) //TODO: Genericize this + if (goggles != null && goggles.getItem() instanceof TravelGear) //TODO: Genericize this { - activeGoggles = !activeGoggles; - PlayerAbilityHelper.toggleGoggles(mc.thePlayer, activeGoggles); - toggleGoggles(); + if(goggles.hasTagCompound() && goggles.getTagCompound().getCompoundTag(((TravelGear) goggles.getItem()).getBaseTagName()).getBoolean("Night Vision")) { + activeGoggles = !activeGoggles; + PlayerAbilityHelper.toggleGoggles(mc.thePlayer, activeGoggles); + toggleGoggles(); + } } } if (key == ArmorControls.beltSwap) {