Disabling tutorial configuration enables class change alarm.
This commit is contained in:
@@ -456,13 +456,8 @@ public class Q11025_PathOfDestinyProving extends Quest
|
||||
|
||||
@RegisterEvent(EventType.ON_PLAYER_LOGIN)
|
||||
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
|
||||
public void OnPlayerLogin(OnPlayerLogin event)
|
||||
public void onPlayerLogin(OnPlayerLogin event)
|
||||
{
|
||||
if (Config.DISABLE_TUTORIAL)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
final PlayerInstance player = event.getPlayer();
|
||||
if (player == null)
|
||||
{
|
||||
@@ -482,7 +477,7 @@ public class Q11025_PathOfDestinyProving extends Quest
|
||||
}
|
||||
|
||||
final QuestState qs = getQuestState(player, false);
|
||||
if ((qs != null) && qs.isCompleted())
|
||||
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
|
||||
{
|
||||
player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
|
||||
}
|
||||
|
@@ -209,13 +209,8 @@ public class Q11026_PathOfDestinyConviction extends Quest
|
||||
|
||||
@RegisterEvent(EventType.ON_PLAYER_LOGIN)
|
||||
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
|
||||
public void OnPlayerLogin(OnPlayerLogin event)
|
||||
public void onPlayerLogin(OnPlayerLogin event)
|
||||
{
|
||||
if (Config.DISABLE_TUTORIAL)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
final PlayerInstance player = event.getPlayer();
|
||||
if (player == null)
|
||||
{
|
||||
@@ -235,7 +230,7 @@ public class Q11026_PathOfDestinyConviction extends Quest
|
||||
}
|
||||
|
||||
final QuestState qs = getQuestState(player, false);
|
||||
if ((qs != null) && qs.isCompleted())
|
||||
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
|
||||
{
|
||||
player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
|
||||
}
|
||||
|
@@ -338,13 +338,8 @@ public class Q11027_PathOfDestinyOvercome extends Quest
|
||||
|
||||
@RegisterEvent(EventType.ON_PLAYER_LOGIN)
|
||||
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
|
||||
public void OnPlayerLogin(OnPlayerLogin event)
|
||||
public void onPlayerLogin(OnPlayerLogin event)
|
||||
{
|
||||
if (Config.DISABLE_TUTORIAL)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
final PlayerInstance player = event.getPlayer();
|
||||
if (player == null)
|
||||
{
|
||||
@@ -364,7 +359,7 @@ public class Q11027_PathOfDestinyOvercome extends Quest
|
||||
}
|
||||
|
||||
final QuestState qs = getQuestState(player, false);
|
||||
if ((qs != null) && qs.isCompleted())
|
||||
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
|
||||
{
|
||||
player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
|
||||
}
|
||||
|
@@ -243,7 +243,7 @@ public class Q11031_TrainingBeginsNow extends Quest
|
||||
|
||||
@RegisterEvent(EventType.ON_PLAYER_LOGIN)
|
||||
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
|
||||
public void OnPlayerLogin(OnPlayerLogin event)
|
||||
public void onPlayerLogin(OnPlayerLogin event)
|
||||
{
|
||||
if (Config.DISABLE_TUTORIAL)
|
||||
{
|
||||
|
@@ -232,13 +232,8 @@ public class Q11032_CurseOfUndying extends Quest
|
||||
|
||||
@RegisterEvent(EventType.ON_PLAYER_LOGIN)
|
||||
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
|
||||
public void OnPlayerLogin(OnPlayerLogin event)
|
||||
public void onPlayerLogin(OnPlayerLogin event)
|
||||
{
|
||||
if (Config.DISABLE_TUTORIAL)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
final PlayerInstance player = event.getPlayer();
|
||||
if ((player == null) || !CategoryData.getInstance().isInCategory(CategoryType.FIRST_CLASS_GROUP, player.getClassId().getId()))
|
||||
{
|
||||
@@ -252,7 +247,7 @@ public class Q11032_CurseOfUndying extends Quest
|
||||
}
|
||||
|
||||
final QuestState qs = getQuestState(player, false);
|
||||
if ((qs != null) && qs.isCompleted())
|
||||
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
|
||||
{
|
||||
player.sendPacket(ExRequestClassChangeUi.STATIC_PACKET);
|
||||
}
|
||||
|
@@ -347,7 +347,7 @@ public abstract class ThirdClassTransferQuest extends Quest
|
||||
|
||||
@RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED)
|
||||
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
|
||||
public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
|
||||
public void onPlayerLevelChanged(OnPlayerLevelChanged event)
|
||||
{
|
||||
if (Config.DISABLE_TUTORIAL)
|
||||
{
|
||||
@@ -365,7 +365,7 @@ public abstract class ThirdClassTransferQuest extends Quest
|
||||
|
||||
@RegisterEvent(EventType.ON_PLAYER_LOGIN)
|
||||
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
|
||||
public void OnPlayerLogin(OnPlayerLogin event)
|
||||
public void onPlayerLogin(OnPlayerLogin event)
|
||||
{
|
||||
if (Config.DISABLE_TUTORIAL)
|
||||
{
|
||||
|
@@ -42,11 +42,6 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
|
||||
@Override
|
||||
public void run(GameClient client)
|
||||
{
|
||||
if (Config.DISABLE_TUTORIAL)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
final PlayerInstance player = client.getPlayer();
|
||||
if (player == null)
|
||||
{
|
||||
@@ -97,24 +92,44 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
|
||||
|
||||
private boolean firstClassCheck(PlayerInstance player)
|
||||
{
|
||||
if (Config.DISABLE_TUTORIAL)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
final QuestState qs = player.getQuestState("Q11032_CurseOfUndying");
|
||||
return (qs != null) && qs.isCompleted();
|
||||
}
|
||||
|
||||
private boolean secondClassCheck(PlayerInstance player)
|
||||
{
|
||||
if (Config.DISABLE_TUTORIAL)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
final QuestState qs = player.getQuestState("Q11025_PathOfDestinyProving");
|
||||
return (qs != null) && qs.isCompleted();
|
||||
}
|
||||
|
||||
private boolean thirdClassCheck(PlayerInstance player)
|
||||
{
|
||||
if (Config.DISABLE_TUTORIAL)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
final QuestState qs = player.getQuestState("Q11026_PathOfDestinyConviction");
|
||||
return (qs != null) && qs.isCompleted();
|
||||
}
|
||||
|
||||
private boolean fourthClassCheck(PlayerInstance player)
|
||||
{
|
||||
if (Config.DISABLE_TUTORIAL)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
final QuestState qs = player.getQuestState("Q11027_PathOfDestinyOvercome");
|
||||
return (qs != null) && qs.isCompleted();
|
||||
}
|
||||
|
Reference in New Issue
Block a user