diff --git a/src/main/java/model/Fire.java b/src/main/java/model/Fire.java index 159e2e3bb840f81bde337ec0c8c5723dc4e9eb18..0541ba068b6c1e93c220f5f7922ed6e7f67a6844 100644 --- a/src/main/java/model/Fire.java +++ b/src/main/java/model/Fire.java @@ -21,7 +21,7 @@ public class Fire { return firePositions; } - public List<Position> spreadFire() { + /*public List<Position> spreadFire() { List<Position> modifiedPositions = new ArrayList<>(); List<Position> newFirePositions = new ArrayList<>(); @@ -31,6 +31,18 @@ public class Fire { firePositions.addAll(newFirePositions); modifiedPositions.addAll(newFirePositions); return newFirePositions; + }*/ + public List<Position> spreadFire(Set<Position> mountains) { + List<Position> newFires = new ArrayList<>(); + for (Position firePosition : firePositions) { + for (Position neighbor : neighbors.get(firePosition)) { + if (!mountains.contains(neighbor) && !firePositions.contains(neighbor)) { + newFires.add(neighbor); + } + } + } + firePositions.addAll(newFires); + return newFires; } public void extinguishFire(Position neighbor) {