Disabling tutorial configuration enables class change alarm.

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

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

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

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

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

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

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

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

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

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

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

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