2 files changed, 12 insertions, 8 deletions
diff --git a/src/main/java/gregtech/common/entities/GT_EntityFXPollution.java b/src/main/java/gregtech/common/entities/GT_EntityFXPollution.java
index 219cafdaf1..d5121a38ad 100644
--- a/src/main/java/gregtech/common/entities/GT_EntityFXPollution.java
+++ b/src/main/java/gregtech/common/entities/GT_EntityFXPollution.java
@@ -41,7 +41,7 @@ public class GT_EntityFXPollution extends EntityFX {
         if (this.particleAge++ >= this.particleMaxAge) {
             this.setDead();
         } else {
-            this.motionY += -5.0E-4D;
+            this.motionY -= 5.0E-4D;
             this.moveEntity(this.motionX, this.motionY, this.motionZ);
             if (this.posY == this.prevPosY) {
                 this.motionX *= 1.1D;
diff --git a/src/main/java/gregtech/common/entities/GT_Entity_Arrow.java b/src/main/java/gregtech/common/entities/GT_Entity_Arrow.java
index c5ca19fdad..5fd35bb8f5 100644
--- a/src/main/java/gregtech/common/entities/GT_Entity_Arrow.java
+++ b/src/main/java/gregtech/common/entities/GT_Entity_Arrow.java
@@ -20,7 +20,11 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.network.play.server.S2BPacketChangeGameState;
 import net.minecraft.potion.Potion;
-import net.minecraft.util.*;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.DamageSource;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
 import net.minecraftforge.common.util.FakePlayerFactory;
@@ -124,15 +128,15 @@ public class GT_Entity_Arrow extends EntityArrow {
                 this.boundingBox.addCoord(this.motionX, this.motionY, this.motionZ)
                     .expand(1.0D, 1.0D, 1.0D));
             double tLargestDistance = Double.MAX_VALUE;
-            for (Entity tAllPotentiallyHitEntity : tAllPotentiallyHitEntities) {
-                Entity entity1 = tAllPotentiallyHitEntity;
-                if ((entity1.canBeCollidedWith()) && ((entity1 != tShootingEntity) || (this.ticksInAir >= 5))) {
-                    AxisAlignedBB axisalignedbb1 = entity1.boundingBox.expand(0.3D, 0.3D, 0.3D);
+            for (Entity potentiallyHitEntity : tAllPotentiallyHitEntities) {
+                if ((potentiallyHitEntity.canBeCollidedWith())
+                    && ((potentiallyHitEntity != tShootingEntity) || (this.ticksInAir >= 5))) {
+                    AxisAlignedBB axisalignedbb1 = potentiallyHitEntity.boundingBox.expand(0.3D, 0.3D, 0.3D);
                     MovingObjectPosition movingobjectposition1 = axisalignedbb1.calculateIntercept(vec31, vec3);
                     if (movingobjectposition1 != null) {
                         double tDistance = vec31.distanceTo(movingobjectposition1.hitVec);
                         if (tDistance < tLargestDistance) {
-                            tHitEntity = entity1;
+                            tHitEntity = potentiallyHitEntity;
                             tLargestDistance = tDistance;
                         }
                     }
@@ -243,7 +247,7 @@ public class GT_Entity_Arrow extends EntityArrow {
                                         : null,
                                     tHitLivingEntity,
                                     this.mArrow);
-                                if ((tShootingEntity != null) && (tHitLivingEntity != tShootingEntity)
+                                if ((tHitLivingEntity != tShootingEntity)
                                     && ((tHitLivingEntity instanceof EntityPlayer))
                                     && ((tShootingEntity instanceof EntityPlayerMP))) {
                                     ((EntityPlayerMP) tShootingEntity).playerNetServerHandler