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

v0.9.1c: fixed crash bugs caused by earlier 0.9.1c commits

Browse Source
This commit is contained in:
Evan Debenham 2021-01-12 18:19:01 -05:00
parent c3e16f3106
commit ecd93baffd
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/MagesStaff.java
View File

@ -137,7 +137,11 @@ public class MagesStaff extends MeleeWeapon {
@Override @Override
public int buffedLvl() { public int buffedLvl() {
return Math.max(super.buffedLvl(), wand.buffedLvl()); if (wand != null){
return Math.max(super.buffedLvl(), wand.buffedLvl());
} else {
return super.buffedLvl();
}
} }
@Override @Override

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

@ -482,7 +482,7 @@ public class CharSprite extends MovieClip implements Tweener.Listener, MovieClip
@Override @Override
public void update() { public void update() {
if (paused && !looping()){ if (paused && !looping() && ch != null && curAnim != null){
Animation cur = curAnim; Animation cur = curAnim;
curAnim = null; curAnim = null;
listener.onComplete(cur); listener.onComplete(cur);