Merge branch 'development' into feature/getlongid

This commit is contained in:
Jeroen Ketelaar
2017-02-03 21:44:14 +01:00
committed by GitHub
2 changed files with 1 additions and 2 deletions
@@ -63,7 +63,7 @@ public class Character implements Locatable {
* @return location
*/
public Tile getLocation() {
return new Tile(Game.getBaseX() + getX(), Game.getBaseY() + getY());
return new Tile(Game.getBaseX() + getX(), Game.getBaseY() + getY(), Game.getPlane());
}
/**
@@ -73,7 +73,6 @@ public final class Tile implements TileFlags, Locatable {
return z;
}
/**
* {@inheritDoc}
*/