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

v3.0.1: added safety checks to loading for sandals and spellbook

Browse Source
This commit is contained in:
Evan Debenham
2025-03-06 11:14:25 -05:00
parent 561b7b902f
commit 4576147103
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/SandalsOfNature.java
View File

@@ -65,7 +65,6 @@ import com.watabou.utils.Random;
import com.watabou.utils.Reflection; import com.watabou.utils.Reflection;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
public class SandalsOfNature extends Artifact { public class SandalsOfNature extends Artifact {
@@ -256,8 +255,11 @@ public class SandalsOfNature extends Artifact {
@Override @Override
public void restoreFromBundle( Bundle bundle ) { public void restoreFromBundle( Bundle bundle ) {
super.restoreFromBundle(bundle); super.restoreFromBundle(bundle);
seeds.clear();
if (bundle.contains(SEEDS) && bundle.getClassArray(SEEDS) != null) { if (bundle.contains(SEEDS) && bundle.getClassArray(SEEDS) != null) {
Collections.addAll(seeds, bundle.getClassArray(SEEDS)); for (Class<?> seed : bundle.getClassArray(SEEDS)) {
if (seed != null) seeds.add(seed);
}
} }
curSeedEffect = bundle.getClass(CUR_SEED_EFFECT); curSeedEffect = bundle.getClass(CUR_SEED_EFFECT);

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java
View File

@@ -61,7 +61,6 @@ import com.watabou.utils.Random;
import com.watabou.utils.Reflection; import com.watabou.utils.Reflection;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
public class UnstableSpellbook extends Artifact { public class UnstableSpellbook extends Artifact {
@@ -330,8 +329,10 @@ public class UnstableSpellbook extends Artifact {
public void restoreFromBundle( Bundle bundle ) { public void restoreFromBundle( Bundle bundle ) {
super.restoreFromBundle(bundle); super.restoreFromBundle(bundle);
scrolls.clear(); scrolls.clear();
if (bundle.contains(SCROLLS)) { if (bundle.contains(SCROLLS) && bundle.getClassArray(SCROLLS) != null) {
Collections.addAll(scrolls, bundle.getClassArray(SCROLLS)); for (Class<?> scroll : bundle.getClassArray(SCROLLS)) {
if (scroll != null) scrolls.add(scroll);
}
} }
} }