diff options
| author | Muramasa <haydenkilloh@gmail.com> | 2016-09-15 15:40:06 +0100 |
|---|---|---|
| committer | Muramasa <haydenkilloh@gmail.com> | 2016-09-15 15:40:06 +0100 |
| commit | b10acf8244e3e69f7b37af2a1506eb71f57834c2 (patch) | |
| tree | b339af410e4f91ecb9919aeab8da523ca5230a22 /src/main/java/gregtech/common/entities | |
| parent | 55133748f138fef56973ee7f670da9d353cbfc73 (diff) | |
| parent | c997df59522511e899b4bb01a667b48646029450 (diff) | |
| download | GT5-Unofficial-b10acf8244e3e69f7b37af2a1506eb71f57834c2.tar.gz GT5-Unofficial-b10acf8244e3e69f7b37af2a1506eb71f57834c2.tar.bz2 GT5-Unofficial-b10acf8244e3e69f7b37af2a1506eb71f57834c2.zip | |
Merge remote-tracking branch 'refs/remotes/Blood-Asp/experimental' into Exp
Diffstat (limited to 'src/main/java/gregtech/common/entities')
| -rw-r--r-- | src/main/java/gregtech/common/entities/GT_Entity_Arrow.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 778ca13e0d..a95720134b 100644 --- a/src/main/java/gregtech/common/entities/GT_Entity_Arrow.java +++ b/src/main/java/gregtech/common/entities/GT_Entity_Arrow.java @@ -128,7 +128,7 @@ public class GT_Entity_Arrow if (tHitEntity != null) {
tVector = new MovingObjectPosition(tHitEntity);
}
- if ((tVector != null) && (tVector.entityHit != null) && ((tVector.entityHit instanceof EntityPlayer))) {
+ if ((tVector != null) && ((tVector.entityHit instanceof EntityPlayer))) {
EntityPlayer entityplayer = (EntityPlayer) tVector.entityHit;
if ((entityplayer.capabilities.disableDamage) || (((tShootingEntity instanceof EntityPlayer)) && (!((EntityPlayer) tShootingEntity).canAttackPlayer(entityplayer)))) {
tVector = null;
|