fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	items/tools/powered/ToolMassCannon.java
This commit is contained in:
AlgorithmX2
2014-06-04 23:05:22 -05:00
parent ea52fb5ebc 1ab7f7c110
commit f6d7762725
12 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
items/tools/powered/ToolMassCannon.java
+1 -2
View File
@@ -175,8 +175,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
hasDestroyedSomething = false;
AxisAlignedBB bb = AxisAlignedBB
.getAABBPool()
.getAABB( Math.min( vec3.xCoord, vec31.xCoord ), Math.min( vec3.yCoord, vec31.yCoord ), Math.min( vec3.zCoord, vec31.zCoord ),
.getBoundingBox( Math.min( vec3.xCoord, vec31.xCoord ), Math.min( vec3.yCoord, vec31.yCoord ), Math.min( vec3.zCoord, vec31.zCoord ),
Math.max( vec3.xCoord, vec31.xCoord ), Math.max( vec3.yCoord, vec31.yCoord ), Math.max( vec3.zCoord, vec31.zCoord ) )
.expand( 16, 16, 16 );