Reverse order to handle Ertheias and proper category for awaken classes.

This commit is contained in:
MobiusDevelopment 2021-09-22 02:34:22 +00:00
parent f613b98386
commit 9093564d49
6 changed files with 63 additions and 63 deletions

View File

@ -58,16 +58,14 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
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;
}
@ -79,17 +77,19 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
return;
}
}
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
else if (player.isInCategory(CategoryType.SECOND_CLASS_GROUP))
{
if (!fourthClassCheck(player))
if (!secondClassCheck(player))
{
return;
}
}
else if (player.isInCategory(CategoryType.FIFTH_CLASS_GROUP))
else if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
{
// No more class changes.
return;
if (!firstClassCheck(player))
{
return;
}
}
player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);

View File

@ -58,16 +58,14 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
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;
}
@ -79,17 +77,19 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
return;
}
}
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
else if (player.isInCategory(CategoryType.SECOND_CLASS_GROUP))
{
if (!fourthClassCheck(player))
if (!secondClassCheck(player))
{
return;
}
}
else if (player.isInCategory(CategoryType.FIFTH_CLASS_GROUP))
else if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
{
// No more class changes.
return;
if (!firstClassCheck(player))
{
return;
}
}
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);

View File

@ -58,16 +58,14 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
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;
}
@ -79,17 +77,19 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
return;
}
}
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
else if (player.isInCategory(CategoryType.SECOND_CLASS_GROUP))
{
if (!fourthClassCheck(player))
if (!secondClassCheck(player))
{
return;
}
}
else if (player.isInCategory(CategoryType.FIFTH_CLASS_GROUP))
else if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
{
// No more class changes.
return;
if (!firstClassCheck(player))
{
return;
}
}
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);

View File

@ -58,9 +58,14 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
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;
}
@ -72,18 +77,13 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
return;
}
}
else if (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))
else if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
{
if (!thirdClassCheck(player))
if (!firstClassCheck(player))
{
return;
}
}
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
{
// No more class changes.
return;
}
player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
}

View File

@ -58,9 +58,14 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
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;
}
@ -72,18 +77,13 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
return;
}
}
else if (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))
else if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
{
if (!thirdClassCheck(player))
if (!firstClassCheck(player))
{
return;
}
}
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
{
// No more class changes.
return;
}
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

View File

@ -52,9 +52,14 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
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;
}
@ -66,18 +71,13 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
return;
}
}
else if (player.isInCategory(CategoryType.THIRD_CLASS_GROUP))
else if (player.isInCategory(CategoryType.FIRST_CLASS_GROUP))
{
if (!thirdClassCheck(player))
if (!firstClassCheck(player))
{
return;
}
}
else if (player.isInCategory(CategoryType.FOURTH_CLASS_GROUP))
{
// No more class changes.
return;
}
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}