Trivial: Remove unnecessary null checks. (#11820)

triplea-game · Jul 26, 2023 · 8214b62 · 8214b62
1 parent e2b8b6c
commit 8214b62
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/...-app/game-core/src/main/java/games/strategy/triplea/delegate/AbstractEndTurnDelegate.java b/...-app/game-core/src/main/java/games/strategy/triplea/delegate/AbstractEndTurnDelegate.java
@@ -231,7 +231,6 @@ public void start() {
     }
     if (Properties.getGiveUnitsByTerritory(getData().getProperties())
         && pa != null
-        && pa.getGiveUnitControl() != null
         && !pa.getGiveUnitControl().isEmpty()) {
       changeUnitOwnership(bridge);
     }

diff --git a/game-app/game-core/src/main/java/games/strategy/triplea/delegate/AbstractPlaceDelegate.java b/game-app/game-core/src/main/java/games/strategy/triplea/delegate/AbstractPlaceDelegate.java
@@ -825,9 +825,7 @@ public String canUnitsBePlaced(
       if (!to.isOwnedBy(player)) {
         if (GameStepPropertiesHelper.isBid(getData())) {
           final PlayerAttachment pa = PlayerAttachment.get(to.getOwner());
-          if ((pa == null
-                  || pa.getGiveUnitControl() == null
-                  || !pa.getGiveUnitControl().contains(player))
+          if ((pa == null || !pa.getGiveUnitControl().contains(player))
               && !to.anyUnitsMatch(Matches.unitIsOwnedBy(player))) {
             return "You don't own " + to.getName();
           }

diff --git a/game-app/game-core/src/main/java/games/strategy/triplea/delegate/BidPlaceDelegate.java b/game-app/game-core/src/main/java/games/strategy/triplea/delegate/BidPlaceDelegate.java
@@ -54,9 +54,7 @@ protected String canProduce(
       return "Cant place sea units on land";
     } else if (!to.isOwnedBy(player)) {
       final PlayerAttachment pa = PlayerAttachment.get(to.getOwner());
-      if (pa != null
-          && pa.getGiveUnitControl() != null
-          && pa.getGiveUnitControl().contains(player)) {
+      if (pa != null && pa.getGiveUnitControl().contains(player)) {
         return null;
       } else if (to.anyUnitsMatch(Matches.unitIsOwnedBy(player))) {
         return null;

diff --git a/game-app/game-headed/src/main/java/games/strategy/triplea/ui/PlacePanel.java b/game-app/game-headed/src/main/java/games/strategy/triplea/ui/PlacePanel.java
@@ -208,9 +208,7 @@ private PlaceableUnits getUnitsToPlace(final Territory territory) {
       if (!territory.isWater() && !territory.isOwnedBy(getCurrentPlayer())) {
         if (GameStepPropertiesHelper.isBid(getData())) {
           final PlayerAttachment pa = PlayerAttachment.get(territory.getOwner());
-          if ((pa == null
-                  || pa.getGiveUnitControl() == null
-                  || !pa.getGiveUnitControl().contains(getCurrentPlayer()))
+          if ((pa == null || !pa.getGiveUnitControl().contains(getCurrentPlayer()))
               && !territory.anyUnitsMatch(Matches.unitIsOwnedBy(getCurrentPlayer()))) {
             return new PlaceableUnits();
           }