From 2d16304b804b350b5f0fe9fbb0a3375c1df56c1d Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 4 May 2018 01:16:13 +0000
Subject: [PATCH] Retail like builder message for demonic mode.

---
 .../handlers/admincommandhandlers/AdminTeleport.java       | 7 ++++---
 .../handlers/admincommandhandlers/AdminTeleport.java       | 7 ++++---
 .../handlers/admincommandhandlers/AdminTeleport.java       | 7 ++++---
 .../handlers/admincommandhandlers/AdminTeleport.java       | 7 ++++---
 .../handler/admincommandhandlers/AdminTeleport.java        | 3 +++
 .../handlers/admincommandhandlers/AdminTeleport.java       | 4 +++-
 .../handlers/admincommandhandlers/AdminTeleport.java       | 7 ++++---
 .../handlers/admincommandhandlers/AdminTeleport.java       | 7 ++++---
 8 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index 27bcfe9dd8..6afc6100f1 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -43,6 +43,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2RaidBossInstance;
 import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jmobius.gameserver.util.BuilderUtil;
 
 /**
  * This class handles following admin commands: - show_moves - show_teleport - teleport_to_character - move_to - teleport_character
@@ -84,17 +85,17 @@ public class AdminTeleport implements IAdminCommandHandler
 	{
 		if (command.equals("admin_instant_move"))
 		{
-			activeChar.sendMessage("Instant move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Instant move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.DEMONIC);
 		}
 		else if (command.equals("admin_teleto sayune"))
 		{
-			activeChar.sendMessage("Sayune move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Sayune move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.SAYUNE);
 		}
 		else if (command.equals("admin_teleto charge"))
 		{
-			activeChar.sendMessage("Charge move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Charge move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.CHARGE);
 		}
 		else if (command.equals("admin_teleto end"))
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index 27bcfe9dd8..6afc6100f1 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -43,6 +43,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2RaidBossInstance;
 import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jmobius.gameserver.util.BuilderUtil;
 
 /**
  * This class handles following admin commands: - show_moves - show_teleport - teleport_to_character - move_to - teleport_character
@@ -84,17 +85,17 @@ public class AdminTeleport implements IAdminCommandHandler
 	{
 		if (command.equals("admin_instant_move"))
 		{
-			activeChar.sendMessage("Instant move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Instant move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.DEMONIC);
 		}
 		else if (command.equals("admin_teleto sayune"))
 		{
-			activeChar.sendMessage("Sayune move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Sayune move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.SAYUNE);
 		}
 		else if (command.equals("admin_teleto charge"))
 		{
-			activeChar.sendMessage("Charge move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Charge move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.CHARGE);
 		}
 		else if (command.equals("admin_teleto end"))
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index 27bcfe9dd8..6afc6100f1 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -43,6 +43,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2RaidBossInstance;
 import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jmobius.gameserver.util.BuilderUtil;
 
 /**
  * This class handles following admin commands: - show_moves - show_teleport - teleport_to_character - move_to - teleport_character
@@ -84,17 +85,17 @@ public class AdminTeleport implements IAdminCommandHandler
 	{
 		if (command.equals("admin_instant_move"))
 		{
-			activeChar.sendMessage("Instant move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Instant move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.DEMONIC);
 		}
 		else if (command.equals("admin_teleto sayune"))
 		{
-			activeChar.sendMessage("Sayune move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Sayune move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.SAYUNE);
 		}
 		else if (command.equals("admin_teleto charge"))
 		{
-			activeChar.sendMessage("Charge move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Charge move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.CHARGE);
 		}
 		else if (command.equals("admin_teleto end"))
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index 27bcfe9dd8..6afc6100f1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -43,6 +43,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2RaidBossInstance;
 import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jmobius.gameserver.util.BuilderUtil;
 
 /**
  * This class handles following admin commands: - show_moves - show_teleport - teleport_to_character - move_to - teleport_character
@@ -84,17 +85,17 @@ public class AdminTeleport implements IAdminCommandHandler
 	{
 		if (command.equals("admin_instant_move"))
 		{
-			activeChar.sendMessage("Instant move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Instant move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.DEMONIC);
 		}
 		else if (command.equals("admin_teleto sayune"))
 		{
-			activeChar.sendMessage("Sayune move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Sayune move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.SAYUNE);
 		}
 		else if (command.equals("admin_teleto charge"))
 		{
-			activeChar.sendMessage("Charge move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Charge move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.CHARGE);
 		}
 		else if (command.equals("admin_teleto end"))
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java
index a5776181e3..3473af8cce 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/handler/admincommandhandlers/AdminTeleport.java
@@ -35,6 +35,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.templates.chars.L2NpcTemplate;
+import com.l2jmobius.gameserver.util.BuilderUtil;
 
 /**
  * This class handles following admin commands: - show_moves - show_teleport - teleport_to_character - move_to - teleport_character
@@ -102,6 +103,7 @@ public class AdminTeleport implements IAdminCommandHandler
 		// Alt+g window (instant move)
 		if (command.equals("admin_instant_move"))
 		{
+			BuilderUtil.sendSysMessage(activeChar, "Instant move ready. Click where you want to go.");
 			activeChar.setTeleMode(1);
 		}
 		// Send player to town (alt+g)
@@ -470,6 +472,7 @@ public class AdminTeleport implements IAdminCommandHandler
 					}
 					case "r":
 					{
+						BuilderUtil.sendSysMessage(activeChar, "Instant move ready. Click where you want to go.");
 						activeChar.setTeleMode(2);
 						break;
 					}
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index 39aa39d4a3..e9fca4ae0d 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -39,6 +39,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2RaidBossInstance;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jmobius.gameserver.util.BuilderUtil;
 
 /**
  * This class handles following admin commands: - show_moves - show_teleport - teleport_to_character - move_to - teleport_character
@@ -83,11 +84,12 @@ public class AdminTeleport implements IAdminCommandHandler
 		}
 		if (command.equals("admin_instant_move"))
 		{
-			activeChar.sendMessage("Instant move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Instant move ready. Click where you want to go.");
 			activeChar.setTeleMode(1);
 		}
 		if (command.equals("admin_teleto r"))
 		{
+			BuilderUtil.sendSysMessage(activeChar, "Instant move ready. Click where you want to go.");
 			activeChar.setTeleMode(2);
 		}
 		if (command.equals("admin_teleto end"))
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index 27bcfe9dd8..6afc6100f1 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -43,6 +43,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2RaidBossInstance;
 import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jmobius.gameserver.util.BuilderUtil;
 
 /**
  * This class handles following admin commands: - show_moves - show_teleport - teleport_to_character - move_to - teleport_character
@@ -84,17 +85,17 @@ public class AdminTeleport implements IAdminCommandHandler
 	{
 		if (command.equals("admin_instant_move"))
 		{
-			activeChar.sendMessage("Instant move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Instant move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.DEMONIC);
 		}
 		else if (command.equals("admin_teleto sayune"))
 		{
-			activeChar.sendMessage("Sayune move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Sayune move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.SAYUNE);
 		}
 		else if (command.equals("admin_teleto charge"))
 		{
-			activeChar.sendMessage("Charge move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Charge move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.CHARGE);
 		}
 		else if (command.equals("admin_teleto end"))
diff --git a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
index 27bcfe9dd8..6afc6100f1 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java
@@ -43,6 +43,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2RaidBossInstance;
 import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jmobius.gameserver.util.BuilderUtil;
 
 /**
  * This class handles following admin commands: - show_moves - show_teleport - teleport_to_character - move_to - teleport_character
@@ -84,17 +85,17 @@ public class AdminTeleport implements IAdminCommandHandler
 	{
 		if (command.equals("admin_instant_move"))
 		{
-			activeChar.sendMessage("Instant move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Instant move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.DEMONIC);
 		}
 		else if (command.equals("admin_teleto sayune"))
 		{
-			activeChar.sendMessage("Sayune move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Sayune move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.SAYUNE);
 		}
 		else if (command.equals("admin_teleto charge"))
 		{
-			activeChar.sendMessage("Charge move ready. Click where you want to go.");
+			BuilderUtil.sendSysMessage(activeChar, "Charge move ready. Click where you want to go.");
 			activeChar.setTeleMode(AdminTeleportType.CHARGE);
 		}
 		else if (command.equals("admin_teleto end"))