Region calculation.

gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java

@@ -595,14 +595,7 @@ public class Filters {
                 @Override
                 public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
                     int siteNumber = physicalCard.getSiteNumber();
-                    int region;
+                    return GameUtils.getRegion(gameState) == GameUtils.getRegion(siteNumber);
-                    if (siteNumber <= 3)
-                        region = 1;
-                    else if (siteNumber > 3 && siteNumber <= 6)
-                        region = 2;
-                    else
-                        region = 3;
-                    return GameUtils.getRegion(gameState) == region;
                 }
             });
 
@@ -611,12 +604,7 @@ public class Filters {
             @Override
             public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
                 int siteNumber = physicalCard.getSiteNumber();
-                if (region == 1)
+                return GameUtils.getRegion(siteNumber) == region;
-                    return siteNumber <= 3;
-                else if (region == 2)
-                    return siteNumber > 3 && siteNumber <= 6;
-                else
-                    return siteNumber > 6;
             }
         };
     }

gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/GameUtils.java

@@ -93,6 +93,10 @@ public class GameUtils {
     }
 
     public static int getRegion(GameState gameState) {
-        return 1 + ((gameState.getCurrentSiteNumber() - 1) / 3);
+        return getRegion(gameState.getCurrentSiteNumber());
+    }
+
+    public static int getRegion(int siteNumber) {
+        return 1 + ((siteNumber - 1) / 3);
     }
 }