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

Fix the alive check for the matter cannon.

Browse Source
This commit is contained in:
Sebastian Hartte
2020-07-12 17:20:42 +02:00
parent 9bb23bcac8
commit 188f105730
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/items/tools/powered/MatterCannonItem.java
+14 -16
View File
@@ -188,26 +188,24 @@ public class MatterCannonItem extends AEBasePoweredItem implements IStorageCell<
for (int l = 0; l < list.size(); ++l) { for (int l = 0; l < list.size(); ++l) {
final Entity entity1 = (Entity) list.get(l); final Entity entity1 = (Entity) list.get(l);
if (!entity1.isAlive() && entity1 != p && !(entity1 instanceof ItemEntity)) { if (entity1.isAlive() && entity1 != p && !(entity1 instanceof ItemEntity)) {
if (entity1.isAlive()) { // prevent killing / flying of mounts.
// prevent killing / flying of mounts. if (entity1.isRidingOrBeingRiddenBy(p)) {
if (entity1.isRidingOrBeingRiddenBy(p)) { continue;
continue; }
}
final float f1 = 0.3F; final float f1 = 0.3F;
final AxisAlignedBB boundingBox = entity1.getBoundingBox().grow(f1, f1, f1); final AxisAlignedBB boundingBox = entity1.getBoundingBox().grow(f1, f1, f1);
final Vec3d intersection = boundingBox.rayTrace(Vec3d, Vec3d1).orElse(null); final Vec3d intersection = boundingBox.rayTrace(Vec3d, Vec3d1).orElse(null);
if (intersection != null) { if (intersection != null) {
final double nd = Vec3d.squareDistanceTo(intersection); final double nd = Vec3d.squareDistanceTo(intersection);
if (nd < closest) { if (nd < closest) {
entity = entity1; entity = entity1;
entityIntersection = intersection; entityIntersection = intersection;
closest = nd; closest = nd;
}
} }
} }
} }