v2.1.4: fixed a couple rare crash bugs

This commit is contained in:
Evan Debenham
2023-07-03 15:44:01 -04:00
parent 05845901d0
commit f804ec36a8
2 changed files with 4 additions and 4 deletions
@@ -76,7 +76,7 @@ public class Surprise extends Image {
}
public static void hit(Char ch, float angle) {
if (ch.sprite.parent != null) {
if (ch.sprite != null && ch.sprite.parent != null) {
Surprise s = (Surprise) ch.sprite.parent.recycle(Surprise.class);
ch.sprite.parent.bringToFront(s);
s.reset(ch.sprite);
@@ -30,7 +30,6 @@ import com.shatteredpixel.shatteredpixeldungeon.mechanics.ShadowCaster;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.watabou.noosa.audio.Sample;
import com.watabou.utils.Point;
import com.watabou.utils.Random;
import java.util.ArrayList;
import java.util.Collections;
@@ -76,7 +75,8 @@ public class StoneOfDisarming extends Runestone {
curr++;
}
}
Collections.shuffle(disarmCandidates);
Collections.sort(disarmCandidates, new Comparator<Trap>() {
@Override
public int compare(Trap o1, Trap o2) {
@@ -84,7 +84,7 @@ public class StoneOfDisarming extends Runestone {
if (diff < 0){
return -1;
} else if (diff == 0){
return Random.Int(2) == 0 ? -1 : 1;
return 0;
} else {
return 1;
}