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

v2.5.0: fixed enchant/glyph cleansing resulting in crashes

Browse Source
This commit is contained in:
Evan Debenham
2024-06-20 17:00:50 -04:00
parent f0542ebf1e
commit 351a74c567
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/armor/Armor.java
+1 -1
View File
@@ -635,7 +635,7 @@ public class Armor extends EquipableItem {
if (seal != null){ if (seal != null){
seal.setGlyph(glyph); seal.setGlyph(glyph);
} }
if (isIdentified() && Dungeon.hero != null if (glyph != null && isIdentified() && Dungeon.hero != null
&& Dungeon.hero.isAlive() && Dungeon.hero.belongings.contains(this)){ && Dungeon.hero.isAlive() && Dungeon.hero.belongings.contains(this)){
Catalog.setSeen(glyph.getClass()); Catalog.setSeen(glyph.getClass());
} }
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java
+1 -1
View File
@@ -353,7 +353,7 @@ abstract public class Weapon extends KindOfWeapon {
if (ench == null || !ench.curse()) curseInfusionBonus = false; if (ench == null || !ench.curse()) curseInfusionBonus = false;
enchantment = ench; enchantment = ench;
updateQuickslot(); updateQuickslot();
if (isIdentified() && Dungeon.hero != null if (ench != null && isIdentified() && Dungeon.hero != null
&& Dungeon.hero.isAlive() && Dungeon.hero.belongings.contains(this)){ && Dungeon.hero.isAlive() && Dungeon.hero.belongings.contains(this)){
Catalog.setSeen(ench.getClass()); Catalog.setSeen(ench.getClass());
} }