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

v1.1.1: added a couple safety checks against crashes

Browse Source
This commit is contained in:
Evan Debenham 2021-12-20 16:06:24 -05:00
parent 5df083b21f
commit c61250c125
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java
View File

@ -55,6 +55,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfLullaby;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRage; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRage;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.exotic.ScrollOfDivination;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfMagicMissile; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfMagicMissile;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.SpiritBow; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.SpiritBow;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Dagger; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.Dagger;

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfDivination.java
View File

@ -111,7 +111,7 @@ public class ScrollOfDivination extends ExoticScroll {
total --; total --;
} }
if (total == 0){ if (left == 4){
GLog.n( Messages.get(this, "nothing_left") ); GLog.n( Messages.get(this, "nothing_left") );
} else { } else {
GameScene.show(new WndDivination(IDed)); GameScene.show(new WndDivination(IDed));

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/TippedDart.java
View File

@ -93,6 +93,9 @@ public abstract class TippedDart extends Dart {
} else if (index == 1){ } else if (index == 1){
detach(hero.belongings.backpack); detach(hero.belongings.backpack);
if (!new Dart().collect()) Dungeon.level.drop(new Dart(), hero.pos).sprite.drop(); if (!new Dart().collect()) Dungeon.level.drop(new Dart(), hero.pos).sprite.drop();
//reset durability if there are darts left in the stack
durability = MAX_DURABILITY;
hero.spend( 1f ); hero.spend( 1f );
hero.busy(); hero.busy();

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
View File

@ -627,7 +627,7 @@ public class GameScene extends PixelScene {
@Override @Override
public synchronized void onPause() { public synchronized void onPause() {
try { try {
if (!Dungeon.hero.ready) waitForActorThread(500, false); if (Dungeon.hero != null && !Dungeon.hero.ready) waitForActorThread(500, false);
Dungeon.saveAll(); Dungeon.saveAll();
Badges.saveGlobal(); Badges.saveGlobal();
Journal.saveGlobal(); Journal.saveGlobal();