From 597699770f444a55c38d85dba38f94b262cd0182 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 16 Nov 2017 12:30:40 -0500 Subject: [PATCH] v0.6.2d: reverted a fix from 0.6.2c which caused deadlocks --- .../shatteredpixeldungeon/sprites/CharSprite.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 49bd33e14..159ccf030 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java @@ -300,7 +300,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip flashTime = FLASH_INTERVAL; } - public synchronized void add( State state ) { + public void add( State state ) { switch (state) { case BURNING: burning = emitter(); @@ -350,7 +350,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip } } - public synchronized void remove( State state ) { + public void remove( State state ) { switch (state) { case BURNING: if (burning != null) { @@ -414,6 +414,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip } @Override + //syncronized due to EmoIcon handling public synchronized void update() { super.update();