Hotfixes

pixxon · May 20, 2016 · 124d74f · 124d74f
1 parent 170b28e
commit 124d74f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 9 deletions.
diff --git a/src/main/java/bomberman/model/Model.java b/src/main/java/bomberman/model/Model.java
@@ -364,21 +364,31 @@ private void bombTimeOut(BombTimeOutEventArgs args){
 			}
 		}
 
-		for(Bomb b1: placedBombs){
-			if(b1.getPosX() == x && b1.getPosY() == y){
-				placedBombs.remove(b1);
+		for (Iterator<Bomb> iterator = placedBombs.iterator(); iterator.hasNext(); ) {
+			Bomb bomb = iterator.next();
+			if(bomb.getPosX() == x && bomb.getPosY() == y){
+				iterator.remove();
 			}
 		}
 
 		bombExplode(x,y);
 				gameTable.setField(x,y,new Flor(x,y));
 				gameAdvanced.notifyListeners(new GameAdvancedEventArg(x,y,FieldToActor(x,y).toString()));
 
-		for(int i = 1;i<= BOMB_RANGE; ++i){
-			bombExplode(x-i,y);
-			bombExplode(x+i,y);
-			bombExplode(x,y-i);
-			bombExplode(x,y+i);			
+		for(int i = 1;i<= BOMB_RANGE && !(gameTable.getField(x-i, y) instanceof Wall); ++i){
+			bombExplode(x-i,y);		
+		}
+
+		for(int i = 1;i<= BOMB_RANGE && !(gameTable.getField(x+i, y) instanceof Wall); ++i){
+			bombExplode(x+i,y);	
+		}
+
+		for(int i = 1;i<= BOMB_RANGE && !(gameTable.getField(x, y-i) instanceof Wall); ++i){
+			bombExplode(x,y-i);	
+		}
+
+		for(int i = 1;i<= BOMB_RANGE && !(gameTable.getField(x, y+i) instanceof Wall); ++i){
+			bombExplode(x,y+i);	
 		}
 
 		int alive=0;

diff --git a/src/main/java/bomberman/view/View.java b/src/main/java/bomberman/view/View.java
@@ -161,7 +161,6 @@ public void actionPerformed(Object sender, Object eventargs){
 			@Override
 			public void actionPerformed(Object sender, Object eventargs){
 				GameOverEventArg tmpGameOver = (GameOverEventArg)eventargs;
-				System.out.println("a");
 				if(tmpGameOver.getWinnerID() == iD){
 
 					Platform.runLater(new Runnable(){