From 2cb72f991a65c95abb73f9481593d842a2b2d6a9 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Thu, 5 Sep 2024 11:45:05 -0400 Subject: [PATCH] v2.5.0: fixed anon pot/scrl/rings calling super.desc instead of desc --- .../shatteredpixeldungeon/items/potions/Potion.java | 2 +- .../shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java | 2 +- .../shatteredpixeldungeon/items/scrolls/Scroll.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java index 054bdb258..9570454eb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/Potion.java @@ -379,7 +379,7 @@ public class Potion extends Item { @Override public String info() { //skip custom notes if anonymized and un-Ided - return (anonymous && (handler == null || !handler.isKnown( this ))) ? super.desc() : super.info(); + return (anonymous && (handler == null || !handler.isKnown( this ))) ? desc() : super.info(); } @Override diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java index 89d3eb76e..99d799cb0 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/Ring.java @@ -181,7 +181,7 @@ public class Ring extends KindofMisc { //skip custom notes if anonymized and un-Ided String desc; if (anonymous && (handler == null || !handler.isKnown( this ))){ - desc = super.desc(); + desc = desc(); } else { //otherwise, check for item type note too, rings can have either Notes.CustomRecord note = Notes.findCustomRecord(getClass()); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java index 4778b0c88..27e4bcf92 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java @@ -242,7 +242,7 @@ public abstract class Scroll extends Item { @Override public String info() { //skip custom notes if anonymized and un-Ided - return (anonymous && (handler == null || !handler.isKnown( this ))) ? super.desc() : super.info(); + return (anonymous && (handler == null || !handler.isKnown( this ))) ? desc() : super.info(); } @Override