From b6870bbede709c098fa1eeabde588e4848368a0a Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 4 May 2018 16:34:02 +0000
Subject: [PATCH] Send normal message when builder config is disabled.

---
 .../com/l2jmobius/gameserver/util/BuilderUtil.java     | 10 +++++++++-
 .../com/l2jmobius/gameserver/util/BuilderUtil.java     | 10 +++++++++-
 .../com/l2jmobius/gameserver/util/BuilderUtil.java     | 10 +++++++++-
 .../com/l2jmobius/gameserver/util/BuilderUtil.java     | 10 +++++++++-
 .../com/l2jmobius/gameserver/util/BuilderUtil.java     | 10 +++++++++-
 .../com/l2jmobius/gameserver/util/BuilderUtil.java     | 10 +++++++++-
 .../com/l2jmobius/gameserver/util/BuilderUtil.java     | 10 +++++++++-
 .../com/l2jmobius/gameserver/util/BuilderUtil.java     | 10 +++++++++-
 8 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/BuilderUtil.java
index dda9d816a6..bbc3a5155d 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/util/BuilderUtil.java
@@ -16,6 +16,7 @@
  */
 package com.l2jmobius.gameserver.util;
 
+import com.l2jmobius.Config;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -38,7 +39,14 @@ public final class BuilderUtil
 	 */
 	public static void sendSysMessage(L2PcInstance player, String message)
 	{
-		player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+		if (Config.GM_STARTUP_BUILDER_HIDE)
+		{
+			player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+		}
+		else
+		{
+			player.sendMessage(message);
+		}
 	}
 	
 	/**
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/BuilderUtil.java
index dda9d816a6..bbc3a5155d 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/util/BuilderUtil.java
@@ -16,6 +16,7 @@
  */
 package com.l2jmobius.gameserver.util;
 
+import com.l2jmobius.Config;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -38,7 +39,14 @@ public final class BuilderUtil
 	 */
 	public static void sendSysMessage(L2PcInstance player, String message)
 	{
-		player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+		if (Config.GM_STARTUP_BUILDER_HIDE)
+		{
+			player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+		}
+		else
+		{
+			player.sendMessage(message);
+		}
 	}
 	
 	/**
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/BuilderUtil.java
index dda9d816a6..bbc3a5155d 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/util/BuilderUtil.java
@@ -16,6 +16,7 @@
  */
 package com.l2jmobius.gameserver.util;
 
+import com.l2jmobius.Config;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -38,7 +39,14 @@ public final class BuilderUtil
 	 */
 	public static void sendSysMessage(L2PcInstance player, String message)
 	{
-		player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+		if (Config.GM_STARTUP_BUILDER_HIDE)
+		{
+			player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+		}
+		else
+		{
+			player.sendMessage(message);
+		}
 	}
 	
 	/**
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/BuilderUtil.java
index ab477ff8d9..24d7f965ac 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/util/BuilderUtil.java
@@ -16,6 +16,7 @@
  */
 package com.l2jmobius.gameserver.util;
 
+import com.l2jmobius.Config;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -38,7 +39,14 @@ public final class BuilderUtil
 	 */
 	public static void sendSysMessage(L2PcInstance player, String message)
 	{
-		player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+		if (Config.GM_STARTUP_BUILDER_HIDE)
+		{
+			player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+		}
+		else
+		{
+			player.sendMessage(message);
+		}
 	}
 	
 	/**
diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/BuilderUtil.java
index ce8603b835..3969784ffc 100644
--- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/util/BuilderUtil.java
@@ -16,6 +16,7 @@
  */
 package com.l2jmobius.gameserver.util;
 
+import com.l2jmobius.Config;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.clientpackets.Say2;
 import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -37,7 +38,14 @@ public final class BuilderUtil
 	 */
 	public static void sendSysMessage(L2PcInstance player, String message)
 	{
-		player.sendPacket(new CreatureSay(0, Say2.ALL, "SYS", message));
+		if (Config.GM_STARTUP_BUILDER_HIDE)
+		{
+			player.sendPacket(new CreatureSay(0, Say2.ALL, "SYS", message));
+		}
+		else
+		{
+			player.sendMessage(message);
+		}
 	}
 	
 	/**
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/BuilderUtil.java
index 8e6250bed6..347ccc3730 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/BuilderUtil.java
@@ -16,6 +16,7 @@
  */
 package com.l2jmobius.gameserver.util;
 
+import com.l2jmobius.Config;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -37,7 +38,14 @@ public final class BuilderUtil
 	 */
 	public static void sendSysMessage(L2PcInstance player, String message)
 	{
-		player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+		if (Config.GM_STARTUP_BUILDER_HIDE)
+		{
+			player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+		}
+		else
+		{
+			player.sendMessage(message);
+		}
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/BuilderUtil.java
index dda9d816a6..bbc3a5155d 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/util/BuilderUtil.java
@@ -16,6 +16,7 @@
  */
 package com.l2jmobius.gameserver.util;
 
+import com.l2jmobius.Config;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -38,7 +39,14 @@ public final class BuilderUtil
 	 */
 	public static void sendSysMessage(L2PcInstance player, String message)
 	{
-		player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+		if (Config.GM_STARTUP_BUILDER_HIDE)
+		{
+			player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+		}
+		else
+		{
+			player.sendMessage(message);
+		}
 	}
 	
 	/**
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/BuilderUtil.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/BuilderUtil.java
index dda9d816a6..bbc3a5155d 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/BuilderUtil.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/util/BuilderUtil.java
@@ -16,6 +16,7 @@
  */
 package com.l2jmobius.gameserver.util;
 
+import com.l2jmobius.Config;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -38,7 +39,14 @@ public final class BuilderUtil
 	 */
 	public static void sendSysMessage(L2PcInstance player, String message)
 	{
-		player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+		if (Config.GM_STARTUP_BUILDER_HIDE)
+		{
+			player.sendPacket(new CreatureSay(0, ChatType.GENERAL, "SYS", message));
+		}
+		else
+		{
+			player.sendMessage(message);
+		}
 	}
 	
 	/**