fix for some sysmsg.

L2_GameServer/java/com/l2jserver/gameserver/RecipeController.java

@@ -986,7 +986,7 @@ public class RecipeController
 			}
 			else
 			{
-				sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM);
+				sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM_S1);
 				sm.addItemName(itemId);
 				_target.sendPacket(sm);
 			}

L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2CastleChamberlainInstance.java

@@ -1227,7 +1227,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 					{
 						L2ItemInstance crown = player.getInventory().addItem("Castle Crown", 6841, 1, player, this);
 						
-						SystemMessage ms = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM);
+						SystemMessage ms = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM_S1);
 						ms.addItemName(crown);
 						player.sendPacket(ms);
 						

L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2FishermanInstance.java

@@ -74,7 +74,7 @@ public class L2FishermanInstance extends L2MerchantInstance
 			if (minlevel > 0)
 			{
 				// No more skills to learn, come back when you level.
-				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN);
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN_S1);
 				sm.addNumber(minlevel);
 				player.sendPacket(sm);
 			}

L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2NpcInstance.java

@@ -153,7 +153,7 @@ public class L2NpcInstance extends L2Npc
 			int minlevel = SkillTreeTable.getInstance().getMinLevelForNewSkill(player, classId);
 			if (minlevel > 0)
 			{
-				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN);
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN_S1);
 				sm.addNumber(minlevel);
 				player.sendPacket(sm);
 			}

L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -3294,7 +3294,7 @@ public final class L2PcInstance extends L2Playable
 	{
 		if (sendMessage)
 		{
-			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ADENA);
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S1_ADENA);
 			sm.addItemNumber(count);
 			sendPacket(sm);
 		}
@@ -3347,7 +3347,7 @@ public final class L2PcInstance extends L2Playable
 			
 			if (sendMessage)
 			{
-				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DISAPPEARED_ADENA);
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED_ADENA);
 				sm.addItemNumber(count);
 				sendPacket(sm);
 			}
@@ -3576,7 +3576,7 @@ public final class L2PcInstance extends L2Playable
 				{
 					if (process.equalsIgnoreCase("sweep") || process.equalsIgnoreCase("Quest"))
 					{
-						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM);
+						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM_S1);
 						sm.addItemName(itemId);
 						sendPacket(sm);
 					}
@@ -9293,7 +9293,6 @@ public final class L2PcInstance extends L2Playable
 		else if (fort.getFlagPole() != getTarget())
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET);
-			sm.addSkillName(skill);
 		}
 		else if (!fort.getSiege().getIsInProgress())
 		{

L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2SignsPriestInstance.java

@@ -114,7 +114,7 @@ public class L2SignsPriestInstance extends L2Npc
 					}
 					player.getInventory().addItem("SevenSigns", SevenSigns.RECORD_SEVEN_SIGNS_ID, 1, player, this);
 					
-					sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM);
+					sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM_S1);
 					sm.addItemName(SevenSigns.RECORD_SEVEN_SIGNS_ID);
 					player.sendPacket(sm);
 					

L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2TransformManagerInstance.java

@@ -76,7 +76,7 @@ public class L2TransformManagerInstance extends L2MerchantInstance
 			if (minlevel > 0)
 			{
 				// No more skills to learn, come back when you level.
-				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN);
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN_S1);
 				sm.addNumber(minlevel);
 				player.sendPacket(sm);
 			}

L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2VillageMasterInstance.java

@@ -1085,7 +1085,7 @@ public class L2VillageMasterInstance extends L2NpcInstance
 		{
 			if (player.getClan().getLevel() < 8)
 			{
-				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN);
+				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN_S1);
 				if (player.getClan().getLevel() < 5)
 					sm.addNumber(5);
 				else

L2_GameServer/java/com/l2jserver/gameserver/model/entity/TvTEvent.java

@@ -368,7 +368,7 @@ public class TvTEvent
 					}
 					else
 					{
-						systemMessage = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM);
+						systemMessage = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM_S1);
 						systemMessage.addItemName(reward[0]);
 					}
 					
@@ -379,7 +379,7 @@ public class TvTEvent
 					for (int i = 0; i < reward[1]; ++i)
 					{
 						inv.addItem("TvT Event", reward[0], 1, playerInstance, playerInstance);
-						systemMessage = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM);
+						systemMessage = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM_S1);
 						systemMessage.addItemName(reward[0]);
 						playerInstance.sendPacket(systemMessage);
 					}

L2_GameServer/java/com/l2jserver/gameserver/model/quest/QuestState.java

@@ -641,7 +641,7 @@ public final class QuestState
 		// If item for reward is gold, send message of gold reward to client
 		if (itemId == 57)
 		{
-			SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ADENA);
+			SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S1_ADENA);
 			smsg.addItemNumber(count);
 			getPlayer().sendPacket(smsg);
 		}
@@ -657,7 +657,7 @@ public final class QuestState
 			}
 			else
 			{
-				SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM);
+				SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM_S1);
 				smsg.addItemName(item);
 				getPlayer().sendPacket(smsg);
 			}
@@ -700,7 +700,7 @@ public final class QuestState
 		// If item for reward is gold, send message of gold reward to client
 		if (itemId == 57)
 		{
-			SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ADENA);
+			SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S1_ADENA);
 			smsg.addItemNumber(count);
 			getPlayer().sendPacket(smsg);
 		}
@@ -716,7 +716,7 @@ public final class QuestState
 			}
 			else
 			{
-				SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM);
+				SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM_S1);
 				smsg.addItemName(item);
 				getPlayer().sendPacket(smsg);
 			}
@@ -753,7 +753,7 @@ public final class QuestState
 		// If item for reward is gold, send message of gold reward to client
 		if (itemId == 57)
 		{
-			SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ADENA);
+			SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S1_ADENA);
 			smsg.addItemNumber(count);
 			getPlayer().sendPacket(smsg);
 		}
@@ -769,7 +769,7 @@ public final class QuestState
 			}
 			else
 			{
-				SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM);
+				SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM_S1);
 				smsg.addItemName(item);
 				getPlayer().sendPacket(smsg);
 			}

L2_GameServer/java/com/l2jserver/gameserver/network/SystemMessageId.java

@@ -340,7 +340,7 @@ public final class SystemMessageId
 	 * ID: 52<br>
 	 * Message: You have earned $s1 adena.
 	 */
-	public static final SystemMessageId EARNED_ADENA;
+	public static final SystemMessageId EARNED_S1_ADENA;
 	
 	/**
 	 * ID: 53<br>
@@ -352,7 +352,7 @@ public final class SystemMessageId
 	 * ID: 54<br>
 	 * Message: You have earned $s1.
 	 */
-	public static final SystemMessageId EARNED_ITEM;
+	public static final SystemMessageId EARNED_ITEM_S1;
 	
 	/**
 	 * ID: 55<br>
@@ -2785,19 +2785,19 @@ public final class SystemMessageId
 	 * ID: 497<br>
 	 * Message: Clan Name: $s1
 	 */
-	public static final SystemMessageId CLAN_INFO_NAME;
+	public static final SystemMessageId CLAN_INFO_NAME_S1;
 	
 	/**
 	 * ID: 498<br>
 	 * Message: Clan Leader: $s1
 	 */
-	public static final SystemMessageId CLAN_INFO_LEADER;
+	public static final SystemMessageId CLAN_INFO_LEADER_S1;
 	
 	/**
 	 * ID: 499<br>
 	 * Message: Clan Level: $s1
 	 */
-	public static final SystemMessageId CLAN_INFO_LEVEL;
+	public static final SystemMessageId CLAN_INFO_LEVEL_S1;
 	
 	/**
 	 * ID: 500<br>
@@ -3398,7 +3398,7 @@ public final class SystemMessageId
 	 * ID: 607<br>
 	 * Message: You do not have any further skills to learn. Come back when you have reached Level $s1.
 	 */
-	public static final SystemMessageId DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN;
+	public static final SystemMessageId DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN_S1;
 	
 	/**
 	 * ID: 608<br>
@@ -3764,7 +3764,7 @@ public final class SystemMessageId
 	 * ID: 672<br>
 	 * Message: $s1 adena disappeared.
 	 */
-	public static final SystemMessageId DISAPPEARED_ADENA;
+	public static final SystemMessageId S1_DISAPPEARED_ADENA;
 	
 	/**
 	 * ID: 673<br>
@@ -14749,9 +14749,9 @@ public final class SystemMessageId
 		S1_EQUIPPED = new SystemMessageId(49);
 		TARGET_CANT_FOUND = new SystemMessageId(50);
 		CANNOT_USE_ON_YOURSELF = new SystemMessageId(51);
-		EARNED_ADENA = new SystemMessageId(52);
+		EARNED_S1_ADENA = new SystemMessageId(52);
 		EARNED_S2_S1_S = new SystemMessageId(53);
-		EARNED_ITEM = new SystemMessageId(54);
+		EARNED_ITEM_S1 = new SystemMessageId(54);
 		FAILED_TO_PICKUP_S1_ADENA = new SystemMessageId(55);
 		FAILED_TO_PICKUP_S1 = new SystemMessageId(56);
 		FAILED_TO_PICKUP_S2_S1_S = new SystemMessageId(57);
@@ -15154,9 +15154,9 @@ public final class SystemMessageId
 		ALLIANCE_LEADER_S2_OF_S1 = new SystemMessageId(494);
 		ALLIANCE_CLAN_TOTAL_S1 = new SystemMessageId(495);
 		CLAN_INFO_HEAD = new SystemMessageId(496);
-		CLAN_INFO_NAME = new SystemMessageId(497);
-		CLAN_INFO_LEADER = new SystemMessageId(498);
-		CLAN_INFO_LEVEL = new SystemMessageId(499);
+		CLAN_INFO_NAME_S1 = new SystemMessageId(497);
+		CLAN_INFO_LEADER_S1 = new SystemMessageId(498);
+		CLAN_INFO_LEVEL_S1 = new SystemMessageId(499);
 		CLAN_INFO_SEPARATOR = new SystemMessageId(500);
 		CLAN_INFO_FOOT = new SystemMessageId(501);
 		ALREADY_JOINED_ALLIANCE = new SystemMessageId(502);
@@ -15256,7 +15256,7 @@ public final class SystemMessageId
 		NOT_CALL_PET_FROM_THIS_LOCATION = new SystemMessageId(604);
 		MAY_REGISTER_UP_TO_64_PEOPLE = new SystemMessageId(605);
 		OTHER_PERSON_ALREADY_64_PEOPLE = new SystemMessageId(606);
-		DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN = new SystemMessageId(607);
+		DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN_S1 = new SystemMessageId(607);
 		C1_SWEEPED_UP_S3_S2 = new SystemMessageId(608);
 		C1_SWEEPED_UP_S2 = new SystemMessageId(609);
 		SKILL_REMOVED_DUE_LACK_HP = new SystemMessageId(610);
@@ -15316,7 +15316,7 @@ public final class SystemMessageId
 		CANCELING_REGISTRATION = new SystemMessageId(669);
 		REFUSING_REGISTRATION = new SystemMessageId(670);
 		AGREEING_REGISTRATION = new SystemMessageId(671);
-		DISAPPEARED_ADENA = new SystemMessageId(672);
+		S1_DISAPPEARED_ADENA = new SystemMessageId(672);
 		AUCTION_ONLY_CLAN_LEVEL_2_HIGHER = new SystemMessageId(673);
 		NOT_SEVEN_DAYS_SINCE_CANCELING_AUCTION = new SystemMessageId(674);
 		NO_CLAN_HALLS_UP_FOR_AUCTION = new SystemMessageId(675);

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/MultiSellChoose.java

@@ -418,7 +418,7 @@ public class MultiSellChoose extends L2GameClientPacket
 								}
 								else
 								{
-									sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM);
+									sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_ITEM_S1);
 									sm.addItemName(e.getItemId());
 								}
 								player.sendPacket(sm);

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestAllyInfo.java

@@ -91,13 +91,13 @@ public final class RequestAllyInfo extends L2GameClientPacket
 				continue;
 			
 			sendPacket(sm); // send head or separator
-			sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_NAME);
+			sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_NAME_S1);
 			sm.addString(clan.getName());
 			sendPacket(sm);
-			sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_LEADER);
+			sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_LEADER_S1);
 			sm.addString(clan.getLeaderName());
 			sendPacket(sm);
-			sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_LEVEL);
+			sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_LEVEL_S1);
 			sm.addNumber(clan.getLevel());
 			sendPacket(sm);
 			sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_SEPARATOR);

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestBuySeed.java

@@ -181,7 +181,7 @@ public class RequestBuySeed extends L2GameClientPacket
 		if (totalPrice > 0)
 		{
 			castle.addToTreasuryNoTax(totalPrice);
-			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DISAPPEARED_ADENA);
+			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED_ADENA);
 			sm.addItemNumber(totalPrice);
 			player.sendPacket(sm);
 		}

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java

@@ -79,9 +79,11 @@ public class RequestExRemoveItemAttribute extends L2GameClientPacket
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S2_ELEMENTAL_POWER_REMOVED);
 				sm.addNumber(targetItem.getEnchantLevel());
 				sm.addItemName(targetItem);
-				sm.addElemntal(realElement);
 				if (targetItem.isArmor())
+				{
+					sm.addElemntal(realElement);
 					sm.addElemntal(Elementals.getOppositeElement(realElement));
+				}
 			}
 			else
 			{
@@ -90,9 +92,11 @@ public class RequestExRemoveItemAttribute extends L2GameClientPacket
 				else
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_ELEMENTAL_POWER_REMOVED);
 				sm.addItemName(targetItem);
-				sm.addElemntal(realElement);
 				if (targetItem.isArmor())
+				{
+					sm.addElemntal(realElement);
 					sm.addElemntal(Elementals.getOppositeElement(realElement));
+				}
 			}
 			activeChar.sendPacket(sm);
 			activeChar.sendPacket(new ExBaseAttributeCancelResult(targetItem.getObjectId(), _element));