Merge pull request #632 from Muramasa-/Bugfixes

Various Bugfixes

2 files changed, 1 insertions, 7 deletions

diff --git a/src/main/java/gregtech/common/items/armor/ArmorCalculation.java b/src/main/java/gregtech/common/items/armor/ArmorCalculation.java
index 8915ce6f52..440d6aaef9 100644
--- a/src/main/java/gregtech/common/items/armor/ArmorCalculation.java
+++ b/src/main/java/gregtech/common/items/armor/ArmorCalculation.java
@@ -1,8 +1,5 @@
 package gregtech.common.items.armor;
 
-import java.util.List;
-
-import thaumcraft.api.nodes.IRevealer;
 import cpw.mods.fml.common.Loader;
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
@@ -12,8 +9,8 @@ import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidStack;
+import thaumcraft.api.nodes.IRevealer;
 
 public class ArmorCalculation {
 	public static float[] calculateArmor(ItemStack[] parts) {
diff --git a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sonictron.java b/src/main/java/gregtech/common/items/behaviors/Behaviour_Sonictron.java
index 90daed57dd..f256f036ca 100644
--- a/src/main/java/gregtech/common/items/behaviors/Behaviour_Sonictron.java
+++ b/src/main/java/gregtech/common/items/behaviors/Behaviour_Sonictron.java
@@ -1,6 +1,5 @@
 package gregtech.common.items.behaviors;

 

-import gregtech.api.GregTech_API;

 import gregtech.api.enums.GT_Values;

 import gregtech.api.interfaces.IItemBehaviour;

 import gregtech.api.items.GT_MetaBase_Item;

@@ -98,8 +97,6 @@ public class Behaviour_Sonictron
     }

 

     public boolean onItemUseFirst(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) {

-        if ((!aWorld.isRemote) && (aWorld.getBlock(aX, aY, aZ) == GregTech_API.sBlockMachines) && (aWorld.getBlockMetadata(aX, aY, aZ) == 6)) {

-        }

         setCurrentIndex(aStack, -1);

         return false;

     }