From 6ecaec7eaa9dc408bf9a984cc5155558795716a3 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 18 Jun 2022 23:45:52 +0000
Subject: [PATCH] Proper Tarti message for Death Knights. Contributed by
 negrito8.

---
 .../Q11024_PathOfDestinyBeginning.java                          | 2 +-
 .../l2jmobius/gameserver/network/clientpackets/EnterWorld.java  | 2 +-
 .../Q11024_PathOfDestinyBeginning.java                          | 2 +-
 .../l2jmobius/gameserver/network/clientpackets/EnterWorld.java  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
index 5564c57af0..ed51c01f19 100644
--- a/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
+++ b/L2J_Mobius_10.1_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
@@ -419,7 +419,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 		final QuestState qs = getQuestState(player, false);
 		if (!Config.DISABLE_TUTORIAL && (qs == null) && (player.getLevel() < 20))
 		{
-			showOnScreenMsg(player, NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
+			showOnScreenMsg(player, player.isDeathKnight() ? NpcStringId.TARTI_IS_SAID_TO_TAKE_INTEREST_IN_AN_ADVENTURER_NAMED_S1 : NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
 			return;
 		}
 		
diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index cc4deb7c90..706add80b6 100644
--- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -486,7 +486,7 @@ public class EnterWorld implements IClientIncomingPacket
 			player.sendPacket(player.isDeathKnight() ? ExShowUsm.DEATH_KNIGHT_INTRO : ExShowUsm.ANTHARAS_INTRO);
 			if (!Config.DISABLE_TUTORIAL)
 			{
-				ThreadPool.schedule(() -> player.sendPacket(new ExShowScreenMessage(NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName())), player.isDeathKnight() ? 30000 : 15000);
+				ThreadPool.schedule(() -> player.sendPacket(new ExShowScreenMessage(player.isDeathKnight() ? NpcStringId.TARTI_IS_SAID_TO_TAKE_INTEREST_IN_AN_ADVENTURER_NAMED_S1 : NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName())), player.isDeathKnight() ? 30000 : 15000);
 			}
 		}
 		
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
index 5564c57af0..ed51c01f19 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java
@@ -419,7 +419,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
 		final QuestState qs = getQuestState(player, false);
 		if (!Config.DISABLE_TUTORIAL && (qs == null) && (player.getLevel() < 20))
 		{
-			showOnScreenMsg(player, NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
+			showOnScreenMsg(player, player.isDeathKnight() ? NpcStringId.TARTI_IS_SAID_TO_TAKE_INTEREST_IN_AN_ADVENTURER_NAMED_S1 : NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
 			return;
 		}
 		
diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index cc4deb7c90..706add80b6 100644
--- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -486,7 +486,7 @@ public class EnterWorld implements IClientIncomingPacket
 			player.sendPacket(player.isDeathKnight() ? ExShowUsm.DEATH_KNIGHT_INTRO : ExShowUsm.ANTHARAS_INTRO);
 			if (!Config.DISABLE_TUTORIAL)
 			{
-				ThreadPool.schedule(() -> player.sendPacket(new ExShowScreenMessage(NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName())), player.isDeathKnight() ? 30000 : 15000);
+				ThreadPool.schedule(() -> player.sendPacket(new ExShowScreenMessage(player.isDeathKnight() ? NpcStringId.TARTI_IS_SAID_TO_TAKE_INTEREST_IN_AN_ADVENTURER_NAMED_S1 : NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName())), player.isDeathKnight() ? 30000 : 15000);
 			}
 		}