From 50fd3c185690048844530bb0eca40c45135d2801 Mon Sep 17 00:00:00 2001
From: Kam <KamronGaming@gmail.com>
Date: Tue, 24 Feb 2026 21:08:59 -0500
Subject: [PATCH] Fix Quest / Dialog Modification Names

---
 .../packets/request/dialog/DialogSavePacket.java       | 10 ----------
 .../network/packets/request/quest/QuestSavePacket.java |  7 -------
 .../npcs/client/gui/global/GuiNPCManageDialogs.java    |  3 +++
 .../npcs/client/gui/global/GuiNPCManageQuest.java      |  3 +++
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogSavePacket.java
index 87206c3c9..716a53feb 100644
--- a/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogSavePacket.java
+++ b/src/main/java/kamkeel/npcs/network/packets/request/dialog/DialogSavePacket.java
@@ -13,13 +13,10 @@ import kamkeel.npcs.util.ByteBufUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
-import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
 import noppes.npcs.CustomNpcsPermissions;
 import noppes.npcs.NoppesUtilServer;
 import noppes.npcs.controllers.DialogController;
-import noppes.npcs.controllers.QuestController;
 import noppes.npcs.controllers.data.Dialog;
-import noppes.npcs.controllers.data.Quest;
 
 import java.io.IOException;
 
@@ -83,13 +80,6 @@ public final class DialogSavePacket extends AbstractPacket {
             } else {
                 NoppesUtilServer.sendDialogData((EntityPlayerMP) player, dialog.category);
             }
-
-            // Send full dialog data back so the client doesn't need a second round-trip
-            NBTTagCompound dialogData = dialog.writeToNBT(new NBTTagCompound());
-            Quest quest = QuestController.Instance.quests.get(dialog.quest);
-            if (quest != null)
-                dialogData.setString("DialogQuestName", quest.title);
-            GuiDataPacket.sendGuiData((EntityPlayerMP) player, dialogData);
         }
     }
 }
diff --git a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestSavePacket.java b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestSavePacket.java
index 1eafb6c93..9fdfbb78e 100644
--- a/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestSavePacket.java
+++ b/src/main/java/kamkeel/npcs/network/packets/request/quest/QuestSavePacket.java
@@ -13,7 +13,6 @@ import kamkeel.npcs.util.ByteBufUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTTagCompound;
-import kamkeel.npcs.network.packets.data.large.GuiDataPacket;
 import noppes.npcs.CustomNpcsPermissions;
 import noppes.npcs.NoppesUtilServer;
 import noppes.npcs.controllers.QuestController;
@@ -80,12 +79,6 @@ public final class QuestSavePacket extends AbstractPacket {
             } else {
                 NoppesUtilServer.sendQuestData((EntityPlayerMP) player, quest.category);
             }
-
-            // Send full quest data back so the client doesn't need a second round-trip
-            NBTTagCompound questData = new NBTTagCompound();
-            if (quest.hasNewQuest())
-                questData.setString("NextQuestTitle", quest.getNextQuest().title);
-            GuiDataPacket.sendGuiData((EntityPlayerMP) player, quest.writeToNBT(questData));
         }
     }
 }
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java
index eb0ede5bf..9267366d0 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageDialogs.java
@@ -411,6 +411,9 @@ public class GuiNPCManageDialogs extends GuiNPCInterface2 implements IScrollData
         }
         if (subgui instanceof SubGuiNpcDialog) {
             saveType(true);
+            if (dialog != null && dialog.id >= 0) {
+                setPrevDialogName(dialog.title);
+            }
         }
     }
 
diff --git a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java
index f3d1679f2..e4e65d3c4 100644
--- a/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java
+++ b/src/main/java/noppes/npcs/client/gui/global/GuiNPCManageQuest.java
@@ -401,6 +401,9 @@ public class GuiNPCManageQuest extends GuiNPCInterface2 implements IScrollData,
         }
         if (subgui instanceof SubGuiNpcQuest) {
             saveType(true);
+            if (quest != null && quest.id >= 0) {
+                setPrevQuestName(quest.title);
+            }
         }
     }