From 7651e4c557782b24bb5f8389d0e1a8b29bd49f9e Mon Sep 17 00:00:00 2001
From: Evan Debenham <Evan.SHPX@gmail.com>
Date: Wed, 19 Oct 2016 20:13:35 -0400
Subject: [PATCH] v0.4.3a: fixed invisibility fx sometimes sticking when they
 shouldn't

---
 .../items/potions/PotionOfInvisibility.java         | 11 +----------
 .../shatteredpixeldungeon/sprites/CharSprite.java   | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java
index be8668d61..2826922ff 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfInvisibility.java
@@ -32,8 +32,6 @@ import com.watabou.noosa.tweeners.AlphaTweener;
 
 public class PotionOfInvisibility extends Potion {
 
-	private static final float ALPHA	= 0.4f;
-
 	{
 		initials = 3;
 	}
@@ -50,12 +48,5 @@ public class PotionOfInvisibility extends Potion {
 	public int price() {
 		return isKnown() ? 40 * quantity : super.price();
 	}
-	
-	public static void melt( Char ch ) {
-		if (ch.sprite.parent != null) {
-			ch.sprite.parent.add( new AlphaTweener( ch.sprite, ALPHA, 0.4f ) );
-		} else {
-			ch.sprite.alpha( ALPHA );
-		}
-	}
+
 }
diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
index 90e2a2fd8..7e8a9fa19 100644
--- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
+++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
@@ -45,6 +45,7 @@ import com.watabou.noosa.MovieClip;
 import com.watabou.noosa.Visual;
 import com.watabou.noosa.audio.Sample;
 import com.watabou.noosa.particles.Emitter;
+import com.watabou.noosa.tweeners.AlphaTweener;
 import com.watabou.noosa.tweeners.PosTweener;
 import com.watabou.noosa.tweeners.Tweener;
 import com.watabou.utils.Callback;
@@ -86,6 +87,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
 	protected IceBlock iceBlock;
 	protected DarkBlock darkBlock;
 	protected TorchHalo halo;
+	protected AlphaTweener invisible;
 	
 	protected EmoIcon emo;
 
@@ -277,7 +279,12 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
 				levitation.pour( Speck.factory( Speck.JET ), 0.02f );
 				break;
 			case INVISIBLE:
-				PotionOfInvisibility.melt( ch );
+				if (parent != null){
+					if (invisible != null) invisible.killAndErase();
+					invisible = new AlphaTweener( this, 0.4f, 0.4f );
+					parent.add(invisible);
+				} else
+					alpha( 0.4f );
 				break;
 			case PARALYSED:
 				paused = true;
@@ -318,6 +325,10 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
 				}
 				break;
 			case INVISIBLE:
+				if (invisible != null) {
+					invisible.killAndErase();
+					invisible = null;
+				}
 				alpha( 1f );
 				break;
 			case PARALYSED: