2
0
Эх сурвалжийг харах

don't box/unbox if it is not needed ;)

janiii 15 жил өмнө
parent
commit
4025a0178c

+ 1 - 1
L2_GameServer/java/net/sf/l2j/Config.java

@@ -957,7 +957,7 @@ public final class Config
 							{
 								if (!st.equalsIgnoreCase(""))
 								{
-									int val = Integer.valueOf(st);
+									int val = Integer.parseInt(st);
 									if (val > 23 || val < 0)
 										_log.warning(StringUtil.concat("[SiegeHourList]: invalid config property -> SiegeHourList \"", st, "\""));
 									else if (val < 12)

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/model/L2AccessLevel.java

@@ -251,7 +251,7 @@ public class L2AccessLevel
 
 		for (int i = 0;i < childsSplit.length;++ i)
 		{
-			L2AccessLevel accessLevelInst = AccessLevels.getInstance().getAccessLevel(Integer.valueOf(childsSplit[i]));
+			L2AccessLevel accessLevelInst = AccessLevels.getInstance().getAccessLevel(Integer.parseInt(childsSplit[i]));
 
 			if (accessLevelInst == null)
 			{

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/model/L2AdminCommandAccessRight.java

@@ -45,7 +45,7 @@ public class L2AdminCommandAccessRight
 		{
 			try
 			{
-				_accessLevels[i] = AccessLevels.getInstance().getAccessLevel(Integer.valueOf(accessLevelsSplit[i]));
+				_accessLevels[i] = AccessLevels.getInstance().getAccessLevel(Integer.parseInt(accessLevelsSplit[i]));
 			}
 			catch (NumberFormatException nfe)
 			{

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/model/L2Skill.java

@@ -406,7 +406,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
             _negateId = new int[valuesSplit.length];
     		for (int i = 0; i < valuesSplit.length;i++)
     		{
-    			_negateId[i] = Integer.valueOf(valuesSplit[i]);
+    			_negateId[i] = Integer.parseInt(valuesSplit[i]);
     		}
         }
         else

+ 15 - 15
L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2CastleChamberlainInstance.java

@@ -621,7 +621,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 								NpcHtmlMessage html = new NpcHtmlMessage(1);
 								html.setFile("data/html/chamberlain/functions-apply.htm");
 								html.replace("%name%", "Fireplace (HP Recovery Device)");
-								int percent = Integer.valueOf(val);
+								int percent = Integer.parseInt(val);
 								int cost;
 								switch (percent)
 								{
@@ -660,7 +660,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 								NpcHtmlMessage html = new NpcHtmlMessage(1);
 								html.setFile("data/html/chamberlain/functions-apply.htm");
 								html.replace("%name%", "Carpet (MP Recovery)");
-								int percent = Integer.valueOf(val);
+								int percent = Integer.parseInt(val);
 								int cost;
 								switch (percent)
 								{
@@ -695,7 +695,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 								NpcHtmlMessage html = new NpcHtmlMessage(1);
 								html.setFile("data/html/chamberlain/functions-apply.htm");
 								html.replace("%name%", "Chandelier (EXP Recovery Device)");
-								int percent = Integer.valueOf(val);
+								int percent = Integer.parseInt(val);
 								int cost;
 								switch (percent)
 								{
@@ -736,7 +736,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 									html.setFile("data/html/chamberlain/functions-apply_confirmed.htm");
 									if (getCastle().getFunction(Castle.FUNC_RESTORE_HP) != null)
 									{
-										if (getCastle().getFunction(Castle.FUNC_RESTORE_HP).getLvl() == Integer.valueOf(val))
+										if (getCastle().getFunction(Castle.FUNC_RESTORE_HP).getLvl() == Integer.parseInt(val))
 										{
 											html.setFile("data/html/chamberlain/functions-used.htm");
 											html.replace("%val%", String.valueOf(val)
@@ -745,7 +745,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 											return;
 										}
 									}
-									int percent = Integer.valueOf(val);
+									int percent = Integer.parseInt(val);
 									switch (percent)
 									{
 										case 0:
@@ -789,7 +789,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 									html.setFile("data/html/chamberlain/functions-apply_confirmed.htm");
 									if (getCastle().getFunction(Castle.FUNC_RESTORE_MP) != null)
 									{
-										if (getCastle().getFunction(Castle.FUNC_RESTORE_MP).getLvl() == Integer.valueOf(val))
+										if (getCastle().getFunction(Castle.FUNC_RESTORE_MP).getLvl() == Integer.parseInt(val))
 										{
 											html.setFile("data/html/chamberlain/functions-used.htm");
 											html.replace("%val%", String.valueOf(val)
@@ -798,7 +798,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 											return;
 										}
 									}
-									int percent = Integer.valueOf(val);
+									int percent = Integer.parseInt(val);
 									switch (percent)
 									{
 										case 0:
@@ -839,7 +839,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 									html.setFile("data/html/chamberlain/functions-apply_confirmed.htm");
 									if (getCastle().getFunction(Castle.FUNC_RESTORE_EXP) != null)
 									{
-										if (getCastle().getFunction(Castle.FUNC_RESTORE_EXP).getLvl() == Integer.valueOf(val))
+										if (getCastle().getFunction(Castle.FUNC_RESTORE_EXP).getLvl() == Integer.parseInt(val))
 										{
 											html.setFile("data/html/chamberlain/functions-used.htm");
 											html.replace("%val%", String.valueOf(val)
@@ -848,7 +848,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 											return;
 										}
 									}
-									int percent = Integer.valueOf(val);
+									int percent = Integer.parseInt(val);
 									switch (percent)
 									{
 										case 0:
@@ -974,7 +974,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 								NpcHtmlMessage html = new NpcHtmlMessage(1);
 								html.setFile("data/html/chamberlain/functions-apply.htm");
 								html.replace("%name%", "Insignia (Supplementary Magic)");
-								int stage = Integer.valueOf(val);
+								int stage = Integer.parseInt(val);
 								int cost;
 								switch (stage)
 								{
@@ -1008,7 +1008,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 								NpcHtmlMessage html = new NpcHtmlMessage(1);
 								html.setFile("data/html/chamberlain/functions-apply.htm");
 								html.replace("%name%", "Mirror (Teleportation Device)");
-								int stage = Integer.valueOf(val);
+								int stage = Integer.parseInt(val);
 								int cost;
 								switch (stage)
 								{
@@ -1043,7 +1043,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 									html.setFile("data/html/chamberlain/functions-apply_confirmed.htm");
 									if (getCastle().getFunction(Castle.FUNC_TELEPORT) != null)
 									{
-										if (getCastle().getFunction(Castle.FUNC_TELEPORT).getLvl() == Integer.valueOf(val))
+										if (getCastle().getFunction(Castle.FUNC_TELEPORT).getLvl() == Integer.parseInt(val))
 										{
 											html.setFile("data/html/chamberlain/functions-used.htm");
 											html.replace("%val%", "Stage "	+ String.valueOf(val));
@@ -1051,7 +1051,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 											return;
 										}
 									}
-									int lvl = Integer.valueOf(val);
+									int lvl = Integer.parseInt(val);
 									switch (lvl)
 									{
 										case 0:
@@ -1086,7 +1086,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 									html.setFile("data/html/chamberlain/functions-apply_confirmed.htm");
 									if (getCastle().getFunction(Castle.FUNC_SUPPORT) != null)
 									{
-										if (getCastle().getFunction(Castle.FUNC_SUPPORT).getLvl() == Integer.valueOf(val))
+										if (getCastle().getFunction(Castle.FUNC_SUPPORT).getLvl() == Integer.parseInt(val))
 										{
 											html.setFile("data/html/chamberlain/functions-used.htm");
 											html.replace("%val%", "Stage "
@@ -1095,7 +1095,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 											return;
 										}
 									}
-									int lvl = Integer.valueOf(val);
+									int lvl = Integer.parseInt(val);
 									switch (lvl)
 									{
 										case 0:

+ 24 - 24
L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2ClanHallManagerInstance.java

@@ -278,7 +278,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                             	NpcHtmlMessage html = new NpcHtmlMessage(1);
                             	html.setFile("data/html/clanHallManager/functions-apply.htm");
                             	html.replace("%name%", "Fireplace (HP Recovery Device)");
-                            	int percent = Integer.valueOf(val);
+                            	int percent = Integer.parseInt(val);
                             	int cost;
                             	switch (percent)
                             	{
@@ -335,7 +335,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                             	NpcHtmlMessage html = new NpcHtmlMessage(1);
                             	html.setFile("data/html/clanHallManager/functions-apply.htm");
                             	html.replace("%name%", "Carpet (MP Recovery)");
-                            	int percent = Integer.valueOf(val);
+                            	int percent = Integer.parseInt(val);
                             	int cost;
                             	switch (percent)
                             	{
@@ -367,7 +367,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                             	NpcHtmlMessage html = new NpcHtmlMessage(1);
                             	html.setFile("data/html/clanHallManager/functions-apply.htm");
                             	html.replace("%name%", "Chandelier (EXP Recovery Device)");
-                            	int percent = Integer.valueOf(val);
+                            	int percent = Integer.parseInt(val);
                             	int cost;
                             	switch (percent)
                             	{
@@ -410,7 +410,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                                     html.setFile("data/html/clanHallManager/functions-apply_confirmed.htm");
                                     if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP) != null)
                                     {
-                                    	if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() == Integer.valueOf(val))
+                                    	if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_HP).getLvl() == Integer.parseInt(val))
                                     	{
                                     		html.setFile("data/html/clanHallManager/functions-used.htm");
                                     		html.replace("%val%", String.valueOf(val)+"%");
@@ -418,7 +418,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                                     		return;
                                     	}
                                     }
-                                    int percent = Integer.valueOf(val);
+                                    int percent = Integer.parseInt(val);
                                     switch (percent)
                                     {
                                 		case 0:
@@ -487,7 +487,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                         			html.setFile("data/html/clanHallManager/functions-apply_confirmed.htm");
                                     if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP) != null)
                                     {
-                                    	if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() == Integer.valueOf(val))
+                                    	if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_MP).getLvl() == Integer.parseInt(val))
                                     	{
                                     		html.setFile("data/html/clanHallManager/functions-used.htm");
                                     		html.replace("%val%", String.valueOf(val)+"%");
@@ -495,7 +495,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                                     		return;
                                     	}
                                     }
-                                    int percent = Integer.valueOf(val);
+                                    int percent = Integer.parseInt(val);
                                     switch (percent)
                                     {
                                 		case 0:
@@ -540,7 +540,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                         			html.setFile("data/html/clanHallManager/functions-apply_confirmed.htm");
                                     if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP) != null)
                                     {
-                                    	if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl() == Integer.valueOf(val))
+                                    	if (getClanHall().getFunction(ClanHall.FUNC_RESTORE_EXP).getLvl() == Integer.parseInt(val))
                                     	{
                                     		html.setFile("data/html/clanHallManager/functions-used.htm");
                                     		html.replace("%val%", String.valueOf(val)+"%");
@@ -548,7 +548,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                                     		return;
                                     	}
                                     }
-                                    int percent = Integer.valueOf(val);
+                                    int percent = Integer.parseInt(val);
                                     switch (percent)
                                     {
                                     	case 0:
@@ -771,7 +771,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                             	NpcHtmlMessage html = new NpcHtmlMessage(1);
                             	html.setFile("data/html/clanHallManager/functions-apply.htm");
                             	html.replace("%name%", "Magic Equipment (Item Production Facilities)");
-                            	int stage = Integer.valueOf(val);
+                            	int stage = Integer.parseInt(val);
                             	int cost;
                             	switch (stage)
                             	{
@@ -797,7 +797,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                             	NpcHtmlMessage html = new NpcHtmlMessage(1);
                             	html.setFile("data/html/clanHallManager/functions-apply.htm");
                             	html.replace("%name%", "Insignia (Supplementary Magic)");
-                            	int stage = Integer.valueOf(val);
+                            	int stage = Integer.parseInt(val);
                             	int cost;
                             	switch (stage)
                             	{
@@ -838,7 +838,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                             	NpcHtmlMessage html = new NpcHtmlMessage(1);
                             	html.setFile("data/html/clanHallManager/functions-apply.htm");
                             	html.replace("%name%", "Mirror (Teleportation Device)");
-                            	int stage = Integer.valueOf(val);
+                            	int stage = Integer.parseInt(val);
                             	int cost;
                             	switch (stage)
                             	{
@@ -869,7 +869,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                                     html.setFile("data/html/clanHallManager/functions-apply_confirmed.htm");
                                     if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE) != null)
                                     {
-                                    	if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() == Integer.valueOf(val))
+                                    	if (getClanHall().getFunction(ClanHall.FUNC_ITEM_CREATE).getLvl() == Integer.parseInt(val))
                                     	{
                                     		html.setFile("data/html/clanHallManager/functions-used.htm");
                                     		html.replace("%val%","Stage " +String.valueOf(val));
@@ -878,7 +878,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                                     	}
                                     }
                                     int fee;
-                                    int lvl = Integer.valueOf(val);
+                                    int lvl = Integer.parseInt(val);
                                     switch (lvl)
                                     {
                                 		case 0:
@@ -917,7 +917,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                                     html.setFile("data/html/clanHallManager/functions-apply_confirmed.htm");
                                     if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT) != null)
                                     {
-                                    	if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() == Integer.valueOf(val))
+                                    	if (getClanHall().getFunction(ClanHall.FUNC_TELEPORT).getLvl() == Integer.parseInt(val))
                                     	{
                                     		html.setFile("data/html/clanHallManager/functions-used.htm");
                                     		html.replace("%val%","Stage " +String.valueOf(val));
@@ -925,7 +925,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                                     		return;
                                     	}
                                     }
-                                    int lvl = Integer.valueOf(val);
+                                    int lvl = Integer.parseInt(val);
                                     switch (lvl)
                                     {
                                 		case 0:
@@ -961,7 +961,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                                     html.setFile("data/html/clanHallManager/functions-apply_confirmed.htm");
                                     if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT) != null)
                                     {
-                                    	if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() == Integer.valueOf(val))
+                                    	if (getClanHall().getFunction(ClanHall.FUNC_SUPPORT).getLvl() == Integer.parseInt(val))
                                     	{
                                     		html.setFile("data/html/clanHallManager/functions-used.htm");
                                     		html.replace("%val%","Stage " +String.valueOf(val));
@@ -969,7 +969,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                                     		return;
                                     	}
                                     }
-                                    int lvl = Integer.valueOf(val);
+                                    int lvl = Integer.parseInt(val);
                                     switch (lvl)
                                     {
                                 		case 0:
@@ -1111,7 +1111,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                             	NpcHtmlMessage html = new NpcHtmlMessage(1);
                             	html.setFile("data/html/clanHallManager/functions-apply.htm");
                             	html.replace("%name%", "Curtains (Decoration)");
-                            	int stage = Integer.valueOf(val);
+                            	int stage = Integer.parseInt(val);
                             	int cost;
                             	switch (stage)
                             	{
@@ -1134,7 +1134,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                             	NpcHtmlMessage html = new NpcHtmlMessage(1);
                             	html.setFile("data/html/clanHallManager/functions-apply.htm");
                             	html.replace("%name%", "Front Platform (Decoration)");
-                            	int stage = Integer.valueOf(val);
+                            	int stage = Integer.parseInt(val);
                             	int cost;
                             	switch (stage)
                             	{
@@ -1161,7 +1161,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                                     html.setFile("data/html/clanHallManager/functions-apply_confirmed.htm");
                                     if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS) != null)
                                     {
-                                    	if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl() == Integer.valueOf(val))
+                                    	if (getClanHall().getFunction(ClanHall.FUNC_DECO_CURTAINS).getLvl() == Integer.parseInt(val))
                                     	{
                                     		html.setFile("data/html/clanHallManager/functions-used.htm");
                                     		html.replace("%val%","Stage " +String.valueOf(val));
@@ -1169,7 +1169,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                                     		return;
                                     	}
                                     }
-	                                int lvl = Integer.valueOf(val);
+	                                int lvl = Integer.parseInt(val);
 	                                switch (lvl)
 	                                {
                                 		case 0:
@@ -1205,7 +1205,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                                     html.setFile("data/html/clanHallManager/functions-apply_confirmed.htm");
                                     if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM) != null)
                                     {
-                                    	if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl() == Integer.valueOf(val))
+                                    	if (getClanHall().getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM).getLvl() == Integer.parseInt(val))
                                     	{
                                     		html.setFile("data/html/clanHallManager/functions-used.htm");
                                     		html.replace("%val%","Stage " +String.valueOf(val));
@@ -1213,7 +1213,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
                                     		return;
                                     	}
                                     }
-	                                int lvl = Integer.valueOf(val);
+	                                int lvl = Integer.parseInt(val);
 	                                switch (lvl)
 	                                {
                                 		case 0:

+ 15 - 15
L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2FortManagerInstance.java

@@ -382,7 +382,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 								NpcHtmlMessage html = new NpcHtmlMessage(1);
 								html.setFile("data/html/fortress/functions-apply.htm");
 								html.replace("%name%", "(HP Recovery Device)");
-								int percent = Integer.valueOf(val);
+								int percent = Integer.parseInt(val);
 								int cost;
 								switch (percent)
 								{
@@ -412,7 +412,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 								NpcHtmlMessage html = new NpcHtmlMessage(1);
 								html.setFile("data/html/fortress/functions-apply.htm");
 								html.replace("%name%", "(MP Recovery)");
-								int percent = Integer.valueOf(val);
+								int percent = Integer.parseInt(val);
 								int cost;
 								switch (percent)
 								{
@@ -441,7 +441,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 								NpcHtmlMessage html = new NpcHtmlMessage(1);
 								html.setFile("data/html/fortress/functions-apply.htm");
 								html.replace("%name%", "(EXP Recovery Device)");
-								int percent = Integer.valueOf(val);
+								int percent = Integer.parseInt(val);
 								int cost;
 								switch (percent)
 								{
@@ -476,7 +476,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									html.setFile("data/html/fortress/functions-apply_confirmed.htm");
 									if (getFort().getFunction(Fort.FUNC_RESTORE_HP) != null)
 									{
-										if (getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl() == Integer.valueOf(val))
+										if (getFort().getFunction(Fort.FUNC_RESTORE_HP).getLvl() == Integer.parseInt(val))
 										{
 											html.setFile("data/html/fortress/functions-used.htm");
 											html.replace("%val%", String.valueOf(val)
@@ -485,7 +485,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 											return;
 										}
 									}
-									int percent = Integer.valueOf(val);
+									int percent = Integer.parseInt(val);
 									switch (percent)
 									{
 										case 0:
@@ -520,7 +520,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									html.setFile("data/html/fortress/functions-apply_confirmed.htm");
 									if (getFort().getFunction(Fort.FUNC_RESTORE_MP) != null)
 									{
-										if (getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl() == Integer.valueOf(val))
+										if (getFort().getFunction(Fort.FUNC_RESTORE_MP).getLvl() == Integer.parseInt(val))
 										{
 											html.setFile("data/html/fortress/functions-used.htm");
 											html.replace("%val%", String.valueOf(val)
@@ -529,7 +529,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 											return;
 										}
 									}
-									int percent = Integer.valueOf(val);
+									int percent = Integer.parseInt(val);
 									switch (percent)
 									{
 										case 0:
@@ -564,7 +564,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									html.setFile("data/html/fortress/functions-apply_confirmed.htm");
 									if (getFort().getFunction(Fort.FUNC_RESTORE_EXP) != null)
 									{
-										if (getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl() == Integer.valueOf(val))
+										if (getFort().getFunction(Fort.FUNC_RESTORE_EXP).getLvl() == Integer.parseInt(val))
 										{
 											html.setFile("data/html/fortress/functions-used.htm");
 											html.replace("%val%", String.valueOf(val)
@@ -573,7 +573,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 											return;
 										}
 									}
-									int percent = Integer.valueOf(val);
+									int percent = Integer.parseInt(val);
 									switch (percent)
 									{
 										case 0:
@@ -693,7 +693,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 								NpcHtmlMessage html = new NpcHtmlMessage(1);
 								html.setFile("data/html/fortress/functions-apply.htm");
 								html.replace("%name%", "Insignia (Supplementary Magic)");
-								int stage = Integer.valueOf(val);
+								int stage = Integer.parseInt(val);
 								int cost;
 								switch (stage)
 								{
@@ -721,7 +721,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 								NpcHtmlMessage html = new NpcHtmlMessage(1);
 								html.setFile("data/html/fortress/functions-apply.htm");
 								html.replace("%name%", "Mirror (Teleportation Device)");
-								int stage = Integer.valueOf(val);
+								int stage = Integer.parseInt(val);
 								int cost;
 								switch (stage)
 								{
@@ -756,7 +756,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									html.setFile("data/html/fortress/functions-apply_confirmed.htm");
 									if (getFort().getFunction(Fort.FUNC_TELEPORT) != null)
 									{
-										if (getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() == Integer.valueOf(val))
+										if (getFort().getFunction(Fort.FUNC_TELEPORT).getLvl() == Integer.parseInt(val))
 										{
 											html.setFile("data/html/fortress/functions-used.htm");
 											html.replace("%val%", "Stage "	+ String.valueOf(val));
@@ -764,7 +764,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 											return;
 										}
 									}
-									int lvl = Integer.valueOf(val);
+									int lvl = Integer.parseInt(val);
 									switch (lvl)
 									{
 										case 0:
@@ -799,7 +799,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 									html.setFile("data/html/fortress/functions-apply_confirmed.htm");
 									if (getFort().getFunction(Fort.FUNC_SUPPORT) != null)
 									{
-										if (getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() == Integer.valueOf(val))
+										if (getFort().getFunction(Fort.FUNC_SUPPORT).getLvl() == Integer.parseInt(val))
 										{
 											html.setFile("data/html/fortress/functions-used.htm");
 											html.replace("%val%", "Stage "
@@ -808,7 +808,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 											return;
 										}
 									}
-									int lvl = Integer.valueOf(val);
+									int lvl = Integer.parseInt(val);
 									switch (lvl)
 									{
 										case 0:

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/skills/conditions/ConditionTargetNpcId.java

@@ -35,7 +35,7 @@ public class ConditionTargetNpcId extends Condition {
 		boolean mt;
 		for (int i = 0; i < _npcIds.length;i++)
 		{
-			mt = (((env.target instanceof L2Attackable) && ((L2Attackable)env.target).getNpcId() == Integer.valueOf(_npcIds[i]))||((env.target instanceof L2Npc) && ((L2Npc)env.target).getNpcId() == Integer.valueOf(_npcIds[i])));
+			mt = (((env.target instanceof L2Attackable) && ((L2Attackable)env.target).getNpcId() == Integer.parseInt(_npcIds[i])) || ((env.target instanceof L2Npc) && ((L2Npc)env.target).getNpcId() == Integer.parseInt(_npcIds[i])));
 			if (mt)
 				return true;
 		}

+ 3 - 3
L2_GameServer/java/net/sf/l2j/gameserver/taskmanager/TaskManager.java

@@ -308,9 +308,9 @@ public final class TaskManager
 			Calendar min = Calendar.getInstance();
 			try
 			{
-				min.set(Calendar.HOUR_OF_DAY, Integer.valueOf(hour[0]));
-				min.set(Calendar.MINUTE, Integer.valueOf(hour[1]));
-				min.set(Calendar.SECOND, Integer.valueOf(hour[2]));
+				min.set(Calendar.HOUR_OF_DAY, Integer.parseInt(hour[0]));
+				min.set(Calendar.MINUTE, Integer.parseInt(hour[1]));
+				min.set(Calendar.SECOND, Integer.parseInt(hour[2]));
 			}
 			catch (Exception e)
 			{

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/taskmanager/tasks/TaskRestart.java

@@ -43,7 +43,7 @@ public final class TaskRestart extends Task
 	@Override
 	public void onTimeElapsed(ExecutedTask task)
 	{
-		Shutdown handler = new Shutdown(Integer.valueOf(task.getParams()[2]), true);
+		Shutdown handler = new Shutdown(Integer.parseInt(task.getParams()[2]), true);
 		handler.start();
 	}
 	

+ 1 - 1
L2_GameServer/java/net/sf/l2j/gameserver/taskmanager/tasks/TaskShutdown.java

@@ -43,7 +43,7 @@ public class TaskShutdown extends Task
 	@Override
 	public void onTimeElapsed(ExecutedTask task)
 	{
-		Shutdown handler = new Shutdown(Integer.valueOf(task.getParams()[2]), false);
+		Shutdown handler = new Shutdown(Integer.parseInt(task.getParams()[2]), false);
 		handler.start();
 	}