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

Fixed stairs

Browse Source
This commit is contained in:
thatsIch
2015-09-29 15:47:55 +02:00
parent 8b921a7b79
commit 59dbfb1452
169 changed files with 1470 additions and 1095 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/tools/powered/ToolChargedStaff.java
+8 -5
View File
@@ -21,9 +21,13 @@ package appeng.items.tools.powered;
import java.util.EnumSet;
import com.google.common.base.Optional;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.ItemStack;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.DamageSource;
import appeng.core.AEConfig;
import appeng.core.features.AEFeature;
import appeng.core.sync.packets.PacketLightning;
@@ -31,8 +35,6 @@ import appeng.items.tools.powered.powersink.AEBasePoweredItem;
import appeng.server.ServerHelper;
import appeng.util.Platform;
import com.google.common.base.Optional;
public class ToolChargedStaff extends AEBasePoweredItem
{
@@ -53,9 +55,10 @@ public class ToolChargedStaff extends AEBasePoweredItem
{
for( int x = 0; x < 2; x++ )
{
float dx = (float) ( Platform.getRandomFloat() * target.width + target.getBoundingBox().minX );
float dy = (float) ( Platform.getRandomFloat() * target.height + target.getBoundingBox().minY );
float dz = (float) ( Platform.getRandomFloat() * target.width + target.getBoundingBox().minZ );
final AxisAlignedBB entityBoundingBox = target.getEntityBoundingBox();
float dx = (float) ( Platform.getRandomFloat() * target.width + entityBoundingBox.minX );
float dy = (float) ( Platform.getRandomFloat() * target.height + entityBoundingBox.minY );
float dz = (float) ( Platform.getRandomFloat() * target.width + entityBoundingBox.minZ );
ServerHelper.proxy.sendToAllNearExcept( null, dx, dy, dz, 32.0, target.worldObj, new PacketLightning( dx, dy, dz ) );
}
}
src/main/java/appeng/items/tools/powered/ToolMassCannon.java
+2 -2
View File
@@ -222,7 +222,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
float f1 = 0.3F;
AxisAlignedBB boundingBox = entity1.getBoundingBox().expand( f1, f1, f1 );
AxisAlignedBB boundingBox = entity1.getEntityBoundingBox().expand( f1, f1, f1 );
MovingObjectPosition movingObjectPosition = boundingBox.calculateIntercept( vec3, vec31 );
if( movingObjectPosition != null )
@@ -341,7 +341,7 @@ public class ToolMassCannon extends AEBasePoweredItem implements IStorageCell
float f1 = 0.3F;
AxisAlignedBB boundingBox = entity1.getBoundingBox().expand( f1, f1, f1 );
AxisAlignedBB boundingBox = entity1.getEntityBoundingBox().expand( f1, f1, f1 );
MovingObjectPosition movingObjectPosition = boundingBox.calculateIntercept( vec3, vec31 );
if( movingObjectPosition != null )