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

v2.5.0: fixed crash errors in catalogs

Browse Source
This commit is contained in:
Evan Debenham
2024-08-25 22:18:27 -04:00
parent 2a1f46b21c
commit 3cc21b55a8
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/Dart.java
View File

@@ -112,8 +112,9 @@ public class Dart extends MissileWeapon {
protected static Crossbow bow;
private void updateCrossbow(){
if (Dungeon.hero == null) return;
if (Dungeon.hero.belongings.weapon() instanceof Crossbow){
if (Dungeon.hero == null) {
bow = null;
} else if (Dungeon.hero.belongings.weapon() instanceof Crossbow){
bow = (Crossbow) Dungeon.hero.belongings.weapon();
} else if (Dungeon.hero.belongings.secondWep() instanceof Crossbow) {
//player can instant swap anyway, so this is just QoL

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

@@ -198,7 +198,7 @@ public abstract class TippedDart extends Dart {
float usages = Math.round(MAX_DURABILITY/use);
//grants 3+lvl extra uses with charged shot
if (bow != null && Dungeon.hero.buff(Crossbow.ChargedShot.class) != null){
if (bow != null && Dungeon.hero != null && Dungeon.hero.buff(Crossbow.ChargedShot.class) != null){
usages += 3 + bow.buffedLvl();
}

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/sprites/GooSprite.java
View File

@@ -147,8 +147,10 @@ public class GooSprite extends MobSprite {
@Override
public void update() {
super.update();
spray.pos(center());
spray.visible = visible;
if (spray != null) {
spray.pos(center());
spray.visible = visible;
}
}
public static class GooParticle extends PixelParticle.Shrinking {