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

v2.2.0: added a couple safety checks to the object examine function

Browse Source
This commit is contained in:
Evan Debenham
2023-09-05 11:51:37 -04:00
parent cb700b445c
commit 741321bab9
1 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/scenes/GameScene.java
+2 -2
View File
@@ -1490,13 +1490,13 @@ public class GameScene extends PixelScene {
public static void examineObject(Object o){ public static void examineObject(Object o){
if (o == Dungeon.hero){ if (o == Dungeon.hero){
GameScene.show( new WndHero() ); GameScene.show( new WndHero() );
} else if ( o instanceof Mob ){ } else if ( o instanceof Mob && ((Mob) o).isActive() ){
GameScene.show(new WndInfoMob((Mob) o)); GameScene.show(new WndInfoMob((Mob) o));
if (o instanceof Snake && !Document.ADVENTURERS_GUIDE.isPageRead(Document.GUIDE_SURPRISE_ATKS)){ if (o instanceof Snake && !Document.ADVENTURERS_GUIDE.isPageRead(Document.GUIDE_SURPRISE_ATKS)){
GLog.p(Messages.get(Guidebook.class, "hint")); GLog.p(Messages.get(Guidebook.class, "hint"));
GameScene.flashForDocument(Document.ADVENTURERS_GUIDE, Document.GUIDE_SURPRISE_ATKS); GameScene.flashForDocument(Document.ADVENTURERS_GUIDE, Document.GUIDE_SURPRISE_ATKS);
} }
} else if ( o instanceof Heap ){ } else if ( o instanceof Heap && !((Heap) o).isEmpty() ){
GameScene.show(new WndInfoItem((Heap)o)); GameScene.show(new WndInfoItem((Heap)o));
} else if ( o instanceof Plant ){ } else if ( o instanceof Plant ){
GameScene.show( new WndInfoPlant((Plant) o) ); GameScene.show( new WndInfoPlant((Plant) o) );