From 8ed02cf2acbf3efe2496e5047064f9735727472e Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Sun, 13 Oct 2019 21:22:43 -0300 Subject: [PATCH] Don't draw the gem in the status section until the animation is finished Signed-off-by: Chris Cromer --- src/main/java/cl/cromer/azaraka/Cell.java | 9 +++++++++ src/main/java/cl/cromer/azaraka/object/Player.java | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/main/java/cl/cromer/azaraka/Cell.java b/src/main/java/cl/cromer/azaraka/Cell.java index 2b80dc0..7e5a113 100644 --- a/src/main/java/cl/cromer/azaraka/Cell.java +++ b/src/main/java/cl/cromer/azaraka/Cell.java @@ -94,6 +94,15 @@ public class Cell extends JComponent implements Constants { this.object = object; } + /** + * Get a top object + * + * @return Returns the top object + */ + public Object getObjectOnTop() { + return objectOnTop; + } + /** * Set a top object * diff --git a/src/main/java/cl/cromer/azaraka/object/Player.java b/src/main/java/cl/cromer/azaraka/object/Player.java index 411ba27..8e32993 100644 --- a/src/main/java/cl/cromer/azaraka/object/Player.java +++ b/src/main/java/cl/cromer/azaraka/object/Player.java @@ -490,7 +490,8 @@ public class Player extends Object implements Constants { public ArrayList getInventoryGems() { ArrayList gems = new ArrayList<>(); for (Object object : carrying) { - if (object instanceof Gem) { + if (object instanceof Gem && object.getCell().getObjectOnTop() == null) { + // Only count the gem as in inventory once it stops showing gems.add((Gem) object); } }