konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.6.1: adjusted emoicon handling to prevent null pointers

Browse Source
This commit is contained in:
Evan Debenham
2017-08-15 01:06:50 -04:00
parent 4adb7fb4b3
commit eb06f4ff53
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/CharSprite.java
+4 -6
View File
@@ -429,10 +429,10 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
} }
public void showSleep() { public void showSleep() {
if (emo instanceof EmoIcon.Sleep) { if (emo instanceof EmoIcon.Sleep && emo.alive) {
} else { } else {
if (emo != null) { if (emo != null && emo.alive) {
emo.killAndErase(); emo.killAndErase();
} }
emo = new EmoIcon.Sleep( this ); emo = new EmoIcon.Sleep( this );
@@ -444,15 +444,14 @@ 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;
} }
} }
public void showAlert() { public void showAlert() {
if (emo instanceof EmoIcon.Alert) { if (emo instanceof EmoIcon.Alert && emo.alive) {
} else { } else {
if (emo != null) { if (emo != null && emo.alive) {
emo.killAndErase(); emo.killAndErase();
} }
emo = new EmoIcon.Alert( this ); emo = new EmoIcon.Alert( this );
@@ -463,7 +462,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;
} }
} }