ZHAW-IT21b_WIN
/
gruppe06-hufflepuff-projekt3-catan
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

checked some warnings in class SiedlerGame.

This commit is contained in:
Speedy Gonzalez 2021-12-07 15:27:56 +01:00
parent 7f19c5acce
commit bf32d978bc
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/ch/zhaw/catan/SiedlerGame.java
View File

@ -19,10 +19,10 @@ public class SiedlerGame {
static final int FOUR_TO_ONE_TRADE_OFFER = 4; static final int FOUR_TO_ONE_TRADE_OFFER = 4;
static final int FOUR_TO_ONE_TRADE_WANT = 1; static final int FOUR_TO_ONE_TRADE_WANT = 1;
private SiedlerBoard board; private final SiedlerBoard board;
private ArrayList<Player> allPlayers; private final ArrayList<Player> allPlayers;
private int winPointsForWin; private final int winPointsForWin;
private Bank bank; private final Bank bank;
private int activePlayer; private int activePlayer;
/** /**
@ -222,7 +222,7 @@ public class SiedlerGame {
Map<Faction,List<Resource>> returnMap= new HashMap<>(); Map<Faction,List<Resource>> returnMap= new HashMap<>();
List<Point> diceValueFields = board.getFieldsForDiceValue(dicethrow); List<Point> diceValueFields = board.getFieldsForDiceValue(dicethrow);
for (Player player : allPlayers) { for (Player player : allPlayers) {
returnMap.put(player.getFaction(), new ArrayList()); returnMap.put(player.getFaction(), new ArrayList<>());
for (Point field : diceValueFields) { for (Point field : diceValueFields) {
List<Resource> resources = board.getResourcesforFaction(field,player.getFaction()); List<Resource> resources = board.getResourcesforFaction(field,player.getFaction());
for (Config.Resource resource : resources){ for (Config.Resource resource : resources){
@ -367,9 +367,9 @@ public class SiedlerGame {
/** /**
* Can be used for both initial Settlement and normal Phase. * This Method is used to check if the chosen position for a road is valid or not.
* @param roadStart * @param roadStart the coordinates where the road begins.
* @param roadEnd * @param roadEnd the coordinates where the roads ends.
* @return * @return
*/ */
private boolean validPositionForRoad(Point roadStart, Point roadEnd){ private boolean validPositionForRoad(Point roadStart, Point roadEnd){