aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/entities
diff options
context:
space:
mode:
authorMuramasa <haydenkilloh@gmail.com>2016-09-24 23:05:18 +0100
committerMuramasa <haydenkilloh@gmail.com>2016-09-24 23:05:18 +0100
commitfed8109b17fd2b41de17ceef92f37e39dc1ffc53 (patch)
tree9806dc7273bfc03fbb7a6eff1f6d0f98ce3a5bc3 /src/main/java/gregtech/common/entities
parent291839871e1233ba0c72e48cf16847246a1ccc7c (diff)
parent380211de8a2aaeaa6b24bbde34625bba4e626d79 (diff)
downloadGT5-Unofficial-fed8109b17fd2b41de17ceef92f37e39dc1ffc53.tar.gz
GT5-Unofficial-fed8109b17fd2b41de17ceef92f37e39dc1ffc53.tar.bz2
GT5-Unofficial-fed8109b17fd2b41de17ceef92f37e39dc1ffc53.zip
Update with exp changes
Diffstat (limited to 'src/main/java/gregtech/common/entities')
-rw-r--r--src/main/java/gregtech/common/entities/GT_Entity_Arrow.java2
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;