[Rails-commits] Branch 'rails1.7.x' - rails/game

[Stefan F. <ste...@us...>]

 rails/game/specific/_1835/ElsasModifier.java |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 6a7bca5cc8266db82a457a88caa03259822797d2
Author: Stefan Frey <ste...@we...>
Date:   Tue Apr 3 12:12:24 2012 +0200

    fixed recent 1835 elsas modifier: added N4 hex

diff --git a/rails/game/specific/_1835/ElsasModifier.java b/rails/game/specific/_1835/ElsasModifier.java
index cce0b74..2c9898c 100644
--- a/rails/game/specific/_1835/ElsasModifier.java
+++ b/rails/game/specific/_1835/ElsasModifier.java
@@ -1,5 +1,7 @@
 package rails.game.specific._1835;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Set;
 
 import org.apache.log4j.Logger;
@@ -29,12 +31,15 @@ public class ElsasModifier implements NetworkGraphModifier {
         GameManagerI gm = GameManager.getInstance();
         SimpleGraph<NetworkVertex, NetworkEdge> graph = graphBuilder.getMapGraph();
 
-        // Check if elsasHex has zero value ...
-        MapHex elsasHex = gm.getMapManager().getHex("M5");
-        if (elsasHex.getCurrentValueForPhase(gm.getCurrentPhase()) == 0) {
-            // .. then remove 
-            Set<NetworkVertex> elsasVertices = NetworkVertex.getVerticesByHex(graph.vertexSet(), elsasHex);
-            graph.removeAllVertices(elsasVertices);
+        // Check if (one of the  elsasHex has zero value ...
+        MapHex hex = gm.getMapManager().getHex("M5");
+        if (hex.getCurrentValueForPhase(gm.getCurrentPhase()) == 0) {
+            // .. then remove both
+            Set<NetworkVertex> vertices = NetworkVertex.getVerticesByHex(graph.vertexSet(), hex);
+            graph.removeAllVertices(vertices);
+            hex = gm.getMapManager().getHex("N4");
+            vertices = NetworkVertex.getVerticesByHex(graph.vertexSet(), hex);
+            graph.removeAllVertices(vertices);
             log.debug("Elsas is inactive");
         }
     }