From 53454558b213fa3db3b23da88ebb7f717389abbb Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 11 Oct 2019 23:15:34 +0000
Subject: [PATCH] Minor improvements for previous commit.

---
 .../classchange/ExRequestClassChange.java             | 11 +++++++----
 .../classchange/ExRequestClassChange.java             | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java
index a9d7ffb8ee..493ca358c5 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java
+++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java
@@ -52,22 +52,24 @@ public class ExRequestClassChange implements IClientIncomingPacket
 			return;
 		}
 		
-		boolean properId = false;
+		// Check if class id is valid.
+		boolean canChange = false;
 		for (ClassId cId : player.getClassId().getNextClassIds())
 		{
 			if (cId.getId() == _classId)
 			{
-				properId = true;
+				canChange = true;
 				break;
 			}
 		}
-		if (!properId)
+		if (!canChange)
 		{
 			LOGGER.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + ".");
 			return;
 		}
 		
-		boolean canChange = false;
+		// Check for player proper class group and level.
+		canChange = false;
 		final int playerLevel = player.getLevel();
 		if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP) && (playerLevel >= 18))
 		{
@@ -86,6 +88,7 @@ public class ExRequestClassChange implements IClientIncomingPacket
 			canChange = CategoryData.getInstance().isInCategory(CategoryType.SIXTH_CLASS_GROUP, _classId);
 		}
 		
+		// Change class.
 		if (canChange)
 		{
 			player.setClassId(_classId);
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java
index 8270d8f7d0..cf0c1fa837 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java
+++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java
@@ -49,22 +49,24 @@ public class ExRequestClassChange implements IClientIncomingPacket
 			return;
 		}
 		
-		boolean properId = false;
+		// Check if class id is valid.
+		boolean canChange = false;
 		for (ClassId cId : player.getClassId().getNextClassIds())
 		{
 			if (cId.getId() == _classId)
 			{
-				properId = true;
+				canChange = true;
 				break;
 			}
 		}
-		if (!properId)
+		if (!canChange)
 		{
 			LOGGER.warning(player + " tried to change class from " + player.getClassId() + " to " + ClassId.getClassId(_classId) + "!");
 			return;
 		}
 		
-		boolean canChange = false;
+		// Check for player proper class group and level.
+		canChange = false;
 		final int playerLevel = player.getLevel();
 		if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP) && (playerLevel >= 18))
 		{
@@ -79,6 +81,7 @@ public class ExRequestClassChange implements IClientIncomingPacket
 			canChange = CategoryData.getInstance().isInCategory(CategoryType.FOURTH_CLASS_GROUP, _classId);
 		}
 		
+		// Change class.
 		if (canChange)
 		{
 			player.setClassId(_classId);