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

v0.4.3b: adjusted how emo icons are handled to reduce null pointers

Browse Source
This commit is contained in:
Evan Debenham 2016-11-03 00:43:39 -04:00
parent ccb1dfe02e
commit 1c303a29fd
1 changed files with 1 additions and 4 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

@ -397,7 +397,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
} else { } else {
hideSleep(); hideSleep();
} }
if (emo != null) { if (emo != null && emo.alive) {
emo.visible = visible; emo.visible = visible;
} }
} }
@ -418,7 +418,6 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
public void hideSleep() { public void hideSleep() {
if (emo instanceof EmoIcon.Sleep) { if (emo instanceof EmoIcon.Sleep) {
emo.killAndErase(); emo.killAndErase();
emo = null;
} }
} }
@ -437,7 +436,6 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
public void hideAlert() { public void hideAlert() {
if (emo instanceof EmoIcon.Alert) { if (emo instanceof EmoIcon.Alert) {
emo.killAndErase(); emo.killAndErase();
emo = null;
} }
} }
@ -447,7 +445,6 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
if (emo != null) { if (emo != null) {
emo.killAndErase(); emo.killAndErase();
emo = null;
} }
} }