Support for builder messages through SendMessageLocalisationData.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java

@@ -28,6 +28,7 @@ import org.w3c.dom.Document;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**
  * @author Mobius
@@ -86,9 +87,11 @@ public class SendMessageLocalisationData implements IXmlReader
 		}));
 	}
 	
-	public String getLocalisation(String lang, String message)
+	public static String getLocalisation(PlayerInstance player, String message)
 	{
-		final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(lang);
+		if (Config.MULTILANG_ENABLE)
+		{
+			final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang());
 			if (localisations != null)
 			{
 				// No pretty way of doing something like this.
@@ -126,13 +129,14 @@ public class SendMessageLocalisationData implements IXmlReader
 							{
 								message = message.replace(searchMessage[i], replacementMessage[i]);
 							}
+							break;
+						}
+					}
+				}
+			}
+		}
 		return message;
 	}
-				}
-			}
-		}
-		return null;
-	}
 	
 	public static SendMessageLocalisationData getInstance()
 	{

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -8985,16 +8985,7 @@ public class PlayerInstance extends Playable
 	@Override
 	public void sendMessage(String message)
 	{
-		if (Config.MULTILANG_ENABLE)
+		sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
-		{
-			final String localisation = SendMessageLocalisationData.getInstance().getLocalisation(_lang, message);
-			if (localisation != null)
-			{
-				sendPacket(new SystemMessage(localisation));
-				return;
-			}
-		}
-		sendPacket(new SystemMessage(message));
 	}
 	
 	public void setObserving(boolean state)

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/util/BuilderUtil.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.util;
 
 import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -41,7 +42,7 @@ public class BuilderUtil
 	{
 		if (Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message));
+			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", SendMessageLocalisationData.getLocalisation(player, message)));
 		}
 		else
 		{

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java

@@ -28,6 +28,7 @@ import org.w3c.dom.Document;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**
  * @author Mobius
@@ -86,9 +87,11 @@ public class SendMessageLocalisationData implements IXmlReader
 		}));
 	}
 	
-	public String getLocalisation(String lang, String message)
+	public static String getLocalisation(PlayerInstance player, String message)
 	{
-		final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(lang);
+		if (Config.MULTILANG_ENABLE)
+		{
+			final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang());
 			if (localisations != null)
 			{
 				// No pretty way of doing something like this.
@@ -126,13 +129,14 @@ public class SendMessageLocalisationData implements IXmlReader
 							{
 								message = message.replace(searchMessage[i], replacementMessage[i]);
 							}
+							break;
+						}
+					}
+				}
+			}
+		}
 		return message;
 	}
-				}
-			}
-		}
-		return null;
-	}
 	
 	public static SendMessageLocalisationData getInstance()
 	{

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -8992,16 +8992,7 @@ public class PlayerInstance extends Playable
 	@Override
 	public void sendMessage(String message)
 	{
-		if (Config.MULTILANG_ENABLE)
+		sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
-		{
-			final String localisation = SendMessageLocalisationData.getInstance().getLocalisation(_lang, message);
-			if (localisation != null)
-			{
-				sendPacket(new SystemMessage(localisation));
-				return;
-			}
-		}
-		sendPacket(new SystemMessage(message));
 	}
 	
 	public void setObserving(boolean state)

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/util/BuilderUtil.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.util;
 
 import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -41,7 +42,7 @@ public class BuilderUtil
 	{
 		if (Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message));
+			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", SendMessageLocalisationData.getLocalisation(player, message)));
 		}
 		else
 		{

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java

@@ -28,6 +28,7 @@ import org.w3c.dom.Document;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**
  * @author Mobius
@@ -86,9 +87,11 @@ public class SendMessageLocalisationData implements IXmlReader
 		}));
 	}
 	
-	public String getLocalisation(String lang, String message)
+	public static String getLocalisation(PlayerInstance player, String message)
 	{
-		final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(lang);
+		if (Config.MULTILANG_ENABLE)
+		{
+			final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang());
 			if (localisations != null)
 			{
 				// No pretty way of doing something like this.
@@ -126,13 +129,14 @@ public class SendMessageLocalisationData implements IXmlReader
 							{
 								message = message.replace(searchMessage[i], replacementMessage[i]);
 							}
+							break;
+						}
+					}
+				}
+			}
+		}
 		return message;
 	}
-				}
-			}
-		}
-		return null;
-	}
 	
 	public static SendMessageLocalisationData getInstance()
 	{

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -8994,16 +8994,7 @@ public class PlayerInstance extends Playable
 	@Override
 	public void sendMessage(String message)
 	{
-		if (Config.MULTILANG_ENABLE)
+		sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
-		{
-			final String localisation = SendMessageLocalisationData.getInstance().getLocalisation(_lang, message);
-			if (localisation != null)
-			{
-				sendPacket(new SystemMessage(localisation));
-				return;
-			}
-		}
-		sendPacket(new SystemMessage(message));
 	}
 	
 	public void setObserving(boolean state)

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/util/BuilderUtil.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.util;
 
 import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -41,7 +42,7 @@ public class BuilderUtil
 	{
 		if (Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message));
+			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", SendMessageLocalisationData.getLocalisation(player, message)));
 		}
 		else
 		{

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java

@@ -28,6 +28,7 @@ import org.w3c.dom.Document;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**
  * @author Mobius
@@ -86,9 +87,11 @@ public class SendMessageLocalisationData implements IXmlReader
 		}));
 	}
 	
-	public String getLocalisation(String lang, String message)
+	public static String getLocalisation(PlayerInstance player, String message)
 	{
-		final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(lang);
+		if (Config.MULTILANG_ENABLE)
+		{
+			final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang());
 			if (localisations != null)
 			{
 				// No pretty way of doing something like this.
@@ -126,13 +129,14 @@ public class SendMessageLocalisationData implements IXmlReader
 							{
 								message = message.replace(searchMessage[i], replacementMessage[i]);
 							}
+							break;
+						}
+					}
+				}
+			}
+		}
 		return message;
 	}
-				}
-			}
-		}
-		return null;
-	}
 	
 	public static SendMessageLocalisationData getInstance()
 	{

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -8978,16 +8978,7 @@ public class PlayerInstance extends Playable
 	@Override
 	public void sendMessage(String message)
 	{
-		if (Config.MULTILANG_ENABLE)
+		sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
-		{
-			final String localisation = SendMessageLocalisationData.getInstance().getLocalisation(_lang, message);
-			if (localisation != null)
-			{
-				sendPacket(new SystemMessage(localisation));
-				return;
-			}
-		}
-		sendPacket(new SystemMessage(message));
 	}
 	
 	public void setObserving(boolean state)

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/util/BuilderUtil.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.util;
 
 import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -41,7 +42,7 @@ public class BuilderUtil
 	{
 		if (Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message));
+			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", SendMessageLocalisationData.getLocalisation(player, message)));
 		}
 		else
 		{

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java

@@ -28,6 +28,7 @@ import org.w3c.dom.Document;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**
  * @author Mobius
@@ -86,9 +87,11 @@ public class SendMessageLocalisationData implements IXmlReader
 		}));
 	}
 	
-	public String getLocalisation(String lang, String message)
+	public static String getLocalisation(PlayerInstance player, String message)
 	{
-		final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(lang);
+		if (Config.MULTILANG_ENABLE)
+		{
+			final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang());
 			if (localisations != null)
 			{
 				// No pretty way of doing something like this.
@@ -126,13 +129,14 @@ public class SendMessageLocalisationData implements IXmlReader
 							{
 								message = message.replace(searchMessage[i], replacementMessage[i]);
 							}
+							break;
+						}
+					}
+				}
+			}
+		}
 		return message;
 	}
-				}
-			}
-		}
-		return null;
-	}
 	
 	public static SendMessageLocalisationData getInstance()
 	{

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -8964,16 +8964,7 @@ public class PlayerInstance extends Playable
 	@Override
 	public void sendMessage(String message)
 	{
-		if (Config.MULTILANG_ENABLE)
+		sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
-		{
-			final String localisation = SendMessageLocalisationData.getInstance().getLocalisation(_lang, message);
-			if (localisation != null)
-			{
-				sendPacket(new SystemMessage(localisation));
-				return;
-			}
-		}
-		sendPacket(new SystemMessage(message));
 	}
 	
 	public void setObserving(boolean state)

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/util/BuilderUtil.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.util;
 
 import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -41,7 +42,7 @@ public class BuilderUtil
 	{
 		if (Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message));
+			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", SendMessageLocalisationData.getLocalisation(player, message)));
 		}
 		else
 		{

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java

@@ -28,6 +28,7 @@ import org.w3c.dom.Document;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**
  * @author Mobius
@@ -86,9 +87,11 @@ public class SendMessageLocalisationData implements IXmlReader
 		}));
 	}
 	
-	public String getLocalisation(String lang, String message)
+	public static String getLocalisation(PlayerInstance player, String message)
 	{
-		final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(lang);
+		if (Config.MULTILANG_ENABLE)
+		{
+			final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang());
 			if (localisations != null)
 			{
 				// No pretty way of doing something like this.
@@ -126,13 +129,14 @@ public class SendMessageLocalisationData implements IXmlReader
 							{
 								message = message.replace(searchMessage[i], replacementMessage[i]);
 							}
+							break;
+						}
+					}
+				}
+			}
+		}
 		return message;
 	}
-				}
-			}
-		}
-		return null;
-	}
 	
 	public static SendMessageLocalisationData getInstance()
 	{

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -8964,16 +8964,7 @@ public class PlayerInstance extends Playable
 	@Override
 	public void sendMessage(String message)
 	{
-		if (Config.MULTILANG_ENABLE)
+		sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
-		{
-			final String localisation = SendMessageLocalisationData.getInstance().getLocalisation(_lang, message);
-			if (localisation != null)
-			{
-				sendPacket(new SystemMessage(localisation));
-				return;
-			}
-		}
-		sendPacket(new SystemMessage(message));
 	}
 	
 	public void setObserving(boolean state)

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/util/BuilderUtil.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.util;
 
 import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -41,7 +42,7 @@ public class BuilderUtil
 	{
 		if (Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message));
+			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", SendMessageLocalisationData.getLocalisation(player, message)));
 		}
 		else
 		{

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java

@@ -28,6 +28,7 @@ import org.w3c.dom.Document;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**
  * @author Mobius
@@ -86,9 +87,11 @@ public class SendMessageLocalisationData implements IXmlReader
 		}));
 	}
 	
-	public String getLocalisation(String lang, String message)
+	public static String getLocalisation(PlayerInstance player, String message)
 	{
-		final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(lang);
+		if (Config.MULTILANG_ENABLE)
+		{
+			final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang());
 			if (localisations != null)
 			{
 				// No pretty way of doing something like this.
@@ -126,13 +129,14 @@ public class SendMessageLocalisationData implements IXmlReader
 							{
 								message = message.replace(searchMessage[i], replacementMessage[i]);
 							}
+							break;
+						}
+					}
+				}
+			}
+		}
 		return message;
 	}
-				}
-			}
-		}
-		return null;
-	}
 	
 	public static SendMessageLocalisationData getInstance()
 	{

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -8965,16 +8965,7 @@ public class PlayerInstance extends Playable
 	@Override
 	public void sendMessage(String message)
 	{
-		if (Config.MULTILANG_ENABLE)
+		sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
-		{
-			final String localisation = SendMessageLocalisationData.getInstance().getLocalisation(_lang, message);
-			if (localisation != null)
-			{
-				sendPacket(new SystemMessage(localisation));
-				return;
-			}
-		}
-		sendPacket(new SystemMessage(message));
 	}
 	
 	public void setObserving(boolean state)

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/util/BuilderUtil.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.util;
 
 import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -41,7 +42,7 @@ public class BuilderUtil
 	{
 		if (Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message));
+			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", SendMessageLocalisationData.getLocalisation(player, message)));
 		}
 		else
 		{

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java

@@ -28,6 +28,7 @@ import org.w3c.dom.Document;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**
  * @author Mobius
@@ -86,9 +87,11 @@ public class SendMessageLocalisationData implements IXmlReader
 		}));
 	}
 	
-	public String getLocalisation(String lang, String message)
+	public static String getLocalisation(PlayerInstance player, String message)
 	{
-		final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(lang);
+		if (Config.MULTILANG_ENABLE)
+		{
+			final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang());
 			if (localisations != null)
 			{
 				// No pretty way of doing something like this.
@@ -126,13 +129,14 @@ public class SendMessageLocalisationData implements IXmlReader
 							{
 								message = message.replace(searchMessage[i], replacementMessage[i]);
 							}
+							break;
+						}
+					}
+				}
+			}
+		}
 		return message;
 	}
-				}
-			}
-		}
-		return null;
-	}
 	
 	public static SendMessageLocalisationData getInstance()
 	{

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -8930,16 +8930,7 @@ public class PlayerInstance extends Playable
 	@Override
 	public void sendMessage(String message)
 	{
-		if (Config.MULTILANG_ENABLE)
+		sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
-		{
-			final String localisation = SendMessageLocalisationData.getInstance().getLocalisation(_lang, message);
-			if (localisation != null)
-			{
-				sendPacket(new SystemMessage(localisation));
-				return;
-			}
-		}
-		sendPacket(new SystemMessage(message));
 	}
 	
 	public void setObserving(boolean state)

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/BuilderUtil.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.util;
 
 import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -41,7 +42,7 @@ public class BuilderUtil
 	{
 		if (Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message));
+			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", SendMessageLocalisationData.getLocalisation(player, message)));
 		}
 		else
 		{

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java

@@ -28,6 +28,7 @@ import org.w3c.dom.Document;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**
  * @author Mobius
@@ -86,9 +87,11 @@ public class SendMessageLocalisationData implements IXmlReader
 		}));
 	}
 	
-	public String getLocalisation(String lang, String message)
+	public static String getLocalisation(PlayerInstance player, String message)
 	{
-		final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(lang);
+		if (Config.MULTILANG_ENABLE)
+		{
+			final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang());
 			if (localisations != null)
 			{
 				// No pretty way of doing something like this.
@@ -126,13 +129,14 @@ public class SendMessageLocalisationData implements IXmlReader
 							{
 								message = message.replace(searchMessage[i], replacementMessage[i]);
 							}
+							break;
+						}
+					}
+				}
+			}
+		}
 		return message;
 	}
-				}
-			}
-		}
-		return null;
-	}
 	
 	public static SendMessageLocalisationData getInstance()
 	{

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -9608,16 +9608,7 @@ public class PlayerInstance extends Playable
 	@Override
 	public void sendMessage(String message)
 	{
-		if (Config.MULTILANG_ENABLE)
+		sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
-		{
-			final String localisation = SendMessageLocalisationData.getInstance().getLocalisation(_lang, message);
-			if (localisation != null)
-			{
-				sendPacket(new SystemMessage(localisation));
-				return;
-			}
-		}
-		sendPacket(new SystemMessage(message));
 	}
 	
 	public void enterObserverMode(Location loc)

L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/util/BuilderUtil.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.util;
 
 import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -40,7 +41,7 @@ public class BuilderUtil
 	{
 		if (Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message));
+			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", SendMessageLocalisationData.getLocalisation(player, message)));
 		}
 		else
 		{

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java

@@ -28,6 +28,7 @@ import org.w3c.dom.Document;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**
  * @author Mobius
@@ -86,9 +87,11 @@ public class SendMessageLocalisationData implements IXmlReader
 		}));
 	}
 	
-	public String getLocalisation(String lang, String message)
+	public static String getLocalisation(PlayerInstance player, String message)
 	{
-		final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(lang);
+		if (Config.MULTILANG_ENABLE)
+		{
+			final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang());
 			if (localisations != null)
 			{
 				// No pretty way of doing something like this.
@@ -126,13 +129,14 @@ public class SendMessageLocalisationData implements IXmlReader
 							{
 								message = message.replace(searchMessage[i], replacementMessage[i]);
 							}
+							break;
+						}
+					}
+				}
+			}
+		}
 		return message;
 	}
-				}
-			}
-		}
-		return null;
-	}
 	
 	public static SendMessageLocalisationData getInstance()
 	{

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -9488,16 +9488,7 @@ public class PlayerInstance extends Playable
 	@Override
 	public void sendMessage(String message)
 	{
-		if (Config.MULTILANG_ENABLE)
+		sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
-		{
-			final String localisation = SendMessageLocalisationData.getInstance().getLocalisation(_lang, message);
-			if (localisation != null)
-			{
-				sendPacket(new SystemMessage(localisation));
-				return;
-			}
-		}
-		sendPacket(new SystemMessage(message));
 	}
 	
 	public void enterObserverMode(Location loc)

L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/util/BuilderUtil.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.util;
 
 import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -40,7 +41,7 @@ public class BuilderUtil
 	{
 		if (Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message));
+			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", SendMessageLocalisationData.getLocalisation(player, message)));
 		}
 		else
 		{

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java

@@ -28,6 +28,7 @@ import org.w3c.dom.Document;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**
  * @author Mobius
@@ -86,9 +87,11 @@ public class SendMessageLocalisationData implements IXmlReader
 		}));
 	}
 	
-	public String getLocalisation(String lang, String message)
+	public static String getLocalisation(PlayerInstance player, String message)
 	{
-		final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(lang);
+		if (Config.MULTILANG_ENABLE)
+		{
+			final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang());
 			if (localisations != null)
 			{
 				// No pretty way of doing something like this.
@@ -126,13 +129,14 @@ public class SendMessageLocalisationData implements IXmlReader
 							{
 								message = message.replace(searchMessage[i], replacementMessage[i]);
 							}
+							break;
+						}
+					}
+				}
+			}
+		}
 		return message;
 	}
-				}
-			}
-		}
-		return null;
-	}
 	
 	public static SendMessageLocalisationData getInstance()
 	{

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -8936,16 +8936,7 @@ public class PlayerInstance extends Playable
 	@Override
 	public void sendMessage(String message)
 	{
-		if (Config.MULTILANG_ENABLE)
+		sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
-		{
-			final String localisation = SendMessageLocalisationData.getInstance().getLocalisation(_lang, message);
-			if (localisation != null)
-			{
-				sendPacket(new SystemMessage(localisation));
-				return;
-			}
-		}
-		sendPacket(new SystemMessage(message));
 	}
 	
 	public void setObserving(boolean state)

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/BuilderUtil.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.util;
 
 import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -41,7 +42,7 @@ public class BuilderUtil
 	{
 		if (Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message));
+			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", SendMessageLocalisationData.getLocalisation(player, message)));
 		}
 		else
 		{

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java

@@ -28,6 +28,7 @@ import org.w3c.dom.Document;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**
  * @author Mobius
@@ -86,9 +87,11 @@ public class SendMessageLocalisationData implements IXmlReader
 		}));
 	}
 	
-	public String getLocalisation(String lang, String message)
+	public static String getLocalisation(PlayerInstance player, String message)
 	{
-		final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(lang);
+		if (Config.MULTILANG_ENABLE)
+		{
+			final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang());
 			if (localisations != null)
 			{
 				// No pretty way of doing something like this.
@@ -126,13 +129,14 @@ public class SendMessageLocalisationData implements IXmlReader
 							{
 								message = message.replace(searchMessage[i], replacementMessage[i]);
 							}
+							break;
+						}
+					}
+				}
+			}
+		}
 		return message;
 	}
-				}
-			}
-		}
-		return null;
-	}
 	
 	public static SendMessageLocalisationData getInstance()
 	{

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -8937,16 +8937,7 @@ public class PlayerInstance extends Playable
 	@Override
 	public void sendMessage(String message)
 	{
-		if (Config.MULTILANG_ENABLE)
+		sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
-		{
-			final String localisation = SendMessageLocalisationData.getInstance().getLocalisation(_lang, message);
-			if (localisation != null)
-			{
-				sendPacket(new SystemMessage(localisation));
-				return;
-			}
-		}
-		sendPacket(new SystemMessage(message));
 	}
 	
 	public void setObserving(boolean state)

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/BuilderUtil.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.util;
 
 import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -41,7 +42,7 @@ public class BuilderUtil
 	{
 		if (Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message));
+			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", SendMessageLocalisationData.getLocalisation(player, message)));
 		}
 		else
 		{

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java

@@ -28,6 +28,7 @@ import org.w3c.dom.Document;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**
  * @author Mobius
@@ -86,9 +87,11 @@ public class SendMessageLocalisationData implements IXmlReader
 		}));
 	}
 	
-	public String getLocalisation(String lang, String message)
+	public static String getLocalisation(PlayerInstance player, String message)
 	{
-		final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(lang);
+		if (Config.MULTILANG_ENABLE)
+		{
+			final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang());
 			if (localisations != null)
 			{
 				// No pretty way of doing something like this.
@@ -126,13 +129,14 @@ public class SendMessageLocalisationData implements IXmlReader
 							{
 								message = message.replace(searchMessage[i], replacementMessage[i]);
 							}
+							break;
+						}
+					}
+				}
+			}
+		}
 		return message;
 	}
-				}
-			}
-		}
-		return null;
-	}
 	
 	public static SendMessageLocalisationData getInstance()
 	{

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -8922,16 +8922,7 @@ public class PlayerInstance extends Playable
 	@Override
 	public void sendMessage(String message)
 	{
-		if (Config.MULTILANG_ENABLE)
+		sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
-		{
-			final String localisation = SendMessageLocalisationData.getInstance().getLocalisation(_lang, message);
-			if (localisation != null)
-			{
-				sendPacket(new SystemMessage(localisation));
-				return;
-			}
-		}
-		sendPacket(new SystemMessage(message));
 	}
 	
 	public void setObserving(boolean state)

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/BuilderUtil.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.util;
 
 import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -41,7 +42,7 @@ public class BuilderUtil
 	{
 		if (Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message));
+			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", SendMessageLocalisationData.getLocalisation(player, message)));
 		}
 		else
 		{

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java

@@ -28,6 +28,7 @@ import org.w3c.dom.Document;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**
  * @author Mobius
@@ -86,9 +87,11 @@ public class SendMessageLocalisationData implements IXmlReader
 		}));
 	}
 	
-	public String getLocalisation(String lang, String message)
+	public static String getLocalisation(PlayerInstance player, String message)
 	{
-		final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(lang);
+		if (Config.MULTILANG_ENABLE)
+		{
+			final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang());
 			if (localisations != null)
 			{
 				// No pretty way of doing something like this.
@@ -126,13 +129,14 @@ public class SendMessageLocalisationData implements IXmlReader
 							{
 								message = message.replace(searchMessage[i], replacementMessage[i]);
 							}
+							break;
+						}
+					}
+				}
+			}
+		}
 		return message;
 	}
-				}
-			}
-		}
-		return null;
-	}
 	
 	public static SendMessageLocalisationData getInstance()
 	{

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -8949,16 +8949,7 @@ public class PlayerInstance extends Playable
 	@Override
 	public void sendMessage(String message)
 	{
-		if (Config.MULTILANG_ENABLE)
+		sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
-		{
-			final String localisation = SendMessageLocalisationData.getInstance().getLocalisation(_lang, message);
-			if (localisation != null)
-			{
-				sendPacket(new SystemMessage(localisation));
-				return;
-			}
-		}
-		sendPacket(new SystemMessage(message));
 	}
 	
 	public void setObserving(boolean state)

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/BuilderUtil.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.util;
 
 import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -41,7 +42,7 @@ public class BuilderUtil
 	{
 		if (Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message));
+			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", SendMessageLocalisationData.getLocalisation(player, message)));
 		}
 		else
 		{

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java

@@ -28,6 +28,7 @@ import org.w3c.dom.Document;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**
  * @author Mobius
@@ -86,9 +87,11 @@ public class SendMessageLocalisationData implements IXmlReader
 		}));
 	}
 	
-	public String getLocalisation(String lang, String message)
+	public static String getLocalisation(PlayerInstance player, String message)
 	{
-		final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(lang);
+		if (Config.MULTILANG_ENABLE)
+		{
+			final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang());
 			if (localisations != null)
 			{
 				// No pretty way of doing something like this.
@@ -126,13 +129,14 @@ public class SendMessageLocalisationData implements IXmlReader
 							{
 								message = message.replace(searchMessage[i], replacementMessage[i]);
 							}
+							break;
+						}
+					}
+				}
+			}
+		}
 		return message;
 	}
-				}
-			}
-		}
-		return null;
-	}
 	
 	public static SendMessageLocalisationData getInstance()
 	{

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -8949,16 +8949,7 @@ public class PlayerInstance extends Playable
 	@Override
 	public void sendMessage(String message)
 	{
-		if (Config.MULTILANG_ENABLE)
+		sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
-		{
-			final String localisation = SendMessageLocalisationData.getInstance().getLocalisation(_lang, message);
-			if (localisation != null)
-			{
-				sendPacket(new SystemMessage(localisation));
-				return;
-			}
-		}
-		sendPacket(new SystemMessage(message));
 	}
 	
 	public void setObserving(boolean state)

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/BuilderUtil.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.util;
 
 import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -41,7 +42,7 @@ public class BuilderUtil
 	{
 		if (Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message));
+			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", SendMessageLocalisationData.getLocalisation(player, message)));
 		}
 		else
 		{

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java

@@ -28,6 +28,7 @@ import org.w3c.dom.Document;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**
  * @author Mobius
@@ -86,9 +87,11 @@ public class SendMessageLocalisationData implements IXmlReader
 		}));
 	}
 	
-	public String getLocalisation(String lang, String message)
+	public static String getLocalisation(PlayerInstance player, String message)
 	{
-		final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(lang);
+		if (Config.MULTILANG_ENABLE)
+		{
+			final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang());
 			if (localisations != null)
 			{
 				// No pretty way of doing something like this.
@@ -126,13 +129,14 @@ public class SendMessageLocalisationData implements IXmlReader
 							{
 								message = message.replace(searchMessage[i], replacementMessage[i]);
 							}
+							break;
+						}
+					}
+				}
+			}
+		}
 		return message;
 	}
-				}
-			}
-		}
-		return null;
-	}
 	
 	public static SendMessageLocalisationData getInstance()
 	{

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -8853,16 +8853,7 @@ public class PlayerInstance extends Playable
 	@Override
 	public void sendMessage(String message)
 	{
-		if (Config.MULTILANG_ENABLE)
+		sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
-		{
-			final String localisation = SendMessageLocalisationData.getInstance().getLocalisation(_lang, message);
-			if (localisation != null)
-			{
-				sendPacket(new SystemMessage(localisation));
-				return;
-			}
-		}
-		sendPacket(new SystemMessage(message));
 	}
 	
 	public void setObserving(boolean state)

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/BuilderUtil.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.util;
 
 import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -41,7 +42,7 @@ public class BuilderUtil
 	{
 		if (Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message));
+			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", SendMessageLocalisationData.getLocalisation(player, message)));
 		}
 		else
 		{

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java

@@ -28,6 +28,7 @@ import org.w3c.dom.Document;
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
 import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 
 /**
  * @author Mobius
@@ -86,9 +87,11 @@ public class SendMessageLocalisationData implements IXmlReader
 		}));
 	}
 	
-	public String getLocalisation(String lang, String message)
+	public static String getLocalisation(PlayerInstance player, String message)
 	{
-		final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(lang);
+		if (Config.MULTILANG_ENABLE)
+		{
+			final Map<String[], String[]> localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang());
 			if (localisations != null)
 			{
 				// No pretty way of doing something like this.
@@ -126,13 +129,14 @@ public class SendMessageLocalisationData implements IXmlReader
 							{
 								message = message.replace(searchMessage[i], replacementMessage[i]);
 							}
+							break;
+						}
+					}
+				}
+			}
+		}
 		return message;
 	}
-				}
-			}
-		}
-		return null;
-	}
 	
 	public static SendMessageLocalisationData getInstance()
 	{

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java

@@ -8937,16 +8937,7 @@ public class PlayerInstance extends Playable
 	@Override
 	public void sendMessage(String message)
 	{
-		if (Config.MULTILANG_ENABLE)
+		sendPacket(new SystemMessage(SendMessageLocalisationData.getLocalisation(this, message)));
-		{
-			final String localisation = SendMessageLocalisationData.getInstance().getLocalisation(_lang, message);
-			if (localisation != null)
-			{
-				sendPacket(new SystemMessage(localisation));
-				return;
-			}
-		}
-		sendPacket(new SystemMessage(message));
 	}
 	
 	public void setObserving(boolean state)

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/BuilderUtil.java

@@ -17,6 +17,7 @@
 package org.l2jmobius.gameserver.util;
 
 import org.l2jmobius.Config;
+import org.l2jmobius.gameserver.data.xml.impl.SendMessageLocalisationData;
 import org.l2jmobius.gameserver.enums.ChatType;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.serverpackets.CreatureSay;
@@ -41,7 +42,7 @@ public class BuilderUtil
 	{
 		if (Config.GM_STARTUP_BUILDER_HIDE)
 		{
-			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", message));
+			player.sendPacket(new CreatureSay(null, ChatType.GENERAL, "SYS", SendMessageLocalisationData.getLocalisation(player, message)));
 		}
 		else
 		{