Reverse order to handle Ertheias and proper category for awaken classes.
This commit is contained in:
@@ -58,16 +58,14 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
|
if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
if (!firstClassCheck(player))
|
return;
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if (player.isInCategory(CategoryType.SECOND_CLASS_GROUP))
|
|
||||||
|
if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
if (!secondClassCheck(player))
|
if (!fourthClassCheck(player))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -79,17 +77,19 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
|
else if (player.isInCategory(CategoryType.SECOND_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
if (!fourthClassCheck(player))
|
if (!secondClassCheck(player))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (player.isInCategory(CategoryType.FIFTH_CLASS_GROUP))
|
else if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
// No more class changes.
|
if (!firstClassCheck(player))
|
||||||
return;
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
|
player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
|
||||||
|
@@ -58,16 +58,14 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
|
if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
if (!firstClassCheck(player))
|
return;
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if (player.isInCategory(CategoryType.SECOND_CLASS_GROUP))
|
|
||||||
|
if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
if (!secondClassCheck(player))
|
if (!fourthClassCheck(player))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -79,17 +77,19 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
|
else if (player.isInCategory(CategoryType.SECOND_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
if (!fourthClassCheck(player))
|
if (!secondClassCheck(player))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (player.isInCategory(CategoryType.FIFTH_CLASS_GROUP))
|
else if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
// No more class changes.
|
if (!firstClassCheck(player))
|
||||||
return;
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
|
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
|
||||||
|
@@ -58,16 +58,14 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
|
if (player.isInCategory(CategoryType.SIXTH_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
if (!firstClassCheck(player))
|
return;
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else if (player.isInCategory(CategoryType.SECOND_CLASS_GROUP))
|
|
||||||
|
if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
if (!secondClassCheck(player))
|
if (!fourthClassCheck(player))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -79,17 +77,19 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
|
else if (player.isInCategory(CategoryType.SECOND_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
if (!fourthClassCheck(player))
|
if (!secondClassCheck(player))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (player.isInCategory(CategoryType.FIFTH_CLASS_GROUP))
|
else if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
// No more class changes.
|
if (!firstClassCheck(player))
|
||||||
return;
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
|
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
|
||||||
|
@@ -58,9 +58,14 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
|
if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
if (!firstClassCheck(player))
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))
|
||||||
|
{
|
||||||
|
if (!thirdClassCheck(player))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -72,18 +77,13 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))
|
else if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
if (!thirdClassCheck(player))
|
if (!firstClassCheck(player))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
|
|
||||||
{
|
|
||||||
// No more class changes.
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
|
player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
@@ -58,9 +58,14 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
|
if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
if (!firstClassCheck(player))
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))
|
||||||
|
{
|
||||||
|
if (!thirdClassCheck(player))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -72,18 +77,13 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))
|
else if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
if (!thirdClassCheck(player))
|
if (!firstClassCheck(player))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
|
|
||||||
{
|
|
||||||
// No more class changes.
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
|
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
@@ -52,9 +52,14 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
|
if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
if (!firstClassCheck(player))
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))
|
||||||
|
{
|
||||||
|
if (!thirdClassCheck(player))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -66,18 +71,13 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))
|
else if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
|
||||||
{
|
{
|
||||||
if (!thirdClassCheck(player))
|
if (!firstClassCheck(player))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
|
|
||||||
{
|
|
||||||
// No more class changes.
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
|
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user