BETA: More client packets updates & cleanup.

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

@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestChangePetName extends L2GameClientPacket
 {
-	private static final String __C__93_REQUESTCHANGEPETNAME = "[C] 93 RequestChangePetName";
+	private static final String _C__93_REQUESTCHANGEPETNAME = "[C] 93 RequestChangePetName";
 	//private static Logger _log = Logger.getLogger(RequestChangePetName.class.getName());
 	
 	private String _name;
@@ -61,8 +61,8 @@ public final class RequestChangePetName extends L2GameClientPacket
 		}
 		else if ((_name.length() < 3) || (_name.length() > 16))
 		{
-			// SystemMessage sm = SystemMessage.getSystemMessage(SystemMessage.NAMING_PETNAME_UP_TO_8CHARS);
-			activeChar.sendMessage("Your pet's name can be up to 16 characters.");
+			//final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.NAMING_PETNAME_UP_TO_8CHARS);
+			activeChar.sendMessage("Your pet's name can be up to 16 characters in length.");
 			return;
 		}
 		else if (!PetNameTable.getInstance().isValidPetName(_name))
@@ -78,6 +78,6 @@ public final class RequestChangePetName extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return __C__93_REQUESTCHANGEPETNAME;
+		return _C__93_REQUESTCHANGEPETNAME;
 	}
 }

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

@@ -48,7 +48,7 @@ import com.l2jserver.util.Rnd;
 public final class RequestExEnchantSkill extends L2GameClientPacket
 {
 	private static final String _C__D0_0F_REQUESTEXENCHANTSKILL = "[C] D0:0F RequestExEnchantSkill";
-	private static final Logger _log = Logger.getLogger(RequestAcquireSkill.class.getName());
+	private static final Logger _log = Logger.getLogger(RequestExEnchantSkill.class.getName());
 	private static final Logger _logEnchant = Logger.getLogger("enchant");
 	
 	private int _skillId;
@@ -61,9 +61,6 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
 		_skillLvl = readD();
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
@@ -98,9 +95,6 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
 			return;
 		}
 		
-		final int costMultiplier = EnchantGroupsTable.NORMAL_ENCHANT_COST_MULTIPLIER;
-		final int reqItemId = EnchantGroupsTable.NORMAL_ENCHANT_BOOK;
-		
 		final L2EnchantSkillLearn s = EnchantGroupsTable.getInstance().getSkillEnchantmentBySkillId(_skillId);
 		if (s == null)
 		{
@@ -112,40 +106,35 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
 			return;
 		}
 		
+		final int costMultiplier = EnchantGroupsTable.NORMAL_ENCHANT_COST_MULTIPLIER;
 		final int requiredSp = esd.getSpCost() * costMultiplier;
-		final int requireditems = (esd.getAdenaCost() * costMultiplier);
-		final int rate = esd.getRate(player);
-		
 		if (player.getSp() >= requiredSp)
 		{
 			// only first lvl requires book
 			final boolean usesBook = _skillLvl % 100 == 1; // 101, 201, 301 ...
+			final int reqItemId = EnchantGroupsTable.NORMAL_ENCHANT_BOOK;
 			final L2ItemInstance spb = player.getInventory().getItemByItemId(reqItemId);
 			
-			if (Config.ES_SP_BOOK_NEEDED && usesBook)
+			if (Config.ES_SP_BOOK_NEEDED && usesBook && (spb == null)) // Haven't spellbook
 			{
-				if (spb == null)// Haven't spellbook
-				{
-					player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL));
-					return;
-				}
+				player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL));
+				return;
 			}
 			
-			if (player.getInventory().getAdena() < requireditems)
+			final int requiredAdena = (esd.getAdenaCost() * costMultiplier);
+			if (player.getInventory().getAdena() < requiredAdena)
 			{
 				player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL));
 				return;
 			}
 			
-			boolean check;
-			check = player.getStat().removeExpAndSp(0, requiredSp, false);
+			boolean check = player.getStat().removeExpAndSp(0, requiredSp, false);
 			if (Config.ES_SP_BOOK_NEEDED && usesBook)
 			{
 				check &= player.destroyItem("Consume", spb.getObjectId(), 1, player, true);
 			}
 			
-			check &= player.destroyItemByItemId("Consume", 57, requireditems, player, true);
-			
+			check &= player.destroyItemByItemId("Consume", 57, requiredAdena, player, true);
 			if (!check)
 			{
 				player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_DONT_HAVE_ALL_OF_THE_ITEMS_NEEDED_TO_ENCHANT_THAT_SKILL));
@@ -153,62 +142,54 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
 			}
 			
 			// ok. Destroy ONE copy of the book
+			final int rate = esd.getRate(player);
 			if (Rnd.get(100) <= rate)
 			{
 				if (Config.LOG_SKILL_ENCHANTS)
 				{
-					LogRecord record = new LogRecord(Level.INFO, "Success");
-					record.setParameters(new Object[]
-					                                {
-							player, skill, spb, rate
-					                                });
+					final LogRecord record = new LogRecord(Level.INFO, "Success");
+					record.setParameters(new Object[] { player, skill, spb, rate });
 					record.setLoggerName("skill");
 					_logEnchant.log(record);
 				}
 				
 				player.addSkill(skill, true);
-				
-				if (Config.DEBUG)
-				{
-					_log.fine("Learned skill ID: " + _skillId + " Level: " + _skillLvl + " for " + requiredSp + " SP, " + requireditems + " Adena.");
-				}
-				
 				player.sendPacket(ExEnchantSkillResult.valueOf(true));
 				
-				SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SUCCEEDED_IN_ENCHANTING_THE_SKILL_S1);
+				final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_SUCCEEDED_IN_ENCHANTING_THE_SKILL_S1);
 				sm.addSkillName(_skillId);
 				player.sendPacket(sm);
 				
+				if (Config.DEBUG)
+				{
+					_log.fine("Learned skill ID: " + _skillId + " Level: " + _skillLvl + " for " + requiredSp + " SP, " + requiredAdena + " Adena.");
+				}
 			}
 			else
 			{
 				player.addSkill(SkillTable.getInstance().getInfo(_skillId, s.getBaseLevel()), true);
 				player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_HAVE_FAILED_TO_ENCHANT_THE_SKILL_S1));
+				player.sendPacket(ExEnchantSkillResult.valueOf(false));
 				
 				if (Config.LOG_SKILL_ENCHANTS)
 				{
-					LogRecord record = new LogRecord(Level.INFO, "Fail");
-					record.setParameters(new Object[]
-					                                {
-							player, skill, spb, rate
-					                                });
+					final LogRecord record = new LogRecord(Level.INFO, "Fail");
+					record.setParameters(new Object[] { player, skill, spb, rate });
 					record.setLoggerName("skill");
 					_logEnchant.log(record);
 				}
-				player.sendPacket(ExEnchantSkillResult.valueOf(false));
 			}
+			
 			player.sendPacket(new UserInfo(player));
 			player.sendPacket(new ExBrExtraUserInfo(player));
 			player.sendSkillList();
 			player.sendPacket(new ExEnchantSkillInfo(_skillId, player.getSkillLevel(_skillId)));
 			player.sendPacket(new ExEnchantSkillInfoDetail(0, _skillId, player.getSkillLevel(_skillId)+1, player));
-			
-			this.updateSkillShortcuts(player);
+			updateSkillShortcuts(player);
 		}
 		else
 		{
-			SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOU_DONT_HAVE_ENOUGH_SP_TO_ENCHANT_THAT_SKILL);
-			player.sendPacket(sm);
+			player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_DONT_HAVE_ENOUGH_SP_TO_ENCHANT_THAT_SKILL));
 		}
 	}
 	
@@ -228,9 +209,6 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
 		}
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.util.Util;
  */
 public final class RequestGetItemFromPet extends L2GameClientPacket
 {
-	private static final String __C__2C_REQUESTGETITEMFROMPET = "[C] 2C RequestGetItemFromPet";
+	private static final String _C__2C_REQUESTGETITEMFROMPET = "[C] 2C RequestGetItemFromPet";
 	private static Logger _log = Logger.getLogger(RequestGetItemFromPet.class.getName());
 	
 	private int _objectId;
@@ -77,6 +77,6 @@ public final class RequestGetItemFromPet extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return __C__2C_REQUESTGETITEMFROMPET;
+		return _C__2C_REQUESTGETITEMFROMPET;
 	}
 }

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

@@ -24,7 +24,7 @@ import com.l2jserver.gameserver.network.serverpackets.StopMoveInVehicle;
  */
 public final class RequestGetOffVehicle extends L2GameClientPacket
 {
-	private static final String __C__54_GETOFFVEHICLE = "[S] 54 GetOffVehicle";
+	private static final String _C__54_GETOFFVEHICLE = "[S] 54 GetOffVehicle";
 	
 	private int _boatId, _x, _y, _z;
 	
@@ -64,6 +64,6 @@ public final class RequestGetOffVehicle extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return __C__54_GETOFFVEHICLE;
+		return _C__54_GETOFFVEHICLE;
 	}
 }

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

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  */
 public final class RequestGiveItemToPet extends L2GameClientPacket
 {
-	private static final String __C__95_REQUESTCIVEITEMTOPET = "[C] 95 RequestGiveItemToPet";
+	private static final String _C__95_REQUESTCIVEITEMTOPET = "[C] 95 RequestGiveItemToPet";
 	
 	private static Logger _log = Logger.getLogger(RequestGetItemFromPet.class.getName());
 	
@@ -72,8 +72,7 @@ public final class RequestGiveItemToPet extends L2GameClientPacket
 		
 		// Exploit Fix for Hero weapons Uses pet Inventory to buy New One.
 		// [L2JOneo]
-		L2ItemInstance item = player.getInventory().getItemByObjectId(_objectId);
-		
+		final L2ItemInstance item = player.getInventory().getItemByObjectId(_objectId);
 		if (item == null)
 			return;
 		
@@ -92,7 +91,7 @@ public final class RequestGiveItemToPet extends L2GameClientPacket
 			return;
 		}
 		
-		L2PetInstance pet = (L2PetInstance) player.getPet();
+		final L2PetInstance pet = (L2PetInstance) player.getPet();
 		if (pet.isDead())
 		{
 			sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_GIVE_ITEMS_TO_DEAD_PET));
@@ -123,6 +122,6 @@ public final class RequestGiveItemToPet extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return __C__95_REQUESTCIVEITEMTOPET;
+		return _C__95_REQUESTCIVEITEMTOPET;
 	}
 }

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

@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 public final class RequestLinkHtml extends L2GameClientPacket
 {
 	private static Logger _log = Logger.getLogger(RequestLinkHtml.class.getName());
-	private static final String __C__22_REQUESTLINKHTML = "[C] 22 RequestLinkHtml";
+	private static final String _C__22_REQUESTLINKHTML = "[C] 22 RequestLinkHtml";
 	private String _link;
 	
 	@Override
@@ -67,6 +67,6 @@ public final class RequestLinkHtml extends L2GameClientPacket
 	@Override
 	public String getType()
 	{
-		return __C__22_REQUESTLINKHTML;
+		return _C__22_REQUESTLINKHTML;
 	}
 }