Merge branch 'master' of https://bitbucket.org/AlgorithmX2/appliedenergistics2 into rv1

Conflicts: items/tools/powered/ToolMassCannon.java
2014-06-16 00:51:51 -05:00
parent 472d5cb1c0 730200ed8d
commit 1632d2d72e
13 changed files with 72 additions and 44 deletions
@@ -334,7 +334,7 @@ public class BlockCableBus extends AEBaseBlock
 	@Override
 	public boolean onActivated(World w, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ)
 	{
-		return cb( w, x, y, z ).activate( player, w.getWorldVec3Pool().getVecFromPool( hitX, hitY, hitZ ) );
+		return cb( w, x, y, z ).activate( player, Vec3.createVectorHelper( hitX, hitY, hitZ ) );
 	}

 	@Override