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

v2.1.4: fixed a couple rare crash bugs

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/effects/Surprise.java
+1 -1
View File
@@ -76,7 +76,7 @@ public class Surprise extends Image {
} }
public static void hit(Char ch, float angle) { 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); Surprise s = (Surprise) ch.sprite.parent.recycle(Surprise.class);
ch.sprite.parent.bringToFront(s); ch.sprite.parent.bringToFront(s);
s.reset(ch.sprite); s.reset(ch.sprite);
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfDisarming.java
+3 -3
View File
@@ -30,7 +30,6 @@ import com.shatteredpixel.shatteredpixeldungeon.mechanics.ShadowCaster;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
import com.watabou.utils.Point; import com.watabou.utils.Point;
import com.watabou.utils.Random;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@@ -76,7 +75,8 @@ public class StoneOfDisarming extends Runestone {
curr++; curr++;
} }
} }
Collections.shuffle(disarmCandidates);
Collections.sort(disarmCandidates, new Comparator<Trap>() { Collections.sort(disarmCandidates, new Comparator<Trap>() {
@Override @Override
public int compare(Trap o1, Trap o2) { public int compare(Trap o1, Trap o2) {
@@ -84,7 +84,7 @@ public class StoneOfDisarming extends Runestone {
if (diff < 0){ if (diff < 0){
return -1; return -1;
} else if (diff == 0){ } else if (diff == 0){
return Random.Int(2) == 0 ? -1 : 1; return 0;
} else { } else {
return 1; return 1;
} }