From 70cc9450102d65e1c63853810f32f56eb952b115 Mon Sep 17 00:00:00 2001
From: OMGeeky <aalaalgmx@gmail.com>
Date: Sat, 21 Jun 2025 20:24:33 +0200
Subject: [PATCH] misc

---
 .../atcontentstudio/ui/gamedataeditors/DialogueEditor.java  | 4 ++--
 src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java    | 3 +--
 src/com/gpl/rpg/atcontentstudio/utils/UiUtils.java          | 6 ++++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java
index fd05036..4b84538 100644
--- a/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/gamedataeditors/DialogueEditor.java
@@ -135,8 +135,8 @@ public class DialogueEditor extends JSONElementEditor {
         messageField = addTranslatableTextArea(pane, "Message: ", dialogue.message, dialogue.writable, listener);
         switchToNpcBox = addNPCBox(pane, dialogue.getProject(), "Switch active NPC to: ", dialogue.switch_to_npc, dialogue.writable, listener);
 
-        RewardsCellRenderer cellRendererRewards = new RewardsCellRenderer();
         String titleRewards = "Reaching this phrase gives the following rewards: ";
+        RewardsCellRenderer cellRendererRewards = new RewardsCellRenderer();
         rewardsListModel = new RewardsListModel(dialogue);
 
         CollapsiblePanel rewards = UiUtils.getCollapsibleItemList(
@@ -441,9 +441,9 @@ public class DialogueEditor extends JSONElementEditor {
         updateRepliesParamsEditorPane(repliesParamsPane, reply, listener);
         pane.add(repliesParamsPane, JideBoxLayout.FIX);
 
+        ReplyRequirementsCellRenderer cellRendererRequirements = new ReplyRequirementsCellRenderer();
         String titleRequirements = "Requirements the player must fulfill to select this reply: ";
         requirementsListModel = new ReplyRequirementsListModel(reply);
-        ReplyRequirementsCellRenderer cellRendererRequirements = new ReplyRequirementsCellRenderer();
         UiUtils.CollapsibleItemListCreation itemsPane = UiUtils.getCollapsibleItemList(
                 listener,
                 requirementsListModel,
diff --git a/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java b/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java
index 7a354e9..a774e5b 100644
--- a/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java
+++ b/src/com/gpl/rpg/atcontentstudio/ui/map/TMXMapEditor.java
@@ -1080,8 +1080,7 @@ public class TMXMapEditor extends Editor implements TMXMap.MapChangedOnDiskListe
         }
 
         public void addObject(String source, String target) {
-            ReplaceArea.Replacement repl = this.source.createReplacement(source, target);
-            addObject(repl);
+            addObject(this.source.createReplacement(source, target));
         }
     }
 
diff --git a/src/com/gpl/rpg/atcontentstudio/utils/UiUtils.java b/src/com/gpl/rpg/atcontentstudio/utils/UiUtils.java
index 65631b8..bfda654 100644
--- a/src/com/gpl/rpg/atcontentstudio/utils/UiUtils.java
+++ b/src/com/gpl/rpg/atcontentstudio/utils/UiUtils.java
@@ -157,8 +157,10 @@ public class UiUtils {
                     E selectedValue = itemsList.getSelectedValue();
                     if (selectedValue == null) return;
                     GameDataElement referencedObj = getReferencedObj.doIt(selectedValue);
-                    ATContentStudio.frame.openEditor(referencedObj);
-                    ATContentStudio.frame.selectInTree(referencedObj);
+                    if (referencedObj != null) {
+                        ATContentStudio.frame.openEditor(referencedObj);
+                        ATContentStudio.frame.selectInTree(referencedObj);
+                    }
                 }
             }
         });