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

v3.1.0: fixed errors in note conversion for old runs

Browse Source
This commit is contained in:
Evan Debenham
2025-04-20 19:57:30 -04:00
parent 487d0c7fe7
commit 8fcb0d03a9
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/journal/Notes.java
+3 -7
View File
@@ -377,6 +377,7 @@ public class Notes {
DEPTH, DEPTH,
ITEM_TYPE, ITEM_TYPE,
SPECIFIC_ITEM, SPECIFIC_ITEM,
ITEM //for pre-3.1 save conversion
} }
public static class CustomRecord extends Record { public static class CustomRecord extends Record {
@@ -518,17 +519,12 @@ public class Notes {
@Override @Override
public void restoreFromBundle(Bundle bundle) { public void restoreFromBundle(Bundle bundle) {
super.restoreFromBundle(bundle); super.restoreFromBundle(bundle);
try { type = bundle.getEnum(TYPE, CustomType.class);
type = bundle.getEnum(TYPE, CustomType.class);
} catch (Exception e){
//prior to v3.1 specific item notes and item type notes were the same
type = null;
}
ID = bundle.getInt(ID_NUMBER); ID = bundle.getInt(ID_NUMBER);
if (bundle.contains(ITEM_CLASS)) { if (bundle.contains(ITEM_CLASS)) {
itemClass = bundle.getClass(ITEM_CLASS); itemClass = bundle.getClass(ITEM_CLASS);
if (type == null){ if (type == CustomType.ITEM){
//prior to v3.1 specific item notes and item type notes were the same //prior to v3.1 specific item notes and item type notes were the same
//we assume notes are for a specific item if they're for an equipment //we assume notes are for a specific item if they're for an equipment
if (EquipableItem.class.isAssignableFrom(itemClass)){ if (EquipableItem.class.isAssignableFrom(itemClass)){