diff options
| author | Technus <daniel112092@gmail.com> | 2016-09-22 23:07:35 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2016-09-22 23:07:35 +0200 |
| commit | dbdc4f160a9eb955a101251d1b0235d63fbf951c (patch) | |
| tree | eda06d5a70b6423d3524577d3eb72ae61c89d811 /src/main/java/gregtech/common/entities | |
| parent | 6217c0a8f4526b92204d047db65b001862880dd7 (diff) | |
| parent | 41a91acd57f86d8e351dd6adb223d07498b11663 (diff) | |
| download | GT5-Unofficial-dbdc4f160a9eb955a101251d1b0235d63fbf951c.tar.gz GT5-Unofficial-dbdc4f160a9eb955a101251d1b0235d63fbf951c.tar.bz2 GT5-Unofficial-dbdc4f160a9eb955a101251d1b0235d63fbf951c.zip | |
Merge branch 'Loading-Times' into experimental
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 6530ade4e1..814ab3f8fa 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; |