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

Fixed Bug set strutcture in water and set bug addressource nullpointer exception

This commit is contained in:
Andrin Fassbind 2021-12-04 14:02:06 +01:00
parent 8f12b40e50
commit 4a352dd40a
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,7 +154,9 @@ public class SiedlerGame {
board.setCorner(position, new Settlement(allPlayers.get(activePlayer).getFaction())); board.setCorner(position, new Settlement(allPlayers.get(activePlayer).getFaction()));
List<Config.Land> lands = board.getLandsForCorner(position); List<Config.Land> lands = board.getLandsForCorner(position);
for (Config.Land land:lands){ for (Config.Land land:lands){
allPlayers.get(activePlayer).addResource(land.getResource(), 1); if(land.getResource()!=null){
allPlayers.get(activePlayer).addResource(land.getResource(), 1);
}
} }
return true; return true;
} }
@ -205,6 +207,7 @@ public class SiedlerGame {
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){
//TODO: Check if Resource Null notwendig?
returnMap.get(player.getFaction()).add(resource); returnMap.get(player.getFaction()).add(resource);
player.addResource(resource,1); player.addResource(resource,1);
} }
@ -330,10 +333,12 @@ public class SiedlerGame {
} }
//3. Check if NeighbourEdge are Roads //3. Check if NeighbourEdge are Roads
boolean hasNeighbourRoad = (checkAdjacentEdgesList(roadStart) || checkAdjacentEdgesList(roadEnd)); boolean hasNeighbourRoad = (checkAdjacentEdgesList(roadStart) || checkAdjacentEdgesList(roadEnd));
//4.Check if roadStart or roadEnd is Settlement of current player or if 3. is valid if(hasNeighbourRoad) {
if(board.getCorner(roadStart).getFaction() == allPlayers.get(activePlayer).getFaction() return true;
|| board.getCorner(roadEnd).getFaction() == allPlayers.get(activePlayer).getFaction() }
|| hasNeighbourRoad){ //4.Check if roadStart or roadEnd is Settlement of current player
if((board.getCorner(roadStart)!=null && board.getCorner(roadStart).getFaction() == allPlayers.get(activePlayer).getFaction())
||(board.getCorner(roadEnd)!=null && board.getCorner(roadEnd).getFaction() == allPlayers.get(activePlayer).getFaction())) {
return true; return true;
} }
return false; return false;
@ -349,7 +354,11 @@ public class SiedlerGame {
if (!board.hasCorner(position)) { if (!board.hasCorner(position)) {
return false; return false;
} }
//2. Check if Corner is empty //2. Check if water
if(checkIfWater(position)) {
return false;
}
//3. Check if Corner is empty
if(board.getCorner(position) != null) { if(board.getCorner(position) != null) {
return false; return false;
} }
@ -360,6 +369,16 @@ public class SiedlerGame {
return true; return true;
} }
private boolean checkIfWater(Point point) {
List<Config.Land> fields = board.getFields(point);
for(Config.Land land : fields) {
if(!land.equals(Config.Land.WATER)) {
return false;
}
}
return true;
}
/** /**
* This method checks if there are Roads build by active Player on adjacent edges * This method checks if there are Roads build by active Player on adjacent edges
* @param point * @param point