[BUGFIX] Fixed a bug with Plane/Z

This commit is contained in:
Emma Stone
2017-02-03 19:21:57 +00:00
parent f98b1e1258
commit d14340034a
2 changed files with 3 additions and 6 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());
}
/**
@@ -115,9 +115,8 @@ public class Character implements Locatable {
/**
* Interacts with this character
*
* @deprecated
*
* @param i
* @deprecated
*/
public void interact(int i) {
Menu.interact(this, i);
@@ -73,7 +73,6 @@ public final class Tile implements TileFlags, Locatable {
return z;
}
/**
* {@inheritDoc}
*/
@@ -116,6 +115,7 @@ public final class Tile implements TileFlags, Locatable {
hash = 31 * hash + this.x;
hash = 31 * hash + this.y;
hash = 31 * hash + this.z;
return hash;
}
@@ -139,7 +139,6 @@ public final class Tile implements TileFlags, Locatable {
* Determines if this tile is reachable
*
* @param isObject whether this tile is an object tile
*
* @return <code>true</code> if this tile is reachable, otherwise <code>false</code>
*/
public boolean isReachable(boolean isObject) {
@@ -172,5 +171,4 @@ public final class Tile implements TileFlags, Locatable {
public Tile getLocation() {
return this;
}
}