tilera/Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull requests Releases 1 Wiki Activity

Matter Cannon Compiles with Changes.

Browse source 
Disabled Paint Balls for now.. not sure I'm going to have the drive to finish that stuff.
This commit is contained in:
AlgorithmX2 2014-06-02 19:32:38 -05:00
parent 584782ec6e
commit 6485026235
1 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
items/tools/powered/ToolMassCannon.java
View file

@ -228,8 +228,8 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
try try
{ {
CommonHelper.proxy.sendToAllNearExcept( null, d0, d1, d2, 128, w, new PacketMatterCannon( d0, d1, d2, (float) (f7 * d3), (float) (f6 * d3), CommonHelper.proxy.sendToAllNearExcept( null, d0, d1, d2, 128, w, new PacketMatterCannon( d0, d1, d2, (float) direction.xCoord,
(float) (f8 * d3), (byte) (pos == null ? 32 : pos.hitVec.squareDistanceTo( Srec ) + 1) ) ); (float) direction.yCoord, (float) direction.zCoord, (byte) (pos == null ? 32 : pos.hitVec.squareDistanceTo( Srec ) + 1) ) );
} }
catch (Exception err) catch (Exception err)
@ -249,7 +249,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
{ {
EntityLivingBase el = (EntityLivingBase) pos.entityHit; EntityLivingBase el = (EntityLivingBase) pos.entityHit;
penitration -= dmg; penitration -= dmg;
el.knockBack( p, 0, (double) -f7 * d3, (double) -f8 * d3 ); el.knockBack( p, 0, (double) -direction.xCoord, (double) -direction.zCoord );
// el.knockBack( p, 0, vec3.xCoord, // el.knockBack( p, 0, vec3.xCoord,
// vec3.zCoord ); // vec3.zCoord );
el.attackEntityFrom( dmgSrc, dmg ); el.attackEntityFrom( dmgSrc, dmg );
@ -375,14 +375,12 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
if ( pen > 0 ) if ( pen > 0 )
return false; return false;
if ( requsetedAddition.getItem() instanceof ItemPaintBall ) /*
return false; * if ( requsetedAddition.getItem() instanceof ItemPaintBall ) return false;
*
if ( requsetedAddition.getItem() instanceof ItemBlock ) * if ( requsetedAddition.getItem() instanceof ItemBlock ) { Block blk = Block.getBlockFromItem(
{ * requsetedAddition.getItem() ); return blk == null; }
Block blk = Block.getBlockFromItem( requsetedAddition.getItem() ); */
return blk == null;
}
return true; return true;
} }