@@ -1274,7 +1274,7 @@ private static String toHitIsImpossible(Game game, Entity ae, int attackerId, Ta
1274
1274
boolean networkFiringSolution = false ;
1275
1275
//Check to see if the attacker has a firing solution. Naval C3 networks share targeting data
1276
1276
if (ae .hasNavalC3 () && te != null
1277
- && game .getC3NetworkMembers (ae ).stream ().anyMatch (en -> en .hasFiringSolutionFor (te .getId ())) {
1277
+ && game .getC3NetworkMembers (ae ).stream ().anyMatch (en -> en .hasFiringSolutionFor (te .getId ()))) {
1278
1278
networkFiringSolution = true ;
1279
1279
}
1280
1280
if (!networkFiringSolution ) {
@@ -1297,15 +1297,14 @@ private static String toHitIsImpossible(Game game, Entity ae, int attackerId, Ta
1297
1297
&& (te != null ) && te .hasSeenEntity (ae .getOwner ()))
1298
1298
&& !isArtilleryIndirect && !isIndirect && !isBearingsOnlyMissile ) {
1299
1299
boolean networkSee = false ;
1300
- if (ae .hasC3 () || ae .hasC3i () || ae .hasActiveNovaCEWS ()) {
1300
+ if (ae .hasC3 () || ae .hasC3i () || ae .hasActiveNovaCEWS ()
1301
+ && game .getEntitiesVector ().stream ().anyMatch (en ->
1302
+ !en .isEnemyOf (ae )
1303
+ && en .onSameC3NetworkAs (ae )
1304
+ && Compute .canSee (game , en , target ))) {
1301
1305
// c3 units can fire if any other unit in their network is in
1302
1306
// visual or sensor range
1303
- for (Entity en : game .getEntitiesVector ()) {
1304
- if (!en .isEnemyOf (ae ) && en .onSameC3NetworkAs (ae ) && Compute .canSee (game , en , target )) {
1305
- networkSee = true ;
1306
- break ;
1307
- }
1308
- }
1307
+ networkSee = true ;
1309
1308
}
1310
1309
if (!networkSee ) {
1311
1310
if (!Compute .inSensorRange (game , ae , target , null )) {
0 commit comments