Pushing before merging

2014-10-09 07:48:45 -04:00 · 2014-10-09 07:48:45 -04:00 · 1d99b70f14
commit 1d99b70f14
parent 297567a417
31 changed files with 588 additions and 262 deletions
--- a/1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java
+++ b/1.7.10/main/java/WayofTime/alchemicalWizardry/common/items/BoundPickaxe.java
@ -137,6 +137,11 @@ public class BoundPickaxe extends ItemPickaxe implements IBindable
            return par1ItemStack;
        }
        
+        if(par2World.isRemote)
+        {
+        	return par1ItemStack;
+        }
+        
        Vec3 blockVec = SpellHelper.getEntityBlockVector(par3EntityPlayer);
        int posX = (int)(blockVec.xCoord);
        int posY = (int)(blockVec.yCoord);