Issue 2090: /nova chat command now works with non-enemy mechs too - l…

…ess ambiguous formatting
MegaMek · Dec 24, 2024 · 3fb19d9 · 3fb19d9
1 parent 10c45b5
commit 3fb19d9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/megamek/src/megamek/client/commands/AssignNovaNetworkCommand.java b/megamek/src/megamek/client/commands/AssignNovaNetworkCommand.java
@@ -291,9 +291,9 @@ private List<Entity> getAlliedNovaUnits() {
         List<Entity> novaUnits = new LinkedList<>();
         for (Entity ent : getClient().getEntitiesVector()) {
             if (ent.hasNovaCEWS()
-                && (ent.getOwnerId() == (getClient().getLocalPlayer().getId())
-                || (getClient().getLocalPlayer()) != null
-                && !getClient().getLocalPlayer().isEnemyOf(ent.getOwner()))){
+                && ((ent.getOwnerId() == getClient().getLocalPlayer().getId())
+                    || (getClient().getLocalPlayer() != null
+                        && !getClient().getLocalPlayer().isEnemyOf(ent.getOwner())))){
                 novaUnits.add(ent);
             }
         }

diff --git a/megamek/src/megamek/server/commands/AssignNovaNetServerCommand.java b/megamek/src/megamek/server/commands/AssignNovaNetServerCommand.java
@@ -446,10 +446,10 @@ private List<Entity> getMyNovaUnits(int connID) {
     private List<Entity> getAlliedNovaUnits(int connID) {
         List<Entity> novaUnits = new LinkedList<>();
         for (Entity ent : gameManager.getGame().getEntitiesVector()) {
-            if ((ent.hasNovaCEWS()
-                && (ent.getOwnerId() == connID)
-                || (gameManager.getGame().getPlayer(connID)) != null
-                && !gameManager.getGame().getPlayer(connID).isEnemyOf(ent.getOwner()))){
+            if (ent.hasNovaCEWS()
+                && ((ent.getOwnerId() == connID)
+                    || (gameManager.getGame().getPlayer(connID) != null
+                        && !gameManager.getGame().getPlayer(connID).isEnemyOf(ent.getOwner())))){
                 novaUnits.add(ent);
             }
         }