Skip to content

Commit fed77b9

Browse files
committed
Fixed issue w/ tile duplication causing issues w/ token scoring
1 parent d8d6c80 commit fed77b9

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

src/main/java/cascadia/HabitatTile.java

+2
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,8 @@ public HabitatTile duplicate() {
244244
tile.placedToken = placedToken;
245245
// }
246246
tile.tileType = tileType;
247+
tile.mapPosition[0] = this.mapPosition[0];
248+
tile.mapPosition[1] = this.mapPosition[1];
247249
// tile.edges = Edge.makeEdges(tileID, habitat1, habitat2); //used for tile rotation
248250
return tile;
249251
}

src/main/java/cascadia/scoring/ScoreToken.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@ public static int calculateScore(PlayerMap map, Scorable option) {
4242
public static int calculateScore(PlayerMap map, WildlifeToken token) {
4343
Scorable option;
4444
switch (token) {
45-
case Bear -> option = ScoringBear.Option.valueOf(cards[0]);
46-
case Elk -> option = ScoringElk.Option.valueOf(cards[1]);
47-
case Salmon -> option = ScoringSalmon.Option.valueOf(cards[2]);
48-
case Hawk -> option = ScoringHawk.Option.valueOf(cards[3]);
49-
case Fox -> option = ScoringFox.Option.valueOf(cards[4]);
50-
default -> throw new IllegalArgumentException("Unexpected token value to be scored for player: " + token);
51-
}
45+
case Bear -> option = ScoringBear.Option.valueOf(cards[0]);
46+
case Elk -> option = ScoringElk.Option.valueOf(cards[1]);
47+
case Salmon -> option = ScoringSalmon.Option.valueOf(cards[2]);
48+
case Hawk -> option = ScoringHawk.Option.valueOf(cards[3]);
49+
case Fox -> option = ScoringFox.Option.valueOf(cards[4]);
50+
default -> throw new IllegalArgumentException("Unexpected token value to be scored for player: " + token);
51+
}
5252
return option.score(map);
5353
}
5454
}

0 commit comments

Comments
 (0)