From e66978f88ca04bd1882d462bcf0139e4016021c0 Mon Sep 17 00:00:00 2001 From: CK_Rainbow Date: Mon, 30 Oct 2023 19:36:41 +0800 Subject: [PATCH 1/2] fix: null character error in slave>manage>inspect --- .../game/dialogue/companions/CompanionManagement.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/lilithsthrone/game/dialogue/companions/CompanionManagement.java b/src/com/lilithsthrone/game/dialogue/companions/CompanionManagement.java index 95a418f874..c8e6f6eff5 100644 --- a/src/com/lilithsthrone/game/dialogue/companions/CompanionManagement.java +++ b/src/com/lilithsthrone/game/dialogue/companions/CompanionManagement.java @@ -830,6 +830,7 @@ public String getLabel() { @Override public String getContent() { NPC character = characterSelected(); + CharactersPresentDialogue.resetContent(character); UtilText.nodeContentSB.setLength(0); From 4a0a4909c036d0cc62f9031fb7baa0a5f150ac87 Mon Sep 17 00:00:00 2001 From: CK_Rainbow Date: Mon, 30 Oct 2023 19:56:06 +0800 Subject: [PATCH 2/2] fix: maybe that's a better way to handle this --- .../game/dialogue/companions/CompanionManagement.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/com/lilithsthrone/game/dialogue/companions/CompanionManagement.java b/src/com/lilithsthrone/game/dialogue/companions/CompanionManagement.java index c8e6f6eff5..1564b0fa39 100644 --- a/src/com/lilithsthrone/game/dialogue/companions/CompanionManagement.java +++ b/src/com/lilithsthrone/game/dialogue/companions/CompanionManagement.java @@ -826,11 +826,15 @@ public DialogueNodeType getDialogueNodeType() { public String getLabel() { return UtilText.parse(characterSelected(), "Inspecting [npc.Name]"); } + + @Override + public void applyPreParsingEffects() { + CharactersPresentDialogue.resetContent(characterSelected()); + } @Override public String getContent() { NPC character = characterSelected(); - CharactersPresentDialogue.resetContent(character); UtilText.nodeContentSB.setLength(0);