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

Some extra checks for disabled tutorials.

Browse Source
This commit is contained in:
MobiusDev 2016-12-22 20:46:08 +00:00
parent 6dfa3603b3
commit cddb566c34
4 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
L2J_Mobius_Underground/dist/game/data/scripts/instances/MemoryOfDisaster/MemoryOfDisaster.java vendored
View File

@ -19,6 +19,7 @@ package instances.MemoryOfDisaster;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.l2jmobius.Config;
import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.commons.util.CommonUtil;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.ai.CtrlIntention;
@ -1022,6 +1023,11 @@ public final class MemoryOfDisaster extends AbstractInstance
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
public void OnPlayerLogin(OnPlayerLogin event) public void OnPlayerLogin(OnPlayerLogin event)
{ {
if (Config.DISABLE_TUTORIAL)
{
return;
}
final L2PcInstance player = event.getActiveChar(); final L2PcInstance player = event.getActiveChar();
if ((player.getLevel() > 84) && player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) && !player.isSubClassActive() && (player.getClassId() != ClassId.JUDICATOR)) if ((player.getLevel() > 84) && player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) && !player.isSubClassActive() && (player.getClassId() != ClassId.JUDICATOR))
{ {
@ -1037,6 +1043,11 @@ public final class MemoryOfDisaster extends AbstractInstance
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
public void OnPlayerLevelChanged(OnPlayerLevelChanged event) public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
{ {
if (Config.DISABLE_TUTORIAL)
{
return;
}
final L2PcInstance player = event.getActiveChar(); final L2PcInstance player = event.getActiveChar();
if ((player.getLevel() > 84) && player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) && !player.isSubClassActive() && (player.getClassId() != ClassId.JUDICATOR)) if ((player.getLevel() > 84) && player.isInCategory(CategoryType.FOURTH_CLASS_GROUP) && !player.isSubClassActive() && (player.getClassId() != ClassId.JUDICATOR))
{ {

11
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10301_ShadowOfTerrorBlackishRedFog/Q10301_ShadowOfTerrorBlackishRedFog.java vendored
View File

@ -16,6 +16,7 @@
*/ */
package quests.Q10301_ShadowOfTerrorBlackishRedFog; package quests.Q10301_ShadowOfTerrorBlackishRedFog;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound; import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2Object;
import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Npc;
@ -241,6 +242,11 @@ public final class Q10301_ShadowOfTerrorBlackishRedFog extends Quest
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
public void OnPlayerLevelChanged(OnPlayerLevelChanged event) public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
{ {
if (Config.DISABLE_TUTORIAL)
{
return;
}
final L2PcInstance player = event.getActiveChar(); final L2PcInstance player = event.getActiveChar();
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
@ -255,6 +261,11 @@ public final class Q10301_ShadowOfTerrorBlackishRedFog extends Quest
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
public void OnPlayerLogin(OnPlayerLogin event) public void OnPlayerLogin(OnPlayerLogin event)
{ {
if (Config.DISABLE_TUTORIAL)
{
return;
}
final L2PcInstance player = event.getActiveChar(); final L2PcInstance player = event.getActiveChar();
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);

11
L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java vendored
View File

@ -19,6 +19,7 @@ package quests.Q10753_WindsOfFateChoices;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.GeoData;
import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.CategoryType;
import com.l2jmobius.gameserver.enums.HtmlActionScope; import com.l2jmobius.gameserver.enums.HtmlActionScope;
@ -757,6 +758,11 @@ public final class Q10753_WindsOfFateChoices extends Quest
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
public void OnPlayerLevelChanged(OnPlayerLevelChanged event) public void OnPlayerLevelChanged(OnPlayerLevelChanged event)
{ {
if (Config.DISABLE_TUTORIAL)
{
return;
}
final L2PcInstance player = event.getActiveChar(); final L2PcInstance player = event.getActiveChar();
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);
final int oldLevel = event.getOldLevel(); final int oldLevel = event.getOldLevel();
@ -781,6 +787,11 @@ public final class Q10753_WindsOfFateChoices extends Quest
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
public void OnPlayerLogin(OnPlayerLogin event) public void OnPlayerLogin(OnPlayerLogin event)
{ {
if (Config.DISABLE_TUTORIAL)
{
return;
}
final L2PcInstance player = event.getActiveChar(); final L2PcInstance player = event.getActiveChar();
final QuestState qs = getQuestState(player, false); final QuestState qs = getQuestState(player, false);

6
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/instancemanager/CeremonyOfChaosManager.java
View File

@ -23,6 +23,7 @@ import java.util.List;
import java.util.logging.Logger; import java.util.logging.Logger;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.l2jmobius.Config;
import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.database.DatabaseFactory;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.CategoryType;
@ -395,6 +396,11 @@ public class CeremonyOfChaosManager extends AbstractEventManager<CeremonyOfChaos
@RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS)
private void OnPlayerLogin(OnPlayerLogin event) private void OnPlayerLogin(OnPlayerLogin event)
{ {
if (Config.DISABLE_TUTORIAL)
{
return;
}
if (getState() == CeremonyOfChaosState.REGISTRATION) if (getState() == CeremonyOfChaosState.REGISTRATION)
{ {
final L2PcInstance player = event.getActiveChar(); final L2PcInstance player = event.getActiveChar();