LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v0.6.2d: reverted a fix from 0.6.2c which caused deadlocks

Browse Source
This commit is contained in:
Evan Debenham 2017-11-16 12:30:40 -05:00 committed by Evan Debenham
parent 62c5aeffc8
commit 597699770f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
View File

@ -300,7 +300,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
flashTime = FLASH_INTERVAL; flashTime = FLASH_INTERVAL;
} }
public synchronized void add( State state ) { public void add( State state ) {
switch (state) { switch (state) {
case BURNING: case BURNING:
burning = emitter(); 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) { switch (state) {
case BURNING: case BURNING:
if (burning != null) { if (burning != null) {
@ -414,6 +414,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
} }
@Override @Override
//syncronized due to EmoIcon handling
public synchronized void update() { public synchronized void update() {
super.update(); super.update();