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

v0.9.1b: added various safety checks to prevent crashes

Browse Source
This commit is contained in:
Evan Debenham
2020-12-31 22:20:27 -05:00
parent 90721786a2
commit 4f4174c7b9
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Item.java
+2 -1
View File
@@ -570,7 +570,8 @@ public class Item implements Bundlable {
@Override
public void call() {
curUser = user;
Item.this.detach(user.belongings.backpack).onThrow(cell);
Item i = Item.this.detach(user.belongings.backpack);
if (i != null) i.onThrow(cell);
if (curUser.hasTalent(Talent.IMPROVISED_PROJECTILES)
&& !(Item.this instanceof MissileWeapon)
&& curUser.buff(Talent.ImprovisedProjectileCooldown.class) == null){
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GhoulSprite.java
+13 -2
View File
@@ -22,6 +22,7 @@
package com.shatteredpixel.shatteredpixeldungeon.sprites;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.watabou.noosa.Game;
import com.watabou.noosa.TextureFilm;
public class GhoulSprite extends MobSprite {
@@ -44,10 +45,10 @@ public class GhoulSprite extends MobSprite {
attack = new Animation( 12, false );
attack.frames( frames, 0, 8, 9 );
crumple = new Animation( 15, false);
crumple = new Animation( 1, false);
crumple.frames( frames, 0, 10, 11, 12 );
die = new Animation( 15, false );
die = new Animation( 1, false );
die.frames( frames, 0, 10, 11, 12, 13 );
play( idle );
@@ -58,6 +59,16 @@ public class GhoulSprite extends MobSprite {
play(crumple);
}
@Override
public void move(int from, int to) {
if (parent == null){
//fixme this happens rarely, likely due to ghoul like link?
Game.reportException(new RuntimeException("ghoul sprite tried to move with null parent! ghoul HP: " + ch.HP));
return;
}
super.move(from, to);
}
@Override
public void die() {
if (curAnim == crumple){