From c0d432a3fbfaf342d3c59274ce87d1f67406b8a6 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Fri, 20 Oct 2017 01:11:20 -0400 Subject: [PATCH] v0.6.2: fixed pastys not retaining holiday info in remains --- .../shatteredpixeldungeon/items/food/Pasty.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java index b73a539a4..4b0dab65b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/Pasty.java @@ -71,7 +71,16 @@ public class Pasty extends Food { } { + reset(); + energy = Hunger.STARVING; + + bones = true; + } + + @Override + public void reset() { + super.reset(); switch(holiday){ case NONE: name = Messages.get(this, "pasty"); @@ -86,12 +95,8 @@ public class Pasty extends Food { image = ItemSpriteSheet.CANDY_CANE; break; } - - energy = Hunger.STARVING; - - bones = true; } - + @Override public void execute(Hero hero, String action) { super.execute(hero, action);