From d14340034a5346dbced648652fd82202765778c0 Mon Sep 17 00:00:00 2001 From: Emma Stone Date: Fri, 3 Feb 2017 19:21:57 +0000 Subject: [PATCH] [BUGFIX] Fixed a bug with Plane/Z --- src/main/java/org/rev317/min/api/wrappers/Character.java | 5 ++--- src/main/java/org/rev317/min/api/wrappers/Tile.java | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/rev317/min/api/wrappers/Character.java b/src/main/java/org/rev317/min/api/wrappers/Character.java index f4aaf11..abed1c6 100644 --- a/src/main/java/org/rev317/min/api/wrappers/Character.java +++ b/src/main/java/org/rev317/min/api/wrappers/Character.java @@ -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); diff --git a/src/main/java/org/rev317/min/api/wrappers/Tile.java b/src/main/java/org/rev317/min/api/wrappers/Tile.java index cb28680..e591037 100644 --- a/src/main/java/org/rev317/min/api/wrappers/Tile.java +++ b/src/main/java/org/rev317/min/api/wrappers/Tile.java @@ -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 true if this tile is reachable, otherwise false */ public boolean isReachable(boolean isObject) { @@ -172,5 +171,4 @@ public final class Tile implements TileFlags, Locatable { public Tile getLocation() { return this; } - }