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

v2.5.0: fixed recent notes fix causing journal scene crashes

Browse Source
This commit is contained in:
Evan Debenham
2024-08-28 13:54:34 -04:00
parent c3c6d46f9a
commit 3c0b745501
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java
View File

@@ -379,7 +379,7 @@ public class Potion extends Item {
@Override @Override
public String info() { public String info() {
//skip custom notes if anonymized and un-Ided //skip custom notes if anonymized and un-Ided
return (anonymous && !handler.isKnown( this )) ? super.desc() : super.info(); return (anonymous && (handler == null || !handler.isKnown( this ))) ? super.desc() : super.info();
} }
@Override @Override

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java
View File

@@ -177,7 +177,7 @@ public class Ring extends KindofMisc {
public String info(){ public String info(){
//skip custom notes if anonymized and un-Ided //skip custom notes if anonymized and un-Ided
String desc = (anonymous && !handler.isKnown( this )) ? super.desc() : super.info(); String desc = (anonymous && (handler == null || !handler.isKnown( this ))) ? super.desc() : super.info();
if (cursed && isEquipped( Dungeon.hero )) { if (cursed && isEquipped( Dungeon.hero )) {
desc += "\n\n" + Messages.get(Ring.class, "cursed_worn"); desc += "\n\n" + Messages.get(Ring.class, "cursed_worn");

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

@@ -242,7 +242,7 @@ public abstract class Scroll extends Item {
@Override @Override
public String info() { public String info() {
//skip custom notes if anonymized and un-Ided //skip custom notes if anonymized and un-Ided
return (anonymous && !handler.isKnown( this )) ? super.desc() : super.info(); return (anonymous && (handler == null || !handler.isKnown( this ))) ? super.desc() : super.info();
} }
@Override @Override