Updated javadoc for movePlayer, and adjusted other methods as well

fiicere · Sep 24, 2012 · e5de457 · e5de457
1 parent e1f7c1c
commit e5de457
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Mazebuilder/src/com/mazebuilder/gameplay/board/Board.java b/Mazebuilder/src/com/mazebuilder/gameplay/board/Board.java
@@ -20,16 +20,16 @@ public interface Board extends Renderable {
     Location getPlayerLocation(Player p);
 
     /**
-     * Returns the new location of the given player. Will return true if the move was completed. Does not jump walls. Uses identity (==)
+     * Will return true if the move was completed. Does not jump walls. Uses identity (==)
      * comparisons.
      **/
     boolean movePlayer(Player p, Direction d);
 
     /**
-     * Returns the new location of the given player. Will return the same location if the move is impossible. Does not jump walls. Uses identity (==)
+     * Will return true if the move was completed. Does not jump walls. Uses identity (==)
      * comparisons.
      **/
-    Location movePlayerWithBonus(Player p, Direction d);
+    boolean movePlayerWithBonus(Player p, Direction d);
 
     /**
      * Returns the new location of the given player. Will return the same location if the move is impossible (player cannot jump or no wall to jump).

diff --git a/Mazebuilder/src/com/mazebuilder/gameplay/board/DefaultBoard.java b/Mazebuilder/src/com/mazebuilder/gameplay/board/DefaultBoard.java
@@ -120,17 +120,17 @@ public boolean movePlayer(Player p, Direction d) {
     }
 
     @Override
-    public Location movePlayerWithBonus(Player p, Direction d) {
+    public boolean movePlayerWithBonus(Player p, Direction d) {
         Preconditions.checkArgument(p.canJump(), "Player " + Strings.nullToEmpty(p.getName()) + " cannot jump.");
         Location l = getPlayerLocation(p);
         if (!walls.isWall(l, d)) {
             Location moved = l.move(d);
             if (isBoardLocation(moved) && p.spendBonus(d)) {
-                l = moved;
-                players.put(p, l);
+                players.put(p, moved);
+                return true;
             }
         }
-        return l;
+        return false;
     }
 
     @Override