From 9112d2506d297d8194a9e31ff22c1de63fa84bc7 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 1 Aug 2015 07:19:58 +0000
Subject: [PATCH] ExQuestNpcLogList fix for NpcString ids.

---
 .../network/serverpackets/ExQuestNpcLogList.java      | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExQuestNpcLogList.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExQuestNpcLogList.java
index f2588a1906..e757a1ab67 100644
--- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExQuestNpcLogList.java
+++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/ExQuestNpcLogList.java
@@ -31,6 +31,7 @@ public class ExQuestNpcLogList extends L2GameServerPacket
 {
 	private final int _questId;
 	private final List<NpcLogListHolder> _npcLogList = new ArrayList<>();
+	private boolean isNpcString = false;
 	
 	public ExQuestNpcLogList(int questId)
 	{
@@ -45,6 +46,7 @@ public class ExQuestNpcLogList extends L2GameServerPacket
 	public void addNpcString(NpcStringId npcStringId, int count)
 	{
 		_npcLogList.add(new NpcLogListHolder(npcStringId.getId(), true, count));
+		isNpcString = true;
 	}
 	
 	public void add(NpcLogListHolder holder)
@@ -61,7 +63,14 @@ public class ExQuestNpcLogList extends L2GameServerPacket
 		writeC(_npcLogList.size());
 		for (NpcLogListHolder holder : _npcLogList)
 		{
-			writeD(holder.getId() + 1000000); // npc id in client quest data is normal npc id + 1000000
+			if (isNpcString)
+			{
+				writeD(holder.getId());
+			}
+			else
+			{
+				writeD(holder.getId() + 1000000); // npc id in client quest data is normal npc id + 1000000
+			}
 			writeC(holder.isNpcString() ? 0x01 : 0x00);
 			writeD(holder.getCount());
 		}