BETA: Renaming wrong named methods at SystemMessage they're for integer/long case not for item number.

	* Also fixing integer overflow when receiving a lot of exp.
		* Reported by: angkor_tm
	* Also fixing minor issue causing repeated skills to do not use blessed spirit shots but regular.
		* Reported by: lion
	* Also added paperdoll items reload when switching sub class to prevent from stacking traits.
		* Reported by: vampir
	* Reviewed by: Nos

L2J_Server_BETA/java/com/l2jserver/gameserver/RecipeController.java

@@ -417,13 +417,13 @@ public class RecipeController
 					SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.CREATION_OF_S2_FOR_C1_AT_S3_ADENA_FAILED);
 					msg.addString(_target.getName());
 					msg.addItemName(_recipeList.getItemId());
-					msg.addItemNumber(_price);
+					msg.addLong(_price);
 					_player.sendPacket(msg);
 					
 					msg = SystemMessage.getSystemMessage(SystemMessageId.C1_FAILED_TO_CREATE_S2_FOR_S3_ADENA);
 					msg.addString(_player.getName());
 					msg.addItemName(_recipeList.getItemId());
-					msg.addItemNumber(_price);
+					msg.addLong(_price);
 					_target.sendPacket(msg);
 				}
 				else
@@ -494,7 +494,7 @@ public class RecipeController
 				if (_target == _player)
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S2_EQUIPPED); // you equipped ...
-					sm.addItemNumber(count);
+					sm.addLong(count);
 					sm.addItemName(item.getItemId());
 					_player.sendPacket(sm);
 				}
@@ -615,7 +615,7 @@ public class RecipeController
 					{
 						sm = SystemMessage.getSystemMessage(SystemMessageId.MISSING_S2_S1_TO_CREATE);
 						sm.addItemName(recipe.getItemId());
-						sm.addItemNumber(recipe.getQuantity() - itemQuantityAmount);
+						sm.addLong(recipe.getQuantity() - itemQuantityAmount);
 						_target.sendPacket(sm);
 						
 						abort();
@@ -637,7 +637,7 @@ public class RecipeController
 					{
 						sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 						sm.addItemName(tmp.getItemId());
-						sm.addItemNumber(tmp.getQuantity());
+						sm.addLong(tmp.getQuantity());
 						_target.sendPacket(sm);
 					}
 					else
@@ -687,29 +687,29 @@ public class RecipeController
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S2_CREATED_FOR_C1_FOR_S3_ADENA);
 					sm.addString(_target.getName());
 					sm.addItemName(itemId);
-					sm.addItemNumber(_price);
+					sm.addLong(_price);
 					_player.sendPacket(sm);
 					
 					sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CREATED_S2_FOR_S3_ADENA);
 					sm.addString(_player.getName());
 					sm.addItemName(itemId);
-					sm.addItemNumber(_price);
+					sm.addLong(_price);
 					_target.sendPacket(sm);
 				}
 				else
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S3_S_CREATED_FOR_C1_FOR_S4_ADENA);
 					sm.addString(_target.getName());
-					sm.addNumber(itemCount);
+					sm.addInt(itemCount);
 					sm.addItemName(itemId);
-					sm.addItemNumber(_price);
+					sm.addLong(_price);
 					_player.sendPacket(sm);
 					
 					sm = SystemMessage.getSystemMessage(SystemMessageId.C1_CREATED_S2_S3_S_FOR_S4_ADENA);
 					sm.addString(_player.getName());
-					sm.addNumber(itemCount);
+					sm.addInt(itemCount);
 					sm.addItemName(itemId);
-					sm.addItemNumber(_price);
+					sm.addLong(_price);
 					_target.sendPacket(sm);
 				}
 			}
@@ -718,7 +718,7 @@ public class RecipeController
 			{
 				sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
 				sm.addItemName(itemId);
-				sm.addItemNumber(itemCount);
+				sm.addLong(itemCount);
 				_target.sendPacket(sm);
 			}
 			else

L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSignsFestival.java

@@ -1137,7 +1137,7 @@ public class SevenSignsFestival implements SpawnListener
 				player.getClan().addReputationScore(Config.FESTIVAL_WIN_POINTS, true);
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_MEMBER_C1_WAS_IN_HIGHEST_RANKED_PARTY_IN_FESTIVAL_OF_DARKNESS_AND_GAINED_S2_REPUTATION);
 				sm.addString(partyMemberName);
-				sm.addNumber(Config.FESTIVAL_WIN_POINTS);
+				sm.addInt(Config.FESTIVAL_WIN_POINTS);
 				player.getClan().broadcastToOnlineMembers(sm);
 			}
 		}
@@ -1160,7 +1160,7 @@ public class SevenSignsFestival implements SpawnListener
 								clan.addReputationScore(Config.FESTIVAL_WIN_POINTS, true);
 								SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_MEMBER_C1_WAS_IN_HIGHEST_RANKED_PARTY_IN_FESTIVAL_OF_DARKNESS_AND_GAINED_S2_REPUTATION);
 								sm.addString(partyMemberName);
-								sm.addNumber(Config.FESTIVAL_WIN_POINTS);
+								sm.addInt(Config.FESTIVAL_WIN_POINTS);
 								clan.broadcastToOnlineMembers(sm);
 							}
 						}

L2J_Server_BETA/java/com/l2jserver/gameserver/Shutdown.java

@@ -81,7 +81,7 @@ public class Shutdown extends Thread
 	private void SendServerQuit(int seconds)
 	{
 		SystemMessage sysm = SystemMessage.getSystemMessage(SystemMessageId.THE_SERVER_WILL_BE_COMING_DOWN_IN_S1_SECONDS);
-		sysm.addNumber(seconds);
+		sysm.addInt(seconds);
 		Broadcast.toAllOnlinePlayers(sysm);
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/BotReportTable.java

@@ -275,8 +275,8 @@ public final class BotReportTable
 				if (reuse < Config.BOTREPORT_REPORT_DELAY)
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_CAN_REPORT_IN_S1_MINS_YOU_HAVE_S2_POINTS_LEFT);
-					sm.addNumber((int) (reuse / 60000));
-					sm.addNumber(rcdRep.getPointsLeft());
+					sm.addInt((int) (reuse / 60000));
+					sm.addInt(rcdRep.getPointsLeft());
 					reporter.sendPacket(sm);
 					return false;
 				}
@@ -307,7 +307,7 @@ public final class BotReportTable
 		
 		sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_USED_REPORT_POINT_ON_C1_YOU_HAVE_C2_POINTS_LEFT);
 		sm.addCharName(bot);
-		sm.addNumber(rcdRep.getPointsLeft());
+		sm.addInt(rcdRep.getPointsLeft());
 		reporter.sendPacket(sm);
 		
 		handleReport(bot, rcd);

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/MultisellData.java

@@ -314,7 +314,7 @@ public class MultisellData extends DocumentParser
 			case CLAN_REPUTATION:
 				player.getClan().takeReputationScore((int) amount, true);
 				SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
-				smsg.addItemNumber(amount);
+				smsg.addLong(amount);
 				player.sendPacket(smsg);
 				return true;
 			case FAME:

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CursedWeaponsManager.java

@@ -355,7 +355,7 @@ public final class CursedWeaponsManager
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MINUTE_OF_USAGE_TIME_ARE_LEFT_FOR_S1);
 				sm.addString(cw.getName());
 				// sm.addItemName(cw.getItemId());
-				sm.addNumber((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000));
+				sm.addInt((int) ((cw.getEndTime() - System.currentTimeMillis()) / 60000));
 				player.sendPacket(sm);
 			}
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/PetitionManager.java

@@ -91,7 +91,7 @@ public final class PetitionManager
 		
 		// Petition application accepted. Reciept No. is <ID>
 		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PETITION_ACCEPTED_RECENT_NO_S1);
-		sm.addNumber(currPetition.getId());
+		sm.addInt(currPetition.getId());
 		currPetition.sendResponderPacket(sm);
 		
 		// Petition consultation with <Player> underway.

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java

@@ -1393,35 +1393,35 @@ public final class TerritoryWarManager implements Siegable
 				if (timeRemaining > 3600000)
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_TERRITORY_WAR_WILL_END_IN_S1_HOURS);
-					sm.addNumber(2);
+					sm.addInt(2);
 					announceToParticipants(sm, 0, 0);
 					_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), timeRemaining - 3600000); // Prepare task for 1 hr left.
 				}
 				else if ((timeRemaining <= 3600000) && (timeRemaining > 600000))
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_TERRITORY_WAR_WILL_END_IN_S1_MINUTES);
-					sm.addNumber((int) (timeRemaining / 60000));
+					sm.addInt((int) (timeRemaining / 60000));
 					announceToParticipants(sm, 0, 0);
 					_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), timeRemaining - 600000); // Prepare task for 10 minute left.
 				}
 				else if ((timeRemaining <= 600000) && (timeRemaining > 300000))
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_TERRITORY_WAR_WILL_END_IN_S1_MINUTES);
-					sm.addNumber((int) (timeRemaining / 60000));
+					sm.addInt((int) (timeRemaining / 60000));
 					announceToParticipants(sm, 0, 0);
 					_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), timeRemaining - 300000); // Prepare task for 5 minute left.
 				}
 				else if ((timeRemaining <= 300000) && (timeRemaining > 10000))
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_TERRITORY_WAR_WILL_END_IN_S1_MINUTES);
-					sm.addNumber((int) (timeRemaining / 60000));
+					sm.addInt((int) (timeRemaining / 60000));
 					announceToParticipants(sm, 0, 0);
 					_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), timeRemaining - 10000); // Prepare task for 10 seconds count down
 				}
 				else if ((timeRemaining <= 10000) && (timeRemaining > 0))
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECONDS_TO_THE_END_OF_TERRITORY_WAR);
-					sm.addNumber((int) (timeRemaining / 1000));
+					sm.addInt((int) (timeRemaining / 1000));
 					announceToParticipants(sm, 0, 0);
 					_scheduledEndTWTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndTWTask(), timeRemaining); // Prepare task for second count down
 				}

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/games/Lottery.java

@@ -408,17 +408,17 @@ public class Lottery
 			{
 				// There are winners.
 				sm = SystemMessage.getSystemMessage(SystemMessageId.AMOUNT_FOR_WINNER_S1_IS_S2_ADENA_WE_HAVE_S3_PRIZE_WINNER);
-				sm.addNumber(getId());
-				sm.addItemNumber(getPrize());
-				sm.addItemNumber(count1);
+				sm.addInt(getId());
+				sm.addLong(getPrize());
+				sm.addLong(count1);
 				Announcements.getInstance().announceToAll(sm);
 			}
 			else
 			{
 				// There are no winners.
 				sm = SystemMessage.getSystemMessage(SystemMessageId.AMOUNT_FOR_LOTTERY_S1_IS_S2_ADENA_NO_WINNER);
-				sm.addNumber(getId());
-				sm.addItemNumber(getPrize());
+				sm.addInt(getId());
+				sm.addLong(getPrize());
 				Announcements.getInstance().announceToAll(sm);
 			}
 			

L2J_Server_BETA/java/com/l2jserver/gameserver/model/CursedWeapon.java

@@ -315,7 +315,7 @@ public class CursedWeapon implements INamable
 		SystemMessage msg2 = SystemMessage.getSystemMessage(SystemMessageId.S2_MINUTE_OF_USAGE_TIME_ARE_LEFT_FOR_S1);
 		int timeLeft = (int) (cw.getTimeLeft() / 60000);
 		msg2.addItemName(_player.getCursedWeaponEquippedId());
-		msg2.addNumber(timeLeft);
+		msg2.addInt(timeLeft);
 		_player.sendPacket(msg2);
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Clan.java

@@ -2613,7 +2613,7 @@ public class L2Clan implements IIdentifiable, INamable
 					{
 						player.setSp(player.getSp() - 20000);
 						SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.SP_DECREASED_S1);
-						sp.addNumber(20000);
+						sp.addInt(20000);
 						player.sendPacket(sp);
 						sp = null;
 						increaseClanLevel = true;
@@ -2630,7 +2630,7 @@ public class L2Clan implements IIdentifiable, INamable
 					{
 						player.setSp(player.getSp() - 100000);
 						SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.SP_DECREASED_S1);
-						sp.addNumber(100000);
+						sp.addInt(100000);
 						player.sendPacket(sp);
 						sp = null;
 						increaseClanLevel = true;
@@ -2648,7 +2648,7 @@ public class L2Clan implements IIdentifiable, INamable
 					{
 						player.setSp(player.getSp() - 350000);
 						SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.SP_DECREASED_S1);
-						sp.addNumber(350000);
+						sp.addInt(350000);
 						player.sendPacket(sp);
 						sp = null;
 						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
@@ -2670,7 +2670,7 @@ public class L2Clan implements IIdentifiable, INamable
 					{
 						player.setSp(player.getSp() - 1000000);
 						SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.SP_DECREASED_S1);
-						sp.addNumber(1000000);
+						sp.addInt(1000000);
 						player.sendPacket(sp);
 						sp = null;
 						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
@@ -2692,7 +2692,7 @@ public class L2Clan implements IIdentifiable, INamable
 					{
 						player.setSp(player.getSp() - 2500000);
 						SystemMessage sp = SystemMessage.getSystemMessage(SystemMessageId.SP_DECREASED_S1);
-						sp.addNumber(2500000);
+						sp.addInt(2500000);
 						player.sendPacket(sp);
 						sp = null;
 						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED);
@@ -2710,7 +2710,7 @@ public class L2Clan implements IIdentifiable, INamable
 				{
 					setReputationScore(getReputationScore() - Config.CLAN_LEVEL_6_COST, true);
 					SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
-					cr.addNumber(Config.CLAN_LEVEL_6_COST);
+					cr.addInt(Config.CLAN_LEVEL_6_COST);
 					player.sendPacket(cr);
 					cr = null;
 					increaseClanLevel = true;
@@ -2723,7 +2723,7 @@ public class L2Clan implements IIdentifiable, INamable
 				{
 					setReputationScore(getReputationScore() - Config.CLAN_LEVEL_7_COST, true);
 					SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
-					cr.addNumber(Config.CLAN_LEVEL_7_COST);
+					cr.addInt(Config.CLAN_LEVEL_7_COST);
 					player.sendPacket(cr);
 					cr = null;
 					increaseClanLevel = true;
@@ -2735,7 +2735,7 @@ public class L2Clan implements IIdentifiable, INamable
 				{
 					setReputationScore(getReputationScore() - Config.CLAN_LEVEL_8_COST, true);
 					SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
-					cr.addNumber(Config.CLAN_LEVEL_8_COST);
+					cr.addInt(Config.CLAN_LEVEL_8_COST);
 					player.sendPacket(cr);
 					cr = null;
 					increaseClanLevel = true;
@@ -2750,12 +2750,12 @@ public class L2Clan implements IIdentifiable, INamable
 					{
 						setReputationScore(getReputationScore() - Config.CLAN_LEVEL_9_COST, true);
 						SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
-						cr.addNumber(Config.CLAN_LEVEL_9_COST);
+						cr.addInt(Config.CLAN_LEVEL_9_COST);
 						player.sendPacket(cr);
 						cr = null;
 						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 						sm.addItemName(9910);
-						sm.addItemNumber(150);
+						sm.addLong(150);
 						player.sendPacket(sm);
 						increaseClanLevel = true;
 					}
@@ -2770,12 +2770,12 @@ public class L2Clan implements IIdentifiable, INamable
 					{
 						setReputationScore(getReputationScore() - Config.CLAN_LEVEL_10_COST, true);
 						SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
-						cr.addNumber(Config.CLAN_LEVEL_10_COST);
+						cr.addInt(Config.CLAN_LEVEL_10_COST);
 						player.sendPacket(cr);
 						cr = null;
 						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 						sm.addItemName(9911);
-						sm.addItemNumber(5);
+						sm.addLong(5);
 						player.sendPacket(sm);
 						increaseClanLevel = true;
 					}
@@ -2796,7 +2796,7 @@ public class L2Clan implements IIdentifiable, INamable
 				{
 					setReputationScore(getReputationScore() - Config.CLAN_LEVEL_11_COST, true);
 					SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
-					cr.addNumber(Config.CLAN_LEVEL_11_COST);
+					cr.addInt(Config.CLAN_LEVEL_11_COST);
 					player.sendPacket(cr);
 					cr = null;
 					increaseClanLevel = true;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Party.java

@@ -623,7 +623,7 @@ public class L2Party extends AbstractPlayerGroup
 			SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_OBTAINED_S3_S2);
 			msg.addString(target.getName());
 			msg.addItemName(item);
-			msg.addItemNumber(item.getCount());
+			msg.addLong(item.getCount());
 			broadcastToPartyMembers(target, msg);
 		}
 		else
@@ -661,7 +661,7 @@ public class L2Party extends AbstractPlayerGroup
 			SystemMessage msg = spoil ? SystemMessage.getSystemMessage(SystemMessageId.C1_SWEEPED_UP_S3_S2) : SystemMessage.getSystemMessage(SystemMessageId.C1_OBTAINED_S3_S2);
 			msg.addString(looter.getName());
 			msg.addItemName(itemId);
-			msg.addItemNumber(itemCount);
+			msg.addLong(itemCount);
 			broadcastToPartyMembers(looter, msg);
 		}
 		else

L2J_Server_BETA/java/com/l2jserver/gameserver/model/Petition.java

@@ -87,7 +87,7 @@ public final class Petition
 				{
 					// Receipt No. <ID> petition cancelled.
 					sm = SystemMessage.getSystemMessage(SystemMessageId.RECENT_NO_S1_CANCELED);
-					sm.addNumber(getId());
+					sm.addInt(getId());
 					getResponder().sendPacket(sm);
 				}
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/TradeList.java

@@ -860,13 +860,13 @@ public class TradeList
 				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_PURCHASED_S3_S2_S);
 				msg.addString(player.getName());
 				msg.addItemName(newItem);
-				msg.addItemNumber(item.getCount());
+				msg.addLong(item.getCount());
 				_owner.sendPacket(msg);
 				
 				msg = SystemMessage.getSystemMessage(SystemMessageId.PURCHASED_S3_S2_S_FROM_C1);
 				msg.addString(_owner.getName());
 				msg.addItemName(newItem);
-				msg.addItemNumber(item.getCount());
+				msg.addLong(item.getCount());
 				player.sendPacket(msg);
 			}
 			else
@@ -1038,13 +1038,13 @@ public class TradeList
 				SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.PURCHASED_S3_S2_S_FROM_C1);
 				msg.addString(player.getName());
 				msg.addItemName(newItem);
-				msg.addItemNumber(item.getCount());
+				msg.addLong(item.getCount());
 				_owner.sendPacket(msg);
 				
 				msg = SystemMessage.getSystemMessage(SystemMessageId.C1_PURCHASED_S3_S2_S);
 				msg.addString(_owner.getName());
 				msg.addItemName(newItem);
-				msg.addItemNumber(item.getCount());
+				msg.addLong(item.getCount());
 				player.sendPacket(msg);
 			}
 			else

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Attackable.java

@@ -1054,7 +1054,7 @@ public class L2Attackable extends L2Npc
 					final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DIED_DROPPED_S3_S2);
 					sm.addCharName(this);
 					sm.addItemName(item);
-					sm.addItemNumber(drop.getCount());
+					sm.addLong(drop.getCount());
 					broadcastPacket(sm);
 				}
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -2113,7 +2113,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SUMMONING_SERVITOR_COSTS_S2_S1);
 					sm.addItemName(skill.getItemConsumeId());
-					sm.addNumber(skill.getItemConsume());
+					sm.addInt(skill.getItemConsume());
 					sendPacket(sm);
 				}
 				else
@@ -5926,7 +5926,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 					}
 					else if (mut.getSkill().useSpiritShot())
 					{
-						setChargedShot(ShotType.SPIRITSHOTS, true);
+						setChargedShot(ShotType.BLESSED_SPIRITSHOTS, true);
 					}
 				}
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Summon.java

@@ -818,7 +818,7 @@ public abstract class L2Summon extends L2Playable
 				sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DONE_S3_DAMAGE_TO_C2);
 				sm.addNpcName(this);
 				sm.addCharName(target);
-				sm.addNumber(damage);
+				sm.addInt(damage);
 			}
 			
 			sendPacket(sm);
@@ -834,7 +834,7 @@ public abstract class L2Summon extends L2Playable
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_RECEIVED_DAMAGE_OF_S3_FROM_C2);
 			sm.addNpcName(this);
 			sm.addCharName(attacker);
-			sm.addNumber((int) damage);
+			sm.addInt((int) damage);
 			sendPacket(sm);
 		}
 	}

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

@@ -94,7 +94,7 @@ public final class L2FishermanInstance extends L2MerchantInstance
 			if (minlLevel > 0)
 			{
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN_S1);
-				sm.addNumber(minlLevel);
+				sm.addInt(minlLevel);
 				player.sendPacket(sm);
 			}
 			else

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

@@ -101,7 +101,7 @@ public class L2NpcInstance extends L2Npc
 				if (minLevel > 0)
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN_S1);
-					sm.addNumber(minLevel);
+					sm.addInt(minLevel);
 					player.sendPacket(sm);
 				}
 				else
@@ -152,7 +152,7 @@ public class L2NpcInstance extends L2Npc
 			if (minLevel > 0)
 			{
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN_S1);
-				sm.addNumber(minLevel);
+				sm.addInt(minLevel);
 				player.sendPacket(sm);
 			}
 			else
@@ -160,7 +160,7 @@ public class L2NpcInstance extends L2Npc
 				if (player.getClassId().level() == 1)
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.NO_SKILLS_TO_LEARN_RETURN_AFTER_S1_CLASS_CHANGE);
-					sm.addNumber(2);
+					sm.addInt(2);
 					player.sendPacket(sm);
 				}
 				else

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

@@ -2389,7 +2389,7 @@ public final class L2PcInstance extends L2Playable
 			if (item.getEnchantLevel() > 0)
 			{
 				sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
-				sm.addNumber(item.getEnchantLevel());
+				sm.addInt(item.getEnchantLevel());
 				sm.addItemName(item);
 			}
 			else
@@ -2419,7 +2419,7 @@ public final class L2PcInstance extends L2Playable
 				if (item.getEnchantLevel() > 0)
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S2_EQUIPPED);
-					sm.addNumber(item.getEnchantLevel());
+					sm.addInt(item.getEnchantLevel());
 					sm.addItemName(item);
 				}
 				else
@@ -3216,7 +3216,7 @@ public final class L2PcInstance extends L2Playable
 		if (sendMessage)
 		{
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S1_ADENA);
-			sm.addItemNumber(count);
+			sm.addLong(count);
 			sendPacket(sm);
 		}
 		
@@ -3280,7 +3280,7 @@ public final class L2PcInstance extends L2Playable
 			if (sendMessage)
 			{
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_DISAPPEARED_ADENA);
-				sm.addItemNumber(count);
+				sm.addLong(count);
 				sendPacket(sm);
 			}
 		}
@@ -3301,7 +3301,7 @@ public final class L2PcInstance extends L2Playable
 		{
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
 			sm.addItemName(Inventory.ANCIENT_ADENA_ID);
-			sm.addItemNumber(count);
+			sm.addLong(count);
 			sendPacket(sm);
 		}
 		
@@ -3367,7 +3367,7 @@ public final class L2PcInstance extends L2Playable
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 					sm.addItemName(Inventory.ANCIENT_ADENA_ID);
-					sm.addItemNumber(count);
+					sm.addLong(count);
 					sendPacket(sm);
 				}
 				else
@@ -3400,13 +3400,13 @@ public final class L2PcInstance extends L2Playable
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_PICKED_UP_S1_S2);
 					sm.addItemName(item);
-					sm.addItemNumber(item.getCount());
+					sm.addLong(item.getCount());
 					sendPacket(sm);
 				}
 				else if (item.getEnchantLevel() > 0)
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_PICKED_UP_A_S1_S2);
-					sm.addNumber(item.getEnchantLevel());
+					sm.addInt(item.getEnchantLevel());
 					sm.addItemName(item);
 					sendPacket(sm);
 				}
@@ -3501,14 +3501,14 @@ public final class L2PcInstance extends L2Playable
 					{
 						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
 						sm.addItemName(itemId);
-						sm.addItemNumber(count);
+						sm.addLong(count);
 						sendPacket(sm);
 					}
 					else
 					{
 						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_PICKED_UP_S1_S2);
 						sm.addItemName(itemId);
-						sm.addItemNumber(count);
+						sm.addLong(count);
 						sendPacket(sm);
 					}
 				}
@@ -3649,7 +3649,7 @@ public final class L2PcInstance extends L2Playable
 			{
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 				sm.addItemName(item);
-				sm.addItemNumber(count);
+				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
@@ -3768,7 +3768,7 @@ public final class L2PcInstance extends L2Playable
 			{
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 				sm.addItemName(itemId);
-				sm.addItemNumber(count);
+				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
@@ -4736,13 +4736,13 @@ public final class L2PcInstance extends L2Playable
 				if (target.getId() == Inventory.ADENA_ID)
 				{
 					smsg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S1_ADENA);
-					smsg.addItemNumber(target.getCount());
+					smsg.addLong(target.getCount());
 				}
 				else if (target.getCount() > 1)
 				{
 					smsg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S2_S1_S);
 					smsg.addItemName(target);
-					smsg.addItemNumber(target.getCount());
+					smsg.addLong(target.getCount());
 				}
 				else
 				{
@@ -4808,7 +4808,7 @@ public final class L2PcInstance extends L2Playable
 				{
 					smsg = SystemMessage.getSystemMessage(SystemMessageId.ANNOUNCEMENT_C1_PICKED_UP_S2_S3);
 					smsg.addPcName(this);
-					smsg.addNumber(target.getEnchantLevel());
+					smsg.addInt(target.getEnchantLevel());
 					smsg.addItemName(target.getId());
 					broadcastPacket(smsg, 1400);
 				}
@@ -6546,7 +6546,7 @@ public final class L2PcInstance extends L2Playable
 			if (unequiped[0].getEnchantLevel() > 0)
 			{
 				sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
-				sm.addNumber(unequiped[0].getEnchantLevel());
+				sm.addInt(unequiped[0].getEnchantLevel());
 				sm.addItemName(unequiped[0]);
 			}
 			else
@@ -6586,7 +6586,7 @@ public final class L2PcInstance extends L2Playable
 				if (unequiped[0].getEnchantLevel() > 0)
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
-					sm.addNumber(unequiped[0].getEnchantLevel());
+					sm.addInt(unequiped[0].getEnchantLevel());
 					sm.addItemName(unequiped[0]);
 				}
 				else
@@ -8315,7 +8315,7 @@ public final class L2PcInstance extends L2Playable
 		
 		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
 		sm.addItemName(henna.getDyeItemId());
-		sm.addItemNumber(henna.getCancelCount());
+		sm.addLong(henna.getCancelCount());
 		sendPacket(sm);
 		sendPacket(SystemMessageId.SYMBOL_DELETED);
 		return true;
@@ -8887,14 +8887,14 @@ public final class L2PcInstance extends L2Playable
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HOURS_S3_MINUTES_S4_SECONDS_REMAINING_FOR_REUSE_S1);
 					sm.addSkillName(skill);
-					sm.addNumber(hours);
-					sm.addNumber(minutes);
+					sm.addInt(hours);
+					sm.addInt(minutes);
 				}
 				else if (minutes > 0)
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MINUTES_S3_SECONDS_REMAINING_FOR_REUSE_S1);
 					sm.addSkillName(skill);
-					sm.addNumber(minutes);
+					sm.addInt(minutes);
 				}
 				else
 				{
@@ -8902,7 +8902,7 @@ public final class L2PcInstance extends L2Playable
 					sm.addSkillName(skill);
 				}
 				
-				sm.addNumber(seconds);
+				sm.addInt(seconds);
 			}
 			else
 			{
@@ -10617,6 +10617,8 @@ public final class L2PcInstance extends L2Playable
 			
 			restoreEffects();
 			
+			getInventory().reloadEquippedItems();
+			
 			sendPacket(new EtcStatusUpdate(this));
 			
 			// if player has quest 422: Repent Your Sins, remove it
@@ -12597,8 +12599,8 @@ public final class L2PcInstance extends L2Playable
 	{
 		_souls += count;
 		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_SOUL_HAS_INCREASED_BY_S1_SO_IT_IS_NOW_AT_S2);
-		sm.addNumber(count);
-		sm.addNumber(_souls);
+		sm.addInt(count);
+		sm.addInt(_souls);
 		sendPacket(sm);
 		restartSoulTask();
 		sendPacket(new EtcStatusUpdate(this));
@@ -12708,7 +12710,7 @@ public final class L2PcInstance extends L2Playable
 		addSkill(SkillTable.getInstance().getInfo(5076, getDeathPenaltyBuffLevel()), false);
 		sendPacket(new EtcStatusUpdate(this));
 		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DEATH_PENALTY_LEVEL_S1_ADDED);
-		sm.addNumber(getDeathPenaltyBuffLevel());
+		sm.addInt(getDeathPenaltyBuffLevel());
 		sendPacket(sm);
 	}
 	
@@ -12733,7 +12735,7 @@ public final class L2PcInstance extends L2Playable
 			addSkill(SkillTable.getInstance().getInfo(5076, getDeathPenaltyBuffLevel()), false);
 			sendPacket(new EtcStatusUpdate(this));
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DEATH_PENALTY_LEVEL_S1_ADDED);
-			sm.addNumber(getDeathPenaltyBuffLevel());
+			sm.addInt(getDeathPenaltyBuffLevel());
 			sendPacket(sm);
 		}
 		else
@@ -12802,14 +12804,14 @@ public final class L2PcInstance extends L2Playable
 		else if (target.isDoor() || (target instanceof L2ControlTowerInstance))
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DID_S1_DMG);
-			sm.addNumber(damage);
+			sm.addInt(damage);
 		}
 		else
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DONE_S3_DAMAGE_TO_C2);
 			sm.addPcName(this);
 			sm.addCharName(target);
-			sm.addNumber(damage);
+			sm.addInt(damage);
 		}
 		sendPacket(sm);
 	}
@@ -12876,7 +12878,7 @@ public final class L2PcInstance extends L2Playable
 				if (equippedItem.getEnchantLevel() > 0)
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
-					sm.addNumber(equippedItem.getEnchantLevel());
+					sm.addInt(equippedItem.getEnchantLevel());
 					sm.addItemName(equippedItem);
 				}
 				else
@@ -13112,7 +13114,7 @@ public final class L2PcInstance extends L2Playable
 		else
 		{
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FORCE_INCREASED_TO_S1);
-			sm.addNumber(_charges.get());
+			sm.addInt(_charges.get());
 			sendPacket(sm);
 		}
 		
@@ -13829,7 +13831,7 @@ public final class L2PcInstance extends L2Playable
 		{
 			reduceCurrentHp(Math.min(damage, getCurrentHp() - 1), null, false, true, null);
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FALL_DAMAGE_S1);
-			sm.addNumber(damage);
+			sm.addInt(damage);
 			sendPacket(sm);
 		}
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PetInstance.java

@@ -444,7 +444,7 @@ public class L2PetInstance extends L2Summon
 			{
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 				sm.addItemName(item.getId());
-				sm.addItemNumber(count);
+				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
@@ -491,7 +491,7 @@ public class L2PetInstance extends L2Summon
 			{
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 				sm.addItemName(item.getId());
-				sm.addItemNumber(count);
+				sm.addLong(count);
 				sendPacket(sm);
 			}
 			else
@@ -572,13 +572,13 @@ public class L2PetInstance extends L2Summon
 				if (target.getId() == Inventory.ADENA_ID)
 				{
 					smsg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S1_ADENA);
-					smsg.addItemNumber(target.getCount());
+					smsg.addLong(target.getCount());
 				}
 				else if (target.getCount() > 1)
 				{
 					smsg = SystemMessage.getSystemMessage(SystemMessageId.FAILED_TO_PICKUP_S2_S1_S);
 					smsg.addItemName(target);
-					smsg.addItemNumber(target.getCount());
+					smsg.addLong(target.getCount());
 				}
 				else
 				{
@@ -625,20 +625,20 @@ public class L2PetInstance extends L2Summon
 			if (target.getId() == Inventory.ADENA_ID)
 			{
 				smsg = SystemMessage.getSystemMessage(SystemMessageId.PET_PICKED_S1_ADENA);
-				smsg.addItemNumber(target.getCount());
+				smsg.addLong(target.getCount());
 				sendPacket(smsg);
 			}
 			else if (target.getEnchantLevel() > 0)
 			{
 				smsg = SystemMessage.getSystemMessage(SystemMessageId.PET_PICKED_S1_S2);
-				smsg.addNumber(target.getEnchantLevel());
+				smsg.addInt(target.getEnchantLevel());
 				smsg.addItemName(target);
 				sendPacket(smsg);
 			}
 			else if (target.getCount() > 1)
 			{
 				smsg = SystemMessage.getSystemMessage(SystemMessageId.PET_PICKED_S2_S1_S);
-				smsg.addItemNumber(target.getCount());
+				smsg.addLong(target.getCount());
 				smsg.addItemName(target);
 				sendPacket(smsg);
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2RaceManagerInstance.java

@@ -170,35 +170,35 @@ public class L2RaceManagerInstance extends L2Npc
 					_state = ACCEPTING_BETS;
 					startRace();
 				}// else{_log.info("Race open");}
-				sm.addNumber(_raceNumber);
+				sm.addInt(_raceNumber);
 				break;
 			case 818: // SystemMessageId.MONSRACE_TICKETS_STOP_IN_S1_MINUTES
 			case 820: // SystemMessageId.MONSRACE_S2_BEGINS_IN_S1_MINUTES
 			case 823: // SystemMessageId.MONSRACE_BEGINS_IN_S1_SECONDS
-				sm.addNumber(_minutes);
+				sm.addInt(_minutes);
 				if (type.getId() == 820)
 				{
-					sm.addNumber(_raceNumber);
+					sm.addInt(_raceNumber);
 				}
 				_minutes--;
 				break;
 			case 819: // SystemMessageId.MONSRACE_S1_TICKET_SALES_CLOSED
 				// _log.info("Sales closed");
-				sm.addNumber(_raceNumber);
+				sm.addInt(_raceNumber);
 				_state = WAITING;
 				_minutes = 2;
 				break;
 			case 821: // SystemMessageId.MONSRACE_S1_BEGINS_IN_30_SECONDS
 			case 822: // SystemMessageId.MONSRACE_S1_COUNTDOWN_IN_FIVE_SECONDS
 			case 825: // SystemMessageId.MONSRACE_S1_RACE_END
-				sm.addNumber(_raceNumber);
+				sm.addInt(_raceNumber);
 				_minutes = 5;
 				break;
 			case 826: // SystemMessageId.MONSRACE_FIRST_PLACE_S1_SECOND_S2
 				// _log.info("Placing");
 				_state = RACE_END;
-				sm.addNumber(MonsterRace.getInstance().getFirstPlace());
-				sm.addNumber(MonsterRace.getInstance().getSecondPlace());
+				sm.addInt(MonsterRace.getInstance().getFirstPlace());
+				sm.addInt(MonsterRace.getInstance().getSecondPlace());
 				break;
 		}
 		// _logn.info("Counter: "+minutes);
@@ -440,7 +440,7 @@ public class L2RaceManagerInstance extends L2Npc
 			player.setRace(0, 0);
 			player.setRace(1, 0);
 			sm = SystemMessage.getSystemMessage(SystemMessageId.ACQUIRED_S1_S2);
-			sm.addNumber(_raceNumber);
+			sm.addInt(_raceNumber);
 			sm.addItemName(4443);
 			player.sendPacket(sm);
 			L2ItemInstance item = new L2ItemInstance(IdFactory.getInstance().getNextId(), 4443);

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

@@ -361,7 +361,7 @@ public class L2SignsPriestInstance extends L2Npc
 							contribStonesFound = true;
 							SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 							msg.addItemName(SevenSigns.SEAL_STONE_RED_ID);
-							msg.addItemNumber(redContrib);
+							msg.addLong(redContrib);
 							player.sendPacket(msg);
 						}
 					}
@@ -372,7 +372,7 @@ public class L2SignsPriestInstance extends L2Npc
 							contribStonesFound = true;
 							SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 							msg.addItemName(SevenSigns.SEAL_STONE_GREEN_ID);
-							msg.addItemNumber(greenContrib);
+							msg.addLong(greenContrib);
 							player.sendPacket(msg);
 						}
 					}
@@ -383,7 +383,7 @@ public class L2SignsPriestInstance extends L2Npc
 							contribStonesFound = true;
 							SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 							msg.addItemName(SevenSigns.SEAL_STONE_BLUE_ID);
-							msg.addItemNumber(blueContrib);
+							msg.addLong(blueContrib);
 							player.sendPacket(msg);
 						}
 					}
@@ -403,7 +403,7 @@ public class L2SignsPriestInstance extends L2Npc
 					{
 						score = SevenSigns.getInstance().addPlayerStoneContrib(player.getObjectId(), blueContrib, greenContrib, redContrib);
 						sm = SystemMessage.getSystemMessage(SystemMessageId.CONTRIB_SCORE_INCREASED_S1);
-						sm.addItemNumber(score);
+						sm.addLong(score);
 						player.sendPacket(sm);
 						
 						if (this instanceof L2DawnPriestInstance)
@@ -495,7 +495,7 @@ public class L2SignsPriestInstance extends L2Npc
 										stonesFound = true;
 										SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 										msg.addItemName(SevenSigns.SEAL_STONE_RED_ID);
-										msg.addItemNumber(redContribCount);
+										msg.addLong(redContribCount);
 										player.sendPacket(msg);
 									}
 								}
@@ -506,7 +506,7 @@ public class L2SignsPriestInstance extends L2Npc
 										stonesFound = true;
 										SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 										msg.addItemName(SevenSigns.SEAL_STONE_GREEN_ID);
-										msg.addItemNumber(greenContribCount);
+										msg.addLong(greenContribCount);
 										player.sendPacket(msg);
 									}
 								}
@@ -517,7 +517,7 @@ public class L2SignsPriestInstance extends L2Npc
 										stonesFound = true;
 										SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 										msg.addItemName(SevenSigns.SEAL_STONE_BLUE_ID);
-										msg.addItemNumber(blueContribCount);
+										msg.addLong(blueContribCount);
 										player.sendPacket(msg);
 									}
 								}
@@ -537,7 +537,7 @@ public class L2SignsPriestInstance extends L2Npc
 								{
 									contribScore = SevenSigns.getInstance().addPlayerStoneContrib(player.getObjectId(), blueContribCount, greenContribCount, redContribCount);
 									sm = SystemMessage.getSystemMessage(SystemMessageId.CONTRIB_SCORE_INCREASED_S1);
-									sm.addItemNumber(contribScore);
+									sm.addLong(contribScore);
 									player.sendPacket(sm);
 									
 									if (this instanceof L2DawnPriestInstance)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2TrapInstance.java

@@ -326,7 +326,7 @@ public final class L2TrapInstance extends L2Npc
 			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_DONE_S3_DAMAGE_TO_C2);
 			sm.addCharName(this);
 			sm.addCharName(target);
-			sm.addNumber(damage);
+			sm.addInt(damage);
 			_owner.sendPacket(sm);
 		}
 	}

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

@@ -1199,11 +1199,11 @@ public class L2VillageMasterInstance extends L2NpcInstance
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DO_NOT_HAVE_FURTHER_SKILLS_TO_LEARN_S1);
 				if (player.getClan().getLevel() < 5)
 				{
-					sm.addNumber(5);
+					sm.addInt(5);
 				}
 				else
 				{
-					sm.addNumber(player.getClan().getLevel() + 1);
+					sm.addInt(player.getClan().getLevel() + 1);
 				}
 				player.sendPacket(sm);
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/stat/PcStat.java

@@ -94,7 +94,7 @@ public class PcStat extends PlayableStat
 			{
 				activeChar.setKarma(activeChar.getKarma() - karmaLost);
 				final SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.YOUR_KARMA_HAS_BEEN_CHANGED_TO_S1);
-				msg.addNumber(activeChar.getKarma());
+				msg.addInt(activeChar.getKarma());
 				activeChar.sendPacket(msg);
 			}
 		}
@@ -184,28 +184,28 @@ public class PcStat extends PlayableStat
 		if ((addToExp == 0) && (addToSp != 0))
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.ACQUIRED_S1_SP);
-			sm.addNumber(addToSp);
+			sm.addInt(addToSp);
 		}
 		else if ((addToSp == 0) && (addToExp != 0))
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S1_EXPERIENCE);
-			sm.addNumber((int) addToExp);
+			sm.addLong(addToExp);
 		}
 		else
 		{
 			if ((addToExp - baseExp) > 0)
 			{
 				sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_EARNED_S1_EXP_BONUS_S2_AND_S3_SP_BONUS_S4);
-				sm.addNumber((int) addToExp);
-				sm.addNumber((int) (addToExp - baseExp));
-				sm.addNumber(addToSp);
-				sm.addNumber((addToSp - baseSp));
+				sm.addLong(addToExp);
+				sm.addLong(addToExp - baseExp);
+				sm.addInt(addToSp);
+				sm.addInt(addToSp - baseSp);
 			}
 			else
 			{
 				sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_EARNED_S1_EXP_AND_S2_SP);
-				sm.addNumber((int) addToExp);
-				sm.addNumber(addToSp);
+				sm.addLong((int) addToExp);
+				sm.addInt(addToSp);
 			}
 		}
 		activeChar.sendPacket(sm);
@@ -230,10 +230,10 @@ public class PcStat extends PlayableStat
 		{
 			// Send a Server->Client System Message to the L2PcInstance
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EXP_DECREASED_BY_S1);
-			sm.addNumber((int) addToExp);
+			sm.addLong(addToExp);
 			getActiveChar().sendPacket(sm);
 			sm = SystemMessage.getSystemMessage(SystemMessageId.SP_DECREASED_S1);
-			sm.addNumber(addToSp);
+			sm.addInt(addToSp);
 			getActiveChar().sendPacket(sm);
 			if (getLevel() < level)
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/stat/PetStat.java

@@ -59,7 +59,7 @@ public class PetStat extends SummonStat
 		}
 		
 		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PET_EARNED_S1_EXP);
-		sm.addNumber((int) addToExp);
+		sm.addLong(addToExp);
 		getActiveChar().updateAndBroadcastStatus(1);
 		getActiveChar().sendPacket(sm);
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/status/PcStatus.java

@@ -179,7 +179,7 @@ public class PcStatus extends PlayableStatus
 				{
 					getActiveChar().reduceCurrentMp(mpDam);
 					SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.ARCANE_SHIELD_DECREASED_YOUR_MP_BY_S1_INSTEAD_OF_HP);
-					smsg.addNumber(mpDam);
+					smsg.addInt(mpDam);
 					getActiveChar().sendPacket(smsg);
 					return;
 				}
@@ -246,7 +246,7 @@ public class PcStatus extends PlayableStatus
 				smsg = SystemMessage.getSystemMessage(SystemMessageId.C1_RECEIVED_DAMAGE_OF_S3_FROM_C2);
 				smsg.addString(getActiveChar().getName());
 				smsg.addCharName(attacker);
-				smsg.addNumber(fullValue);
+				smsg.addInt(fullValue);
 				getActiveChar().sendPacket(smsg);
 				
 				if (tDmg > 0)
@@ -254,14 +254,14 @@ public class PcStatus extends PlayableStatus
 					smsg = SystemMessage.getSystemMessage(SystemMessageId.C1_RECEIVED_DAMAGE_OF_S3_FROM_C2);
 					smsg.addString(getActiveChar().getSummon().getName());
 					smsg.addCharName(attacker);
-					smsg.addNumber(tDmg);
+					smsg.addInt(tDmg);
 					getActiveChar().sendPacket(smsg);
 					
 					if (attackerPlayer != null)
 					{
 						smsg = SystemMessage.getSystemMessage(SystemMessageId.GIVEN_S1_DAMAGE_TO_YOUR_TARGET_AND_S2_DAMAGE_TO_SERVITOR);
-						smsg.addNumber(fullValue);
-						smsg.addNumber(tDmg);
+						smsg.addInt(fullValue);
+						smsg.addInt(tDmg);
 						attackerPlayer.sendPacket(smsg);
 					}
 				}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/status/PetStatus.java

@@ -55,7 +55,7 @@ public class PetStatus extends SummonStatus
 			{
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PET_RECEIVED_S2_DAMAGE_BY_C1);
 				sm.addCharName(attacker);
-				sm.addNumber((int) value);
+				sm.addInt((int) value);
 				getActiveChar().sendPacket(sm);
 			}
 			getActiveChar().getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, attacker);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/tasks/player/FameTask.java

@@ -52,7 +52,7 @@ public class FameTask implements Runnable
 		}
 		_player.setFame(_player.getFame() + _value);
 		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.ACQUIRED_S1_REPUTATION_SCORE);
-		sm.addNumber(_value);
+		sm.addInt(_value);
 		_player.sendPacket(sm);
 		_player.sendPacket(new UserInfo(_player));
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/tasks/player/RecoGiveTask.java

@@ -53,7 +53,7 @@ public class RecoGiveTask implements Runnable
 			_player.setRecomLeft(_player.getRecomLeft() + recoToGive);
 			
 			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_OBTAINED_S1_RECOMMENDATIONS);
-			sm.addNumber(recoToGive);
+			sm.addInt(recoToGive);
 			_player.sendPacket(sm);
 			_player.sendPacket(new UserInfo(_player));
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/tasks/player/WaterTask.java

@@ -50,7 +50,7 @@ public class WaterTask implements Runnable
 			_player.reduceCurrentHp(reduceHp, _player, false, false, null);
 			// reduced hp, becouse not rest
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.DROWN_DAMAGE_S1);
-			sm.addNumber((int) reduceHp);
+			sm.addInt((int) reduceHp);
 			_player.sendPacket(sm);
 		}
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Duel.java

@@ -713,7 +713,7 @@ public class Duel
 		if (_countdown > 0)
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.THE_DUEL_WILL_BEGIN_IN_S1_SECONDS);
-			sm.addNumber(_countdown);
+			sm.addInt(_countdown);
 		}
 		else
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/FortSiege.java

@@ -124,49 +124,49 @@ public class FortSiege implements Siegable
 				{
 					getFort().despawnSuspiciousMerchant();
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTES_UNTIL_THE_FORTRESS_BATTLE_STARTS);
-					sm.addNumber(10);
+					sm.addInt(10);
 					announceToPlayer(sm);
 					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(300), 300000); // Prepare task for 5 minutes left.
 				}
 				else if (_time == 300) // 5min remains
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTES_UNTIL_THE_FORTRESS_BATTLE_STARTS);
-					sm.addNumber(5);
+					sm.addInt(5);
 					announceToPlayer(sm);
 					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(60), 240000); // Prepare task for 1 minute left.
 				}
 				else if (_time == 60) // 1min remains
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTES_UNTIL_THE_FORTRESS_BATTLE_STARTS);
-					sm.addNumber(1);
+					sm.addInt(1);
 					announceToPlayer(sm);
 					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(30), 30000); // Prepare task for 30 seconds left.
 				}
 				else if (_time == 30) // 30seconds remains
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECONDS_UNTIL_THE_FORTRESS_BATTLE_STARTS);
-					sm.addNumber(30);
+					sm.addInt(30);
 					announceToPlayer(sm);
 					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(10), 20000); // Prepare task for 10 seconds left.
 				}
 				else if (_time == 10) // 10seconds remains
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECONDS_UNTIL_THE_FORTRESS_BATTLE_STARTS);
-					sm.addNumber(10);
+					sm.addInt(10);
 					announceToPlayer(sm);
 					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(5), 5000); // Prepare task for 5 seconds left.
 				}
 				else if (_time == 5) // 5seconds remains
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECONDS_UNTIL_THE_FORTRESS_BATTLE_STARTS);
-					sm.addNumber(5);
+					sm.addInt(5);
 					announceToPlayer(sm);
 					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(1), 4000); // Prepare task for 1 seconds left.
 				}
 				else if (_time == 1) // 1seconds remains
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_SECONDS_UNTIL_THE_FORTRESS_BATTLE_STARTS);
-					sm.addNumber(1);
+					sm.addInt(1);
 					announceToPlayer(sm);
 					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(0), 1000); // Prepare task start siege.
 				}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Hero.java

@@ -724,7 +724,7 @@ public class Hero
 					clan.addReputationScore(Config.HERO_POINTS, true);
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_MEMBER_C1_BECAME_HERO_AND_GAINED_S2_REPUTATION_POINTS);
 					sm.addString(CharNameTable.getInstance().getNameById(charId));
-					sm.addNumber(Config.HERO_POINTS);
+					sm.addInt(Config.HERO_POINTS);
 					clan.broadcastToOnlineMembers(sm);
 				}
 				player.sendPacket(new UserInfo(player));
@@ -762,7 +762,7 @@ public class Hero
 									clan.addReputationScore(Config.HERO_POINTS, true);
 									SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_MEMBER_C1_BECAME_HERO_AND_GAINED_S2_REPUTATION_POINTS);
 									sm.addString(CharNameTable.getInstance().getNameById(charId));
-									sm.addNumber(Config.HERO_POINTS);
+									sm.addInt(Config.HERO_POINTS);
 									clan.broadcastToOnlineMembers(sm);
 								}
 							}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Siege.java

@@ -106,35 +106,35 @@ public class Siege implements Siegable
 				if (timeRemaining > 3600000)
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_HOURS_UNTIL_SIEGE_CONCLUSION);
-					sm.addNumber(2);
+					sm.addInt(2);
 					announceToPlayer(sm, true);
 					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 3600000); // Prepare task for 1 hr left.
 				}
 				else if ((timeRemaining <= 3600000) && (timeRemaining > 600000))
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTES_UNTIL_SIEGE_CONCLUSION);
-					sm.addNumber((int) timeRemaining / 60000);
+					sm.addInt((int) timeRemaining / 60000);
 					announceToPlayer(sm, true);
 					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 600000); // Prepare task for 10 minute left.
 				}
 				else if ((timeRemaining <= 600000) && (timeRemaining > 300000))
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTES_UNTIL_SIEGE_CONCLUSION);
-					sm.addNumber((int) timeRemaining / 60000);
+					sm.addInt((int) timeRemaining / 60000);
 					announceToPlayer(sm, true);
 					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 300000); // Prepare task for 5 minute left.
 				}
 				else if ((timeRemaining <= 300000) && (timeRemaining > 10000))
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_MINUTES_UNTIL_SIEGE_CONCLUSION);
-					sm.addNumber((int) timeRemaining / 60000);
+					sm.addInt((int) timeRemaining / 60000);
 					announceToPlayer(sm, true);
 					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining - 10000); // Prepare task for 10 seconds count down
 				}
 				else if ((timeRemaining <= 10000) && (timeRemaining > 0))
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CASTLE_SIEGE_S1_SECONDS_LEFT);
-					sm.addNumber((int) timeRemaining / 1000);
+					sm.addInt((int) timeRemaining / 1000);
 					announceToPlayer(sm, true);
 					ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(_castleInst), timeRemaining); // Prepare task for second count down
 				}

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

@@ -393,7 +393,7 @@ public class TvTEvent
 					{
 						systemMessage = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
 						systemMessage.addItemName(reward[0]);
-						systemMessage.addItemNumber(reward[1]);
+						systemMessage.addLong(reward[1]);
 					}
 					else
 					{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/clanhall/AuctionableHall.java

@@ -195,7 +195,7 @@ public final class AuctionableHall extends ClanHall
 					{
 						updateDb();
 						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW);
-						sm.addNumber(getLease());
+						sm.addInt(getLease());
 						Clan.broadcastToOnlineMembers(sm);
 						if ((_time + (3600000 * 24)) <= (_paidUntil + _chRate))
 						{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/fishing/L2Fishing.java

@@ -250,12 +250,12 @@ public class L2Fishing implements Runnable
 			{
 				// Reeling is successful, Damage: $s1
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESFUL_S1_DAMAGE);
-				sm.addNumber(dmg);
+				sm.addInt(dmg);
 				_fisher.sendPacket(sm);
 				if (pen > 0)
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESSFUL_PENALTY_S1);
-					sm.addNumber(pen);
+					sm.addInt(pen);
 					_fisher.sendPacket(sm);
 				}
 				_goodUse = 1;
@@ -265,7 +265,7 @@ public class L2Fishing implements Runnable
 			{
 				// Reeling failed, Damage: $s1
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FISH_RESISTED_REELING_S1_HP_REGAINED);
-				sm.addNumber(dmg);
+				sm.addInt(dmg);
 				_fisher.sendPacket(sm);
 				_goodUse = 2;
 				changeHp(-dmg, pen);
@@ -277,7 +277,7 @@ public class L2Fishing implements Runnable
 			{
 				// Reeling failed, Damage: $s1
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FISH_RESISTED_REELING_S1_HP_REGAINED);
-				sm.addNumber(dmg);
+				sm.addInt(dmg);
 				_fisher.sendPacket(sm);
 				_goodUse = 2;
 				changeHp(-dmg, pen);
@@ -286,12 +286,12 @@ public class L2Fishing implements Runnable
 			{
 				// Reeling is successful, Damage: $s1
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESFUL_S1_DAMAGE);
-				sm.addNumber(dmg);
+				sm.addInt(dmg);
 				_fisher.sendPacket(sm);
 				if (pen > 0)
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.REELING_SUCCESSFUL_PENALTY_S1);
-					sm.addNumber(pen);
+					sm.addInt(pen);
 					_fisher.sendPacket(sm);
 				}
 				_goodUse = 1;
@@ -320,12 +320,12 @@ public class L2Fishing implements Runnable
 			{
 				// Pumping is successful. Damage: $s1
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESFUL_S1_DAMAGE);
-				sm.addNumber(dmg);
+				sm.addInt(dmg);
 				_fisher.sendPacket(sm);
 				if (pen > 0)
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESSFUL_PENALTY_S1);
-					sm.addNumber(pen);
+					sm.addInt(pen);
 					_fisher.sendPacket(sm);
 				}
 				_goodUse = 1;
@@ -335,7 +335,7 @@ public class L2Fishing implements Runnable
 			{
 				// Pumping failed, Regained: $s1
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FISH_RESISTED_PUMPING_S1_HP_REGAINED);
-				sm.addNumber(dmg);
+				sm.addInt(dmg);
 				_fisher.sendPacket(sm);
 				_goodUse = 2;
 				changeHp(-dmg, pen);
@@ -347,7 +347,7 @@ public class L2Fishing implements Runnable
 			{
 				// Pumping failed, Regained: $s1
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FISH_RESISTED_PUMPING_S1_HP_REGAINED);
-				sm.addNumber(dmg);
+				sm.addInt(dmg);
 				_fisher.sendPacket(sm);
 				_goodUse = 2;
 				changeHp(-dmg, pen);
@@ -356,12 +356,12 @@ public class L2Fishing implements Runnable
 			{
 				// Pumping is successful. Damage: $s1
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESFUL_S1_DAMAGE);
-				sm.addNumber(dmg);
+				sm.addInt(dmg);
 				_fisher.sendPacket(sm);
 				if (pen > 0)
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.PUMPING_SUCCESSFUL_PENALTY_S1);
-					sm.addNumber(pen);
+					sm.addInt(pen);
 					_fisher.sendPacket(sm);
 				}
 				_goodUse = 1;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/instancezone/InstanceWorld.java

@@ -106,7 +106,7 @@ public class InstanceWorld
 			if (instance != null)
 			{
 				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_WILL_BE_EXPELLED_IN_S1);
-				sm.addNumber(instance.getEjectTime() / 1000 / 60);
+				sm.addInt(instance.getEjectTime() / 60 / 1000);
 				victim.getActingPlayer().sendPacket(sm);
 				instance.addEjectDeadTask(victim.getActingPlayer());
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/ItemAuction.java

@@ -320,7 +320,7 @@ public final class ItemAuction
 			updatePlayerBid(bid, false);
 			
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SUBMITTED_A_BID_OF_S1);
-			sm.addItemNumber(newBid);
+			sm.addLong(newBid);
 			player.sendPacket(sm);
 			return;
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionInstance.java

@@ -499,7 +499,7 @@ public final class ItemAuctionInstance
 	
 	final void onAuctionFinished(final ItemAuction auction)
 	{
-		auction.broadcastToAllBiddersInternal(SystemMessage.getSystemMessage(SystemMessageId.S1_AUCTION_ENDED).addNumber(auction.getAuctionId()));
+		auction.broadcastToAllBiddersInternal(SystemMessage.getSystemMessage(SystemMessageId.S1_AUCTION_ENDED).addInt(auction.getAuctionId()));
 		
 		final ItemAuctionBid bid = auction.getHighestBid();
 		if (bid != null)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/AbstractOlympiadGame.java

@@ -95,7 +95,7 @@ public abstract class AbstractOlympiadGame
 		par.updateStat(POINTS, points);
 		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_GAINED_S2_OLYMPIAD_POINTS);
 		sm.addString(par.getName());
-		sm.addNumber(points);
+		sm.addInt(points);
 		broadcastPacket(sm);
 		
 		for (Quest quest : QuestManager.getInstance().getAllManagedScripts())
@@ -112,7 +112,7 @@ public abstract class AbstractOlympiadGame
 		par.updateStat(POINTS, -points);
 		final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_LOST_S2_OLYMPIAD_POINTS);
 		sm.addString(par.getName());
-		sm.addNumber(points);
+		sm.addInt(points);
 		broadcastPacket(sm);
 		
 		for (Quest quest : QuestManager.getInstance().getAllManagedScripts())
@@ -469,7 +469,7 @@ public abstract class AbstractOlympiadGame
 				iu.addModifiedItem(item);
 				sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
 				sm.addItemName(it[0]);
-				sm.addNumber(it[1]);
+				sm.addInt(it[1]);
 				player.sendPacket(sm);
 			}
 			player.sendPacket(iu);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/Olympiad.java

@@ -398,7 +398,7 @@ public class Olympiad
 		public void run()
 		{
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.OLYMPIAD_PERIOD_S1_HAS_ENDED);
-			sm.addNumber(_currentCycle);
+			sm.addInt(_currentCycle);
 			
 			Announcements.getInstance().announceToAll(sm);
 			Announcements.getInstance().announceToAll("Olympiad Validation Period has began");
@@ -585,7 +585,7 @@ public class Olympiad
 	protected void setNewOlympiadEnd()
 	{
 		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.OLYMPIAD_PERIOD_S1_HAS_STARTED);
-		sm.addNumber(_currentCycle);
+		sm.addInt(_currentCycle);
 		
 		Announcements.getInstance().announceToAll(sm);
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTask.java

@@ -185,7 +185,7 @@ public final class OlympiadGameTask implements Runnable
 					if (_countDown > 0)
 					{
 						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_WILL_ENTER_THE_OLYMPIAD_STADIUM_IN_S1_SECOND_S);
-						sm.addNumber(_countDown);
+						sm.addInt(_countDown);
 						_game.broadcastPacket(sm);
 					}
 					
@@ -216,7 +216,7 @@ public final class OlympiadGameTask implements Runnable
 					if (_countDown > 0)
 					{
 						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_WILL_START_IN_S1_SECOND_S);
-						sm.addNumber(_countDown);
+						sm.addInt(_countDown);
 						_zone.broadcastPacket(sm);
 					}
 					
@@ -238,7 +238,7 @@ public final class OlympiadGameTask implements Runnable
 					if (_countDown > 0)
 					{
 						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_GAME_WILL_START_IN_S1_SECOND_S);
-						sm.addNumber(_countDown);
+						sm.addInt(_countDown);
 						_zone.broadcastPacket(sm);
 					}
 					
@@ -288,7 +288,7 @@ public final class OlympiadGameTask implements Runnable
 					if (_countDown > 0)
 					{
 						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_WILL_BE_MOVED_TO_TOWN_IN_S1_SECONDS);
-						sm.addNumber(_countDown);
+						sm.addInt(_countDown);
 						_game.broadcastPacket(sm);
 					}
 					

L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/Quest.java

@@ -3286,7 +3286,7 @@ public class Quest extends ManagedScript implements IIdentifiable
 		if (item.getId() == Inventory.ADENA_ID)
 		{
 			SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S1_ADENA);
-			smsg.addItemNumber(count);
+			smsg.addLong(count);
 			player.sendPacket(smsg);
 		}
 		// Otherwise, send message of object reward to client
@@ -3296,7 +3296,7 @@ public class Quest extends ManagedScript implements IIdentifiable
 			{
 				SystemMessage smsg = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
 				smsg.addItemName(item);
-				smsg.addItemNumber(count);
+				smsg.addLong(count);
 				player.sendPacket(smsg);
 			}
 			else

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/SkillChannelizer.java

@@ -125,122 +125,130 @@ public class SkillChannelizer implements Runnable
 			return;
 		}
 		
-		if (_skill.getMpPerChanneling() > 0)
+		try
 		{
-			// Validate mana per tick.
-			if (_channelizer.getCurrentMp() < _skill.getMpPerChanneling())
+			
+			if (_skill.getMpPerChanneling() > 0)
 			{
-				if (_channelizer.isPlayer())
+				// Validate mana per tick.
+				if (_channelizer.getCurrentMp() < _skill.getMpPerChanneling())
 				{
-					_channelizer.sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
+					if (_channelizer.isPlayer())
+					{
+						_channelizer.sendPacket(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP);
+					}
+					_channelizer.abortCast();
+					return;
 				}
-				_channelizer.abortCast();
-				return;
-			}
-			
-			// Reduce mana per tick
-			_channelizer.reduceCurrentMp(_skill.getMpPerChanneling());
-		}
-		
-		// Apply channeling skills on the targets.
-		if (_skill.getChannelingSkillId() > 0)
-		{
-			final L2Skill baseSkill = SkillTable.getInstance().getInfo(_skill.getChannelingSkillId(), 1);
-			if (baseSkill == null)
-			{
-				_log.log(Level.WARNING, getClass().getSimpleName() + ": skill " + _skill + " couldn't find effect id skill: " + _skill.getChannelingSkillId() + " !");
-				_channelizer.abortCast();
-				return;
+				
+				// Reduce mana per tick
+				_channelizer.reduceCurrentMp(_skill.getMpPerChanneling());
 			}
 			
-			if (_channelized == null)
+			// Apply channeling skills on the targets.
+			if (_skill.getChannelingSkillId() > 0)
 			{
-				final List<L2Character> targets = getTargetList();
-				if (targets.isEmpty())
+				final L2Skill baseSkill = SkillTable.getInstance().getInfo(_skill.getChannelingSkillId(), 1);
+				if (baseSkill == null)
 				{
-					_log.log(Level.WARNING, getClass().getSimpleName() + ": skill " + _skill + " couldn't find proper target!");
+					_log.log(Level.WARNING, getClass().getSimpleName() + ": skill " + _skill + " couldn't find effect id skill: " + _skill.getChannelingSkillId() + " !");
 					_channelizer.abortCast();
 					return;
 				}
 				
-				_channelized = targets.get(0);
-				_channelized.getSkillChannelized().addChannelizer(_skill.getChannelingSkillId(), getChannelizer());
-			}
-			
-			if (!Util.checkIfInRange(_skill.getEffectRange(), _channelizer, _channelized, true))
-			{
-				_channelizer.abortCast();
-				_channelizer.sendPacket(SystemMessageId.CANT_SEE_TARGET);
-			}
-			else if (!GeoData.getInstance().canSeeTarget(_channelizer, _channelized))
-			{
-				_channelizer.abortCast();
-				_channelizer.sendPacket(SystemMessageId.CANT_SEE_TARGET);
-			}
-			else
-			{
-				final int maxSkillLevel = SkillTable.getInstance().getMaxLevel(_skill.getChannelingSkillId());
-				final int skillLevel = Math.min(_channelized.getSkillChannelized().getChannerlizersSize(_skill.getChannelingSkillId()), maxSkillLevel);
+				if (_channelized == null)
+				{
+					final List<L2Character> targets = getTargetList();
+					if (targets.isEmpty())
+					{
+						_log.log(Level.WARNING, getClass().getSimpleName() + ": skill " + _skill + " couldn't find proper target!");
+						_channelizer.abortCast();
+						return;
+					}
+					
+					_channelized = targets.get(0);
+					_channelized.getSkillChannelized().addChannelizer(_skill.getChannelingSkillId(), getChannelizer());
+				}
 				
-				final BuffInfo info = _channelized.getEffectList().getBuffInfoBySkillId(_skill.getChannelingSkillId());
-				if ((info == null) || (info.getSkill().getLevel() < skillLevel))
+				if (!Util.checkIfInRange(_skill.getEffectRange(), _channelizer, _channelized, true))
 				{
-					final L2Skill skill = SkillTable.getInstance().getInfo(_skill.getChannelingSkillId(), skillLevel);
-					skill.applyEffects(getChannelizer(), _channelized);
+					_channelizer.abortCast();
+					_channelizer.sendPacket(SystemMessageId.CANT_SEE_TARGET);
 				}
-				_channelizer.broadcastPacket(new MagicSkillLaunched(_channelizer, _skill.getId(), _skill.getLevel(), _channelized));
-			}
-		}
-		else
-		{
-			final List<L2Character> targets = getTargetList();
-			final Iterator<L2Character> it = targets.iterator();
-			while (it.hasNext())
-			{
-				final L2Character target = it.next();
-				if (!GeoData.getInstance().canSeeTarget(_channelizer, target))
+				else if (!GeoData.getInstance().canSeeTarget(_channelizer, _channelized))
 				{
-					it.remove();
-					continue;
+					_channelizer.abortCast();
+					_channelizer.sendPacket(SystemMessageId.CANT_SEE_TARGET);
 				}
-				
-				if (_channelizer.isPlayable() && target.isPlayable() && _skill.isBad())
+				else
 				{
-					// Validate pvp conditions.
-					if (_channelizer.isPlayable() && _channelizer.getActingPlayer().canAttackCharacter(target))
+					final int maxSkillLevel = SkillTable.getInstance().getMaxLevel(_skill.getChannelingSkillId());
+					final int skillLevel = Math.min(_channelized.getSkillChannelized().getChannerlizersSize(_skill.getChannelingSkillId()), maxSkillLevel);
+					
+					final BuffInfo info = _channelized.getEffectList().getBuffInfoBySkillId(_skill.getChannelingSkillId());
+					if ((info == null) || (info.getSkill().getLevel() < skillLevel))
 					{
-						// Apply channeling skill effects on the target.
-						_skill.applyEffects(_channelizer, target);
-						// Update the pvp flag of the caster.
-						_channelizer.getActingPlayer().updatePvPStatus(target);
+						final L2Skill skill = SkillTable.getInstance().getInfo(_skill.getChannelingSkillId(), skillLevel);
+						skill.applyEffects(getChannelizer(), _channelized);
 					}
-					else
+					_channelizer.broadcastPacket(new MagicSkillLaunched(_channelizer, _skill.getId(), _skill.getLevel(), _channelized));
+				}
+			}
+			else
+			{
+				final List<L2Character> targets = getTargetList();
+				final Iterator<L2Character> it = targets.iterator();
+				while (it.hasNext())
+				{
+					final L2Character target = it.next();
+					if (!GeoData.getInstance().canSeeTarget(_channelizer, target))
 					{
 						it.remove();
+						continue;
+					}
+					
+					if (_channelizer.isPlayable() && target.isPlayable() && _skill.isBad())
+					{
+						// Validate pvp conditions.
+						if (_channelizer.isPlayable() && _channelizer.getActingPlayer().canAttackCharacter(target))
+						{
+							// Apply channeling skill effects on the target.
+							_skill.applyEffects(_channelizer, target);
+							// Update the pvp flag of the caster.
+							_channelizer.getActingPlayer().updatePvPStatus(target);
+						}
+						else
+						{
+							it.remove();
+						}
+					}
+					else
+					{
+						// Apply channeling skill effects on the target.
+						_skill.applyEffects(_channelizer, target);
 					}
 				}
+				
+				// Broadcast MagicSkillLaunched on every cast.
+				_channelizer.broadcastPacket(new MagicSkillLaunched(_channelizer, _skill.getId(), _skill.getLevel(), targets.toArray(new L2Character[0])));
+				
+				// Reduce shots.
+				if (_skill.useSpiritShot())
+				{
+					_channelizer.setChargedShot(_channelizer.isChargedShot(ShotType.BLESSED_SPIRITSHOTS) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS, false);
+				}
 				else
 				{
-					// Apply channeling skill effects on the target.
-					_skill.applyEffects(_channelizer, target);
+					_channelizer.setChargedShot(ShotType.SOULSHOTS, false);
 				}
+				
+				// Shots are re-charged every cast.
+				_channelizer.rechargeShots(_skill.useSoulShot(), _skill.useSpiritShot());
 			}
-			
-			// Broadcast MagicSkillLaunched on every cast.
-			_channelizer.broadcastPacket(new MagicSkillLaunched(_channelizer, _skill.getId(), _skill.getLevel(), targets.toArray(new L2Character[0])));
-			
-			// Reduce shots.
-			if (_skill.useSpiritShot())
-			{
-				_channelizer.setChargedShot(_channelizer.isChargedShot(ShotType.BLESSED_SPIRITSHOTS) ? ShotType.BLESSED_SPIRITSHOTS : ShotType.SPIRITSHOTS, false);
-			}
-			else
-			{
-				_channelizer.setChargedShot(ShotType.SOULSHOTS, false);
-			}
-			
-			// Shots are re-charged every cast.
-			_channelizer.rechargeShots(_skill.useSoulShot(), _skill.useSpiritShot());
+		}
+		catch (Exception e)
+		{
+			_log.log(Level.WARNING, "Error while channelizing skill: " + _skill + " channelizer: " + _channelizer + " channelized: " + _channelized, e);
 		}
 	}
 	

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

@@ -230,7 +230,7 @@ public class MultiSellChoose extends L2GameClientPacket
 						{
 							SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_UNIT_OF_THE_ITEM_S1_REQUIRED);
 							sm.addItemName(e.getTemplate());
-							sm.addNumber((int) required);
+							sm.addLong(required);
 							player.sendPacket(sm);
 							return;
 						}
@@ -426,7 +426,7 @@ public class MultiSellChoose extends L2GameClientPacket
 							{
 								sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
 								sm.addItemName(e.getItemId());
-								sm.addItemNumber(e.getItemCount() * _amount);
+								sm.addLong(e.getItemCount() * _amount);
 								player.sendPacket(sm);
 								sm = null;
 							}
@@ -435,7 +435,7 @@ public class MultiSellChoose extends L2GameClientPacket
 								if (list.getMaintainEnchantment() && (e.getEnchantLevel() > 0))
 								{
 									sm = SystemMessage.getSystemMessage(SystemMessageId.ACQUIRED_S1_S2);
-									sm.addItemNumber(e.getEnchantLevel());
+									sm.addLong(e.getEnchantLevel());
 									sm.addItemName(e.getItemId());
 								}
 								else

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -196,7 +196,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket
 							
 							final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 							sm.addItemName(item.getId());
-							sm.addItemNumber(item.getCount());
+							sm.addLong(item.getCount());
 							activeChar.sendPacket(sm);
 						}
 					}
@@ -204,7 +204,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket
 					clan.takeReputationScore(repCost, true);
 					
 					final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
-					cr.addNumber(repCost);
+					cr.addInt(repCost);
 					activeChar.sendPacket(cr);
 					
 					clan.addNewSkill(skill);
@@ -262,7 +262,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket
 						
 						final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
 						sm.addItemName(item.getId());
-						sm.addItemNumber(item.getCount());
+						sm.addLong(item.getCount());
 						activeChar.sendPacket(sm);
 					}
 					
@@ -270,7 +270,7 @@ public final class RequestAcquireSkill extends L2GameClientPacket
 					{
 						clan.takeReputationScore(rep, true);
 						final SystemMessage cr = SystemMessage.getSystemMessage(SystemMessageId.S1_DEDUCTED_FROM_CLAN_REP);
-						cr.addNumber(rep);
+						cr.addInt(rep);
 						activeChar.sendPacket(cr);
 					}
 					

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

@@ -68,12 +68,12 @@ public final class RequestAllyInfo extends L2GameClientPacket
 			activeChar.sendPacket(sm);
 			
 			sm = SystemMessage.getSystemMessage(SystemMessageId.CONNECTION_S1_TOTAL_S2);
-			sm.addNumber(ai.getOnline());
-			sm.addNumber(ai.getTotal());
+			sm.addInt(ai.getOnline());
+			sm.addInt(ai.getTotal());
 			activeChar.sendPacket(sm);
 			
 			sm = SystemMessage.getSystemMessage(SystemMessageId.ALLIANCE_CLAN_TOTAL_S1);
-			sm.addNumber(ai.getAllies().length);
+			sm.addInt(ai.getAllies().length);
 			activeChar.sendPacket(sm);
 			
 			sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_HEAD);
@@ -90,12 +90,12 @@ public final class RequestAllyInfo extends L2GameClientPacket
 				activeChar.sendPacket(sm);
 				
 				sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_LEVEL_S1);
-				sm.addNumber(aci.getClan().getLevel());
+				sm.addInt(aci.getClan().getLevel());
 				activeChar.sendPacket(sm);
 				
 				sm = SystemMessage.getSystemMessage(SystemMessageId.CONNECTION_S1_TOTAL_S2);
-				sm.addNumber(aci.getOnline());
-				sm.addNumber(aci.getTotal());
+				sm.addInt(aci.getOnline());
+				sm.addInt(aci.getTotal());
 				activeChar.sendPacket(sm);
 				
 				sm = SystemMessage.getSystemMessage(SystemMessageId.CLAN_INFO_SEPARATOR);

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

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

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestCancelPostAttachment.java

@@ -193,7 +193,7 @@ public final class RequestCancelPostAttachment extends L2GameClientPacket
 			}
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_ACQUIRED_S2_S1);
 			sm.addItemName(item.getId());
-			sm.addItemNumber(count);
+			sm.addLong(count);
 			activeChar.sendPacket(sm);
 		}
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestCrystallizeItem.java

@@ -194,7 +194,7 @@ public final class RequestCrystallizeItem extends L2GameClientPacket
 			if (itemToRemove.getEnchantLevel() > 0)
 			{
 				sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
-				sm.addNumber(itemToRemove.getEnchantLevel());
+				sm.addInt(itemToRemove.getEnchantLevel());
 				sm.addItemName(itemToRemove);
 			}
 			else
@@ -223,7 +223,7 @@ public final class RequestCrystallizeItem extends L2GameClientPacket
 		
 		sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
 		sm.addItemName(createditem);
-		sm.addItemNumber(crystalAmount);
+		sm.addLong(crystalAmount);
 		activeChar.sendPacket(sm);
 		
 		activeChar.broadcastUserInfo();

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestDestroyItem.java

@@ -174,7 +174,7 @@ public final class RequestDestroyItem extends L2GameClientPacket
 			if (itemToRemove.getEnchantLevel() > 0)
 			{
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
-				sm.addNumber(itemToRemove.getEnchantLevel());
+				sm.addInt(itemToRemove.getEnchantLevel());
 				sm.addItemName(itemToRemove);
 				activeChar.sendPacket(sm);
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestEnchantItem.java

@@ -210,7 +210,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
 					{
 						SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_SUCCESSFULY_ENCHANTED_A_S2_S3);
 						sm.addCharName(activeChar);
-						sm.addNumber(item.getEnchantLevel());
+						sm.addInt(item.getEnchantLevel());
 						sm.addItemName(item);
 						activeChar.broadcastPacket(sm);
 						
@@ -263,7 +263,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
 							if (item.getEnchantLevel() > 0)
 							{
 								SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
-								sm.addNumber(item.getEnchantLevel());
+								sm.addInt(item.getEnchantLevel());
 								sm.addItemName(item);
 								activeChar.sendPacket(sm);
 							}
@@ -349,7 +349,7 @@ public final class RequestEnchantItem extends L2GameClientPacket
 								
 								SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.EARNED_S2_S1_S);
 								sm.addItemName(crystals);
-								sm.addItemNumber(count);
+								sm.addLong(count);
 								activeChar.sendPacket(sm);
 							}
 							

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java

@@ -225,7 +225,7 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.ELEMENTAL_POWER_S3_SUCCESSFULLY_ADDED_TO_S1_S2);
 				}
-				sm.addNumber(item.getEnchantLevel());
+				sm.addInt(item.getEnchantLevel());
 				sm.addItemName(item);
 				sm.addElemental(realElement);
 				if (item.isArmor())

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java

@@ -203,7 +203,7 @@ public final class RequestExEnchantSkillRouteChange extends L2GameClientPacket
 			{
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.SKILL_ENCHANT_CHANGE_SUCCESSFUL_S1_LEVEL_WAS_DECREASED_BY_S2);
 				sm.addSkillName(_skillId);
-				sm.addNumber(levelPenalty);
+				sm.addInt(levelPenalty);
 				player.sendPacket(sm);
 			}
 			player.sendSkillList();

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

@@ -93,7 +93,7 @@ public class RequestExRemoveItemAttribute extends L2GameClientPacket
 				{
 					sm = SystemMessage.getSystemMessage(SystemMessageId.S1_S2_ELEMENTAL_POWER_REMOVED);
 				}
-				sm.addNumber(targetItem.getEnchantLevel());
+				sm.addInt(targetItem.getEnchantLevel());
 				sm.addItemName(targetItem);
 				if (targetItem.isArmor())
 				{

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPetition.java

@@ -87,7 +87,7 @@ public final class RequestPetition extends L2GameClientPacket
 		if (totalPetitions > Config.MAX_PETITIONS_PER_PLAYER)
 		{
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.WE_HAVE_RECEIVED_S1_PETITIONS_TODAY);
-			sm.addNumber(totalPetitions);
+			sm.addInt(totalPetitions);
 			activeChar.sendPacket(sm);
 			sm = null;
 			return;
@@ -102,16 +102,16 @@ public final class RequestPetition extends L2GameClientPacket
 		int petitionId = PetitionManager.getInstance().submitPetition(activeChar, _content, _type);
 		
 		SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.PETITION_ACCEPTED_RECENT_NO_S1);
-		sm.addNumber(petitionId);
+		sm.addInt(petitionId);
 		activeChar.sendPacket(sm);
 		
 		sm = SystemMessage.getSystemMessage(SystemMessageId.SUBMITTED_YOU_S1_TH_PETITION_S2_LEFT);
-		sm.addNumber(totalPetitions);
-		sm.addNumber(Config.MAX_PETITIONS_PER_PLAYER - totalPetitions);
+		sm.addInt(totalPetitions);
+		sm.addInt(Config.MAX_PETITIONS_PER_PLAYER - totalPetitions);
 		activeChar.sendPacket(sm);
 		
 		sm = SystemMessage.getSystemMessage(SystemMessageId.S1_PETITION_ON_WAITING_LIST);
-		sm.addNumber(PetitionManager.getInstance().getPendingPetitionCount());
+		sm.addInt(PetitionManager.getInstance().getPendingPetitionCount());
 		activeChar.sendPacket(sm);
 		sm = null;
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPostAttachment.java

@@ -222,7 +222,7 @@ public final class RequestPostAttachment extends L2GameClientPacket
 			}
 			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_ACQUIRED_S2_S1);
 			sm.addItemName(item.getId());
-			sm.addItemNumber(count);
+			sm.addLong(count);
 			activeChar.sendPacket(sm);
 		}
 		
@@ -251,7 +251,7 @@ public final class RequestPostAttachment extends L2GameClientPacket
 			{
 				sender.addAdena("PayMail", adena, activeChar, false);
 				sm = SystemMessage.getSystemMessage(SystemMessageId.PAYMENT_OF_S1_ADENA_COMPLETED_BY_S2);
-				sm.addItemNumber(adena);
+				sm.addLong(adena);
 				sm.addCharName(activeChar);
 				sender.sendPacket(sm);
 			}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestProcureCropList.java

@@ -162,7 +162,7 @@ public class RequestProcureCropList extends L2GameClientPacket
 			{
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FAILED_IN_TRADING_S2_OF_CROP_S1);
 				sm.addItemName(i.getItemId());
-				sm.addItemNumber(i.getCount());
+				sm.addLong(i.getCount());
 				player.sendPacket(sm);
 				continue;
 			}
@@ -171,7 +171,7 @@ public class RequestProcureCropList extends L2GameClientPacket
 			{
 				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.FAILED_IN_TRADING_S2_OF_CROP_S1);
 				sm.addItemName(i.getItemId());
-				sm.addItemNumber(i.getCount());
+				sm.addLong(i.getCount());
 				player.sendPacket(sm);
 				sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
 				player.sendPacket(sm);

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestUnEquipItem.java

@@ -116,7 +116,7 @@ public class RequestUnEquipItem extends L2GameClientPacket
 			if (unequipped[0].getEnchantLevel() > 0)
 			{
 				sm = SystemMessage.getSystemMessage(SystemMessageId.EQUIPMENT_S1_S2_REMOVED);
-				sm.addNumber(unequipped[0].getEnchantLevel());
+				sm.addInt(unequipped[0].getEnchantLevel());
 			}
 			else
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestVoteNew.java

@@ -92,7 +92,7 @@ public final class RequestVoteNew extends L2GameClientPacket
 		SystemMessage sm = null;
 		sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_RECOMMENDED_C1_YOU_HAVE_S2_RECOMMENDATIONS_LEFT);
 		sm.addPcName(target);
-		sm.addNumber(activeChar.getRecomLeft());
+		sm.addInt(activeChar.getRecomLeft());
 		activeChar.sendPacket(sm);
 		
 		sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_BEEN_RECOMMENDED_BY_C1);

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/UseItem.java

@@ -387,21 +387,21 @@ public final class UseItem extends L2GameClientPacket
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.S2_HOURS_S3_MINUTES_S4_SECONDS_REMAINING_FOR_REUSE_S1);
 			sm.addItemName(item);
-			sm.addNumber(hours);
-			sm.addNumber(minutes);
+			sm.addInt(hours);
+			sm.addInt(minutes);
 		}
 		else if (minutes > 0)
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.S2_MINUTES_S3_SECONDS_REMAINING_FOR_REUSE_S1);
 			sm.addItemName(item);
-			sm.addNumber(minutes);
+			sm.addInt(minutes);
 		}
 		else
 		{
 			sm = SystemMessage.getSystemMessage(SystemMessageId.S2_SECONDS_REMAINING_FOR_REUSE_S1);
 			sm.addItemName(item);
 		}
-		sm.addNumber(seconds);
+		sm.addInt(seconds);
 		activeChar.sendPacket(sm);
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/network/communityserver/readpackets/RequestPlayerShowMessage.java

@@ -83,7 +83,7 @@ public final class RequestPlayerShowMessage extends BaseReadPacket
 				{
 					SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S1_UNREAD_MESSAGES);
 					final int number = super.readD();
-					sm.addNumber(number);
+					sm.addInt(number);
 					player.sendPacket(sm);
 				}
 				catch (Exception e)

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

@@ -102,12 +102,12 @@ public final class SystemMessage extends L2GameServerPacket
 	private static final byte TYPE_ELEMENT_NAME = 9;
 	// id 8 - same as 3
 	private static final byte TYPE_ZONE_NAME = 7;
-	private static final byte TYPE_ITEM_NUMBER = 6;
+	private static final byte TYPE_LONG_NUMBER = 6;
 	private static final byte TYPE_CASTLE_NAME = 5;
 	private static final byte TYPE_SKILL_NAME = 4;
 	private static final byte TYPE_ITEM_NAME = 3;
 	private static final byte TYPE_NPC_NAME = 2;
-	private static final byte TYPE_NUMBER = 1;
+	private static final byte TYPE_INT_NUMBER = 1;
 	private static final byte TYPE_TEXT = 0;
 	
 	public static final SystemMessage sendString(final String text)
@@ -214,15 +214,15 @@ public final class SystemMessage extends L2GameServerPacket
 		return this;
 	}
 	
-	public final SystemMessage addNumber(final int number)
+	public final SystemMessage addInt(final int number)
 	{
-		append(new SMParam(TYPE_NUMBER, number));
+		append(new SMParam(TYPE_INT_NUMBER, number));
 		return this;
 	}
 	
-	public final SystemMessage addItemNumber(final long number)
+	public final SystemMessage addLong(final long number)
 	{
-		append(new SMParam(TYPE_ITEM_NUMBER, number));
+		append(new SMParam(TYPE_LONG_NUMBER, number));
 		return this;
 	}
 	
@@ -425,7 +425,7 @@ public final class SystemMessage extends L2GameServerPacket
 					break;
 				}
 				
-				case TYPE_ITEM_NUMBER:
+				case TYPE_LONG_NUMBER:
 				{
 					params[i] = param.getValue();
 					break;
@@ -445,7 +445,7 @@ public final class SystemMessage extends L2GameServerPacket
 					break;
 				}
 				
-				case TYPE_NUMBER:
+				case TYPE_INT_NUMBER:
 				{
 					params[i] = param.getValue();
 					break;
@@ -528,7 +528,7 @@ public final class SystemMessage extends L2GameServerPacket
 					break;
 				}
 				
-				case TYPE_ITEM_NUMBER:
+				case TYPE_LONG_NUMBER:
 				{
 					out.println(param.getLongValue());
 					break;
@@ -536,7 +536,7 @@ public final class SystemMessage extends L2GameServerPacket
 				
 				case TYPE_ITEM_NAME:
 				case TYPE_CASTLE_NAME:
-				case TYPE_NUMBER:
+				case TYPE_INT_NUMBER:
 				case TYPE_NPC_NAME:
 				case TYPE_ELEMENT_NAME:
 				case TYPE_SYSTEM_STRING:
@@ -590,7 +590,7 @@ public final class SystemMessage extends L2GameServerPacket
 					break;
 				}
 				
-				case TYPE_ITEM_NUMBER:
+				case TYPE_LONG_NUMBER:
 				{
 					writeQ(param.getLongValue());
 					break;
@@ -598,7 +598,7 @@ public final class SystemMessage extends L2GameServerPacket
 				
 				case TYPE_ITEM_NAME:
 				case TYPE_CASTLE_NAME:
-				case TYPE_NUMBER:
+				case TYPE_INT_NUMBER:
 				case TYPE_NPC_NAME:
 				case TYPE_ELEMENT_NAME:
 				case TYPE_SYSTEM_STRING: