lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disabling tutorial configuration enables class change alarm.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-11-04 22:19:42 +00:00
parent 552680c628
commit be1cac7e42
62 changed files with 232 additions and 449 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java vendored
View File

@ -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);
}

9
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java vendored
View File

@ -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);
}

9
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java vendored
View File

@ -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);
}

2
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11031_TrainingBeginsNow/Q11031_TrainingBeginsNow.java vendored
View File

@ -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)
{

9
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/Q11032_CurseOfUndying/Q11032_CurseOfUndying.java vendored
View File

@ -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);
}

4
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/quests/ThirdClassTransferQuest.java vendored
View File

@ -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)
{

25
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
View File

@ -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();
}

11
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java vendored
View File

@ -409,13 +409,8 @@ public class Q11024_PathOfDestinyBeginning 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)
{
@ -423,7 +418,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs == null) || (player.getLevel() < 20))
if (!Config.DISABLE_TUTORIAL && (qs == null) && (player.getLevel() < 20))
{
showOnScreenMsg(player, NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
return;
@ -434,7 +429,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
return;
}
if (qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java vendored
View File

@ -780,13 +780,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)
{
@ -799,7 +794,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(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java vendored
View File

@ -660,13 +660,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)
{
@ -679,7 +674,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(ExClassChangeSetAlarm.STATIC_PACKET);
}

18
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java vendored
View File

@ -327,13 +327,10 @@ public class Q11027_PathOfDestinyOvercome extends Quest
}
case "34505-10.html":
{
if (player.getLevel() >= LEVEL_85)
if ((player.getLevel() >= LEVEL_85) && qs.isCond(19))
{
if (qs.isCond(19))
{
qs.setCond(20, true);
htmltext = event;
}
qs.setCond(20, true);
htmltext = event;
}
break;
}
@ -865,13 +862,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)
{
@ -884,7 +876,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(ExClassChangeSetAlarm.STATIC_PACKET);
}

25
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
View File

@ -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("Q11024_PathOfDestinyBeginning");
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();
}

11
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java vendored
View File

@ -408,13 +408,8 @@ public class Q11024_PathOfDestinyBeginning 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)
{
@ -422,7 +417,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs == null) || (player.getLevel() < 20))
if (!Config.DISABLE_TUTORIAL && (qs == null) && (player.getLevel() < 20))
{
showOnScreenMsg(player, NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
return;
@ -433,7 +428,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
return;
}
if (qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java vendored
View File

@ -773,13 +773,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)
{
@ -792,7 +787,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(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java vendored
View File

@ -652,13 +652,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)
{
@ -671,7 +666,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(ExClassChangeSetAlarm.STATIC_PACKET);
}

18
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java vendored
View File

@ -325,13 +325,10 @@ public class Q11027_PathOfDestinyOvercome extends Quest
}
case "34505-10.html":
{
if (player.getLevel() >= LEVEL_85)
if ((player.getLevel() >= LEVEL_85) && qs.isCond(19))
{
if (qs.isCond(19))
{
qs.setCond(20, true);
htmltext = event;
}
qs.setCond(20, true);
htmltext = event;
}
break;
}
@ -857,13 +854,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)
{
@ -876,7 +868,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(ExClassChangeSetAlarm.STATIC_PACKET);
}

25
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
View File

@ -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("Q11024_PathOfDestinyBeginning");
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();
}

11
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11024_PathOfDestinyBeginning/Q11024_PathOfDestinyBeginning.java vendored
View File

@ -408,13 +408,8 @@ public class Q11024_PathOfDestinyBeginning 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)
{
@ -422,7 +417,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs == null) || (player.getLevel() < 20))
if (!Config.DISABLE_TUTORIAL && (qs == null) && (player.getLevel() < 20))
{
showOnScreenMsg(player, NpcStringId.TARTI_IS_WORRIED_ABOUT_S1, ExShowScreenMessage.TOP_CENTER, 10000, player.getName());
return;
@ -433,7 +428,7 @@ public class Q11024_PathOfDestinyBeginning extends Quest
return;
}
if (qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11025_PathOfDestinyProving/Q11025_PathOfDestinyProving.java vendored
View File

@ -773,13 +773,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)
{
@ -792,7 +787,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(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11026_PathOfDestinyConviction/Q11026_PathOfDestinyConviction.java vendored
View File

@ -652,13 +652,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)
{
@ -671,7 +666,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(ExClassChangeSetAlarm.STATIC_PACKET);
}

18
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q11027_PathOfDestinyOvercome/Q11027_PathOfDestinyOvercome.java vendored
View File

@ -325,13 +325,10 @@ public class Q11027_PathOfDestinyOvercome extends Quest
}
case "34505-10.html":
{
if (player.getLevel() >= LEVEL_85)
if ((player.getLevel() >= LEVEL_85) && qs.isCond(19))
{
if (qs.isCond(19))
{
qs.setCond(20, true);
htmltext = event;
}
qs.setCond(20, true);
htmltext = event;
}
break;
}
@ -857,13 +854,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)
{
@ -876,7 +868,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(ExClassChangeSetAlarm.STATIC_PACKET);
}

25
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
View File

@ -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("Q11024_PathOfDestinyBeginning");
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();
}

15
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/ai/others/SecondClassChange.java vendored
View File

@ -16,7 +16,6 @@
*/
package ai.others;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.CategoryData;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -40,13 +39,8 @@ public class SecondClassChange extends AbstractNpcAI
@RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED)
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
public void onPlayerLevelChanged(OnPlayerLevelChanged event)
{
if (Config.DISABLE_TUTORIAL)
{
return;
}
final PlayerInstance player = event.getPlayer();
if (player == null)
{
@ -63,13 +57,8 @@ public class SecondClassChange extends AbstractNpcAI
@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)
{

9
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java vendored
View File

@ -256,13 +256,8 @@ public class Q10673_SagaOfLegend 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)
{
@ -275,7 +270,7 @@ public class Q10673_SagaOfLegend 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);
}

9
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java vendored
View File

@ -295,13 +295,8 @@ public class Q10962_NewHorizons 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)
{
@ -314,7 +309,7 @@ public class Q10962_NewHorizons 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);
}

9
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java vendored
View File

@ -294,13 +294,8 @@ public class Q10982_SpiderHunt 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)
{
@ -313,7 +308,7 @@ public class Q10982_SpiderHunt 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);
}

9
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java vendored
View File

@ -273,13 +273,8 @@ public class Q10984_CollectSpiderweb 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)
{
@ -292,7 +287,7 @@ public class Q10984_CollectSpiderweb 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);
}

9
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java vendored
View File

@ -295,13 +295,8 @@ public class Q10986_SwampMonster 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)
{
@ -314,7 +309,7 @@ public class Q10986_SwampMonster 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);
}

9
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java vendored
View File

@ -295,13 +295,8 @@ public class Q10988_Conspiracy 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)
{
@ -314,7 +309,7 @@ public class Q10988_Conspiracy 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);
}

9
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java vendored
View File

@ -293,13 +293,8 @@ public class Q10990_PoisonExtraction 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)
{
@ -312,7 +307,7 @@ public class Q10990_PoisonExtraction 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);
}

15
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
View File

@ -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)
{
@ -90,6 +85,11 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
private boolean firstClassCheck(PlayerInstance player)
{
if (Config.DISABLE_TUTORIAL)
{
return true;
}
QuestState qs = null;
switch (player.getRace())
{
@ -135,6 +135,11 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
private boolean thirdClassCheck(PlayerInstance player)
{
if (Config.DISABLE_TUTORIAL)
{
return true;
}
final QuestState qs = player.getQuestState("Q10673_SagaOfLegend");
return (qs != null) && qs.isCompleted();
}

15
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/ai/others/SecondClassChange.java vendored
View File

@ -16,7 +16,6 @@
*/
package ai.others;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.CategoryData;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -40,13 +39,8 @@ public class SecondClassChange extends AbstractNpcAI
@RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED)
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
public void onPlayerLevelChanged(OnPlayerLevelChanged event)
{
if (Config.DISABLE_TUTORIAL)
{
return;
}
final PlayerInstance player = event.getPlayer();
if (player == null)
{
@ -63,13 +57,8 @@ public class SecondClassChange extends AbstractNpcAI
@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)
{

9
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java vendored
View File

@ -260,13 +260,8 @@ public class Q10673_SagaOfLegend 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)
{
@ -279,7 +274,7 @@ public class Q10673_SagaOfLegend extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java vendored
View File

@ -204,13 +204,8 @@ public class Q10959_ChallengingYourDestiny 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)
{
@ -229,7 +224,7 @@ public class Q10959_ChallengingYourDestiny extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java vendored
View File

@ -217,13 +217,8 @@ public class Q10962_NewHorizons 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)
{
@ -242,7 +237,7 @@ public class Q10962_NewHorizons extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java vendored
View File

@ -215,13 +215,8 @@ public class Q10982_SpiderHunt 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)
{
@ -234,7 +229,7 @@ public class Q10982_SpiderHunt extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java vendored
View File

@ -194,13 +194,8 @@ public class Q10984_CollectSpiderweb 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)
{
@ -213,7 +208,7 @@ public class Q10984_CollectSpiderweb extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java vendored
View File

@ -216,13 +216,8 @@ public class Q10986_SwampMonster 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 Q10986_SwampMonster extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java vendored
View File

@ -216,13 +216,8 @@ public class Q10988_Conspiracy 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 Q10988_Conspiracy extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java vendored
View File

@ -182,13 +182,8 @@ public class Q10990_PoisonExtraction 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)
{
@ -201,7 +196,7 @@ public class Q10990_PoisonExtraction extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

15
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
View File

@ -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)
{
@ -90,6 +85,11 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
private boolean firstClassCheck(PlayerInstance player)
{
if (Config.DISABLE_TUTORIAL)
{
return true;
}
QuestState qs = null;
if (player.isDeathKnight())
{
@ -142,6 +142,11 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
private boolean thirdClassCheck(PlayerInstance player)
{
if (Config.DISABLE_TUTORIAL)
{
return true;
}
final QuestState qs = player.getQuestState("Q10673_SagaOfLegend");
return (qs != null) && qs.isCompleted();
}

15
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/ai/others/SecondClassChange.java vendored
View File

@ -16,7 +16,6 @@
*/
package ai.others;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.CategoryData;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -40,13 +39,8 @@ public class SecondClassChange extends AbstractNpcAI
@RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED)
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
public void onPlayerLevelChanged(OnPlayerLevelChanged event)
{
if (Config.DISABLE_TUTORIAL)
{
return;
}
final PlayerInstance player = event.getPlayer();
if (player == null)
{
@ -63,13 +57,8 @@ public class SecondClassChange extends AbstractNpcAI
@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)
{

9
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java vendored
View File

@ -244,13 +244,8 @@ public class Q10673_SagaOfLegend 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)
{
@ -263,7 +258,7 @@ public class Q10673_SagaOfLegend extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java vendored
View File

@ -221,13 +221,8 @@ public class Q10956_WeSylphs 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)
{
@ -240,7 +235,7 @@ public class Q10956_WeSylphs extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java vendored
View File

@ -204,13 +204,8 @@ public class Q10959_ChallengingYourDestiny 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)
{
@ -229,7 +224,7 @@ public class Q10959_ChallengingYourDestiny extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java vendored
View File

@ -217,13 +217,8 @@ public class Q10962_NewHorizons 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)
{
@ -242,7 +237,7 @@ public class Q10962_NewHorizons extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java vendored
View File

@ -215,13 +215,8 @@ public class Q10982_SpiderHunt 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)
{
@ -234,7 +229,7 @@ public class Q10982_SpiderHunt extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java vendored
View File

@ -194,13 +194,8 @@ public class Q10984_CollectSpiderweb 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)
{
@ -213,7 +208,7 @@ public class Q10984_CollectSpiderweb extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java vendored
View File

@ -216,13 +216,8 @@ public class Q10986_SwampMonster 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 Q10986_SwampMonster extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java vendored
View File

@ -216,13 +216,8 @@ public class Q10988_Conspiracy 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 Q10988_Conspiracy extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java vendored
View File

@ -182,13 +182,8 @@ public class Q10990_PoisonExtraction 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)
{
@ -201,7 +196,7 @@ public class Q10990_PoisonExtraction extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

11
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChangeVerifying.java
View File

@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.network.clientpackets.classchange;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -84,6 +85,11 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
private boolean firstClassCheck(PlayerInstance player)
{
if (Config.DISABLE_TUTORIAL)
{
return true;
}
QuestState qs = null;
if (player.isDeathKnight())
{
@ -141,6 +147,11 @@ public class ExRequestClassChangeVerifying implements IClientIncomingPacket
private boolean thirdClassCheck(PlayerInstance player)
{
if (Config.DISABLE_TUTORIAL)
{
return true;
}
final QuestState qs = player.getQuestState("Q10673_SagaOfLegend");
return (qs != null) && qs.isCompleted();
}

15
L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/ai/others/SecondClassChange.java vendored
View File

@ -16,7 +16,6 @@
*/
package ai.others;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.CategoryData;
import org.l2jmobius.gameserver.enums.CategoryType;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@ -40,13 +39,8 @@ public class SecondClassChange extends AbstractNpcAI
@RegisterEvent(EventType.ON_PLAYER_LEVEL_CHANGED)
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
public void onPlayerLevelChanged(OnPlayerLevelChanged event)
{
if (Config.DISABLE_TUTORIAL)
{
return;
}
final PlayerInstance player = event.getPlayer();
if (player == null)
{
@ -63,13 +57,8 @@ public class SecondClassChange extends AbstractNpcAI
@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)
{

9
L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10673_SagaOfLegend/Q10673_SagaOfLegend.java vendored
View File

@ -244,13 +244,8 @@ public class Q10673_SagaOfLegend 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)
{
@ -263,7 +258,7 @@ public class Q10673_SagaOfLegend extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10956_WeSylphs/Q10956_WeSylphs.java vendored
View File

@ -221,13 +221,8 @@ public class Q10956_WeSylphs 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)
{
@ -240,7 +235,7 @@ public class Q10956_WeSylphs extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10959_ChallengingYourDestiny/Q10959_ChallengingYourDestiny.java vendored
View File

@ -204,13 +204,8 @@ public class Q10959_ChallengingYourDestiny 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)
{
@ -229,7 +224,7 @@ public class Q10959_ChallengingYourDestiny extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10962_NewHorizons/Q10962_NewHorizons.java vendored
View File

@ -217,13 +217,8 @@ public class Q10962_NewHorizons 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)
{
@ -242,7 +237,7 @@ public class Q10962_NewHorizons extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10982_SpiderHunt/Q10982_SpiderHunt.java vendored
View File

@ -215,13 +215,8 @@ public class Q10982_SpiderHunt 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)
{
@ -234,7 +229,7 @@ public class Q10982_SpiderHunt extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10984_CollectSpiderweb/Q10984_CollectSpiderweb.java vendored
View File

@ -194,13 +194,8 @@ public class Q10984_CollectSpiderweb 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)
{
@ -213,7 +208,7 @@ public class Q10984_CollectSpiderweb extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10986_SwampMonster/Q10986_SwampMonster.java vendored
View File

@ -216,13 +216,8 @@ public class Q10986_SwampMonster 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 Q10986_SwampMonster extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10988_Conspiracy/Q10988_Conspiracy.java vendored
View File

@ -216,13 +216,8 @@ public class Q10988_Conspiracy 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 Q10988_Conspiracy extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}

9
L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/quests/Q10990_PoisonExtraction/Q10990_PoisonExtraction.java vendored
View File

@ -182,13 +182,8 @@ public class Q10990_PoisonExtraction 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)
{
@ -201,7 +196,7 @@ public class Q10990_PoisonExtraction extends Quest
}
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCompleted())
if (Config.DISABLE_TUTORIAL || ((qs != null) && qs.isCompleted()))
{
player.sendPacket(ExClassChangeSetAlarm.STATIC_PACKET);
}