BETA: SystemMessage packet update:

	* Added Door Name type (id 11)
	* Added some TODO tasks.
	* Fixed some typos in localization method.
	* Cleanup.

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SystemMessage.java

@@ -19,14 +19,18 @@ import java.util.Arrays;
 import java.util.logging.Level;
 
 import com.l2jserver.Config;
+import com.l2jserver.gameserver.datatables.DoorTable;
 import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.datatables.NpcTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.InstanceManager;
+import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.Elementals;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Summon;
+import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.effects.L2Effect;
@@ -34,6 +38,7 @@ import com.l2jserver.gameserver.model.entity.Castle;
 import com.l2jserver.gameserver.model.items.L2Item;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.SystemMessageId.SMLocalisation;
 
@@ -83,9 +88,13 @@ public final class SystemMessage extends L2GameServerPacket
 		}
 	}
 	
+	// UnAfraid: TODO: Check/Implement id's: 14,15.
+	// 15 exists in goddess of destruction but also may works in h5 needs to be verified!
+	// private static final byte TYPE_CLASS_ID = 15;
+	// id 14 unknown
 	private static final byte TYPE_SYSTEM_STRING = 13;
 	private static final byte TYPE_PLAYER_NAME = 12;
-	// id 11 - unknown
+	private static final byte TYPE_DOOR_NAME = 11;
 	private static final byte TYPE_INSTANCE_NAME = 10;
 	private static final byte TYPE_ELEMENT_NAME = 9;
 	// id 8 - same as 3
@@ -101,7 +110,9 @@ public final class SystemMessage extends L2GameServerPacket
 	public static final SystemMessage sendString(final String text)
 	{
 		if (text == null)
+		{
 			throw new NullPointerException();
+		}
 		
 		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1);
 		sm.addString(text);
@@ -112,11 +123,15 @@ public final class SystemMessage extends L2GameServerPacket
 	{
 		SystemMessage sm = smId.getStaticSystemMessage();
 		if (sm != null)
+		{
 			return sm;
+		}
 		
 		sm = new SystemMessage(smId);
 		if (smId.getParamCount() == 0)
+		{
 			smId.setStaticSystemMessage(sm);
+		}
 		
 		return sm;
 	}
@@ -200,21 +215,32 @@ public final class SystemMessage extends L2GameServerPacket
 	
 	public final SystemMessage addCharName(final L2Character cha)
 	{
-		if (cha instanceof L2Npc)
+		if (cha.isNpc())
 		{
-			if (((L2Npc) cha).getTemplate().isServerSideName())
-				return addString(((L2Npc) cha).getTemplate().getName());
-			return addNpcName((L2Npc) cha);
+			L2Npc npc = (L2Npc) cha;
+			if (npc.getTemplate().isServerSideName())
+			{
+				return addString(npc.getTemplate().getName());
+			}
+			return addNpcName(npc);
 		}
-		else if (cha instanceof L2PcInstance)
+		else if (cha.isPlayer())
 		{
-			return addPcName((L2PcInstance) cha);
+			return addPcName(cha.getActingPlayer());
 		}
-		else if (cha instanceof L2Summon)
+		else if (cha.isSummon())
 		{
-			if (((L2Summon) cha).getTemplate().isServerSideName())
-				return addString(((L2Summon) cha).getTemplate().getName());
-			return addNpcName((L2Summon) cha);
+			L2Summon summon = (L2Summon) cha;
+			if (summon.getTemplate().isServerSideName())
+			{
+				return addString(summon.getTemplate().getName());
+			}
+			return addNpcName(summon);
+		}
+		else if (cha.isDoor())
+		{
+			L2DoorInstance door = (L2DoorInstance) cha;
+			return addDoorName(door.getDoorId());
 		}
 		return addString(cha.getName());
 	}
@@ -225,7 +251,18 @@ public final class SystemMessage extends L2GameServerPacket
 		return this;
 	}
 	
-	public final SystemMessage addNpcName(final L2Npc npc)
+	/**
+	 * ID from doorData.xml
+	 * @param doorId
+	 * @return
+	 */
+	public SystemMessage addDoorName(int doorId)
+	{
+		append(new SMParam(TYPE_DOOR_NAME, doorId));
+		return this;
+	}
+	
+	public final SystemMessage addNpcName(L2Npc npc)
 	{
 		return addNpcName(npc.getTemplate());
 	}
@@ -238,7 +275,9 @@ public final class SystemMessage extends L2GameServerPacket
 	public final SystemMessage addNpcName(final L2NpcTemplate template)
 	{
 		if (template.isCustom())
+		{
 			return addString(template.getName());
+		}
 		return addNpcName(template.getNpcId());
 	}
 	
@@ -261,8 +300,10 @@ public final class SystemMessage extends L2GameServerPacket
 	public final SystemMessage addItemName(final int id)
 	{
 		L2Item item = ItemTable.getInstance().getTemplate(id);
-		if (item.getDisplayId() != id) // custom item.
+		if (item.getDisplayId() != id)
+		{
 			return addString(item.getName());
+		}
 		
 		append(new SMParam(TYPE_ITEM_NAME, id));
 		return this;
@@ -286,8 +327,10 @@ public final class SystemMessage extends L2GameServerPacket
 	
 	public final SystemMessage addSkillName(final L2Skill skill)
 	{
-		if (skill.getId() != skill.getDisplayId()) // custom skill - need nameId or smth like this.
+		if (skill.getId() != skill.getDisplayId())
+		{
 			return addString(skill.getName());
+		}
 		return addSkillName(skill.getId(), skill.getLevel());
 	}
 	
@@ -346,12 +389,16 @@ public final class SystemMessage extends L2GameServerPacket
 	
 	public final SystemMessage getLocalizedMessage(final String lang)
 	{
-		if (!Config.L2JMOD_MULTILANG_SM_ENABLE || _smId == SystemMessageId.S1)
+		if (!Config.L2JMOD_MULTILANG_SM_ENABLE || (_smId == SystemMessageId.S1))
+		{
 			return this;
+		}
 		
 		final SMLocalisation sml = _smId.getLocalisation(lang);
 		if (sml == null)
+		{
 			return this;
+		}
 		
 		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1);
 		final Object[] params = new Object[_paramIndex];
@@ -411,13 +458,21 @@ public final class SystemMessage extends L2GameServerPacket
 				
 				case TYPE_SYSTEM_STRING:
 				{
-					params[i] = "SYS-S-" + param.getIntValue(); // super.writeD(param.getIntValue());
+					params[i] = "SYS-S-" + param.getIntValue(); // writeD(param.getIntValue());
 					break;
 				}
 				
 				case TYPE_INSTANCE_NAME:
 				{
-					params[i] = "INS-N-" + param.getIntValue(); // super.writeD(param.getIntValue());
+					final String instanceName = InstanceManager.getInstance().getInstanceIdName(param.getIntValue());
+					params[i] = instanceName == null ? "Unknown" : instanceName;
+					break;
+				}
+				
+				case TYPE_DOOR_NAME:
+				{
+					final L2DoorInstance door = DoorTable.getInstance().getDoor(param.getIntValue());
+					params[i] = door == null ? "Unknown" : door.getName();
 					break;
 				}
 				
@@ -432,10 +487,8 @@ public final class SystemMessage extends L2GameServerPacket
 				case TYPE_ZONE_NAME:
 				{
 					final int[] array = param.getIntArrayValue();
-					// super.writeD(array[0]); // x
-					// super.writeD(array[1]); // y
-					// super.writeD(array[2]); // z
-					params[i] = "ZON-N-" + Arrays.toString(array);
+					final L2ZoneType zone = ZoneManager.getInstance().getZone(array[0], array[1], array[2], L2ZoneType.class);
+					params[i] = zone == null ? "Unknown ZONE-N-" + Arrays.toString(array) : zone.getName();
 					break;
 				}
 			}
@@ -480,6 +533,7 @@ public final class SystemMessage extends L2GameServerPacket
 				case TYPE_ELEMENT_NAME:
 				case TYPE_SYSTEM_STRING:
 				case TYPE_INSTANCE_NAME:
+				case TYPE_DOOR_NAME:
 				{
 					out.println(param.getIntValue());
 					break;
@@ -541,6 +595,7 @@ public final class SystemMessage extends L2GameServerPacket
 				case TYPE_ELEMENT_NAME:
 				case TYPE_SYSTEM_STRING:
 				case TYPE_INSTANCE_NAME:
+				case TYPE_DOOR_NAME:
 				{
 					writeD(param.getIntValue());
 					break;