diff options
| author | Muramasa- <haydenkilloh@gmail.com> | 2016-09-13 21:09:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-13 21:09:38 +0100 |
| commit | 059cf34455b326abfed19da176d62ad478fca7c6 (patch) | |
| tree | b0b77ea0391b55f40a99931b54bb8992256737fe /src/main/java/gregtech/common/entities | |
| parent | 4091b39401329c7dbc849b37c3eafbb95943566b (diff) | |
| parent | 0d9c100ade10ebc72905b0f2a298e9b078b233d8 (diff) | |
| download | GT5-Unofficial-059cf34455b326abfed19da176d62ad478fca7c6.tar.gz GT5-Unofficial-059cf34455b326abfed19da176d62ad478fca7c6.tar.bz2 GT5-Unofficial-059cf34455b326abfed19da176d62ad478fca7c6.zip | |
Merge pull request #631 from Muramasa-/LoadTimes
Various Load Time Improvements
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;
|