Removed null check after getQuestState initialized.

This commit is contained in:
MobiusDev
2017-08-31 01:14:56 +00:00
parent 224f9331f7
commit 86f4f257bd
938 changed files with 3353 additions and 6561 deletions

View File

@@ -82,10 +82,6 @@ public class Q00013_ParcelDelivery extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
}
final int npcId = npc.getId();
switch (st.getState())

View File

@@ -80,10 +80,6 @@ public class Q00015_SweetWhispers extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
}
final int npcId = npc.getId();
switch (st.getState())

View File

@@ -150,10 +150,6 @@ public final class Q00017_LightAndDarkness extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -95,10 +95,6 @@ public class Q00020_BringUpWithLove extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -118,10 +118,6 @@ public final class Q00026_TiredOfWaiting extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -182,10 +182,6 @@ public final class Q00032_AnObviousLie extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -124,10 +124,6 @@ public class Q00033_MakeAPairOfDressShoes extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -153,10 +153,6 @@ public class Q00034_InSearchOfCloth extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -137,10 +137,6 @@ public class Q00035_FindGlitteringJewelry extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -127,10 +127,6 @@ public class Q00036_MakeASewingKit extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -145,10 +145,7 @@ public class Q00037_MakeFormalWear extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{
case ALEXIS:

View File

@@ -148,10 +148,6 @@ public final class Q00042_HelpTheUncle extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -151,10 +151,6 @@ public final class Q00043_HelpTheSister extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -145,10 +145,6 @@ public final class Q00044_HelpTheSon extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -87,10 +87,6 @@ public class Q00109_InSearchOfTheNest extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -76,10 +76,6 @@ public class Q00110_ToThePrimevalIsle extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -241,10 +241,6 @@ public final class Q00111_ElrokianHuntersProof extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -92,11 +92,6 @@ public class Q00113_StatusOfTheBeaconTower extends Quest
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{
case MOIRA:

View File

@@ -420,15 +420,9 @@ public class Q00114_ResurrectionOfAnOldManager extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return getNoQuestMsg(player);
}
final int talk = qs.getInt("talk");
String htmltext = getNoQuestMsg(player);
switch (npc.getId())
{

View File

@@ -387,10 +387,6 @@ public class Q00115_TheOtherSideOfTruth extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -102,10 +102,6 @@ public class Q00119_LastImperialPrince extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -70,10 +70,6 @@ public class Q00121_PavelTheGiant extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -74,10 +74,6 @@ public final class Q00122_OminousNews extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -111,10 +111,6 @@ public class Q00124_MeetingTheElroki extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -279,10 +279,6 @@ public class Q00125_TheNameOfEvil1 extends Quest
{
String htmltext = getNoQuestMsg(player);
QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -336,10 +336,6 @@ public class Q00126_TheNameOfEvil2 extends Quest
{
String htmltext = getNoQuestMsg(player);
QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -190,10 +190,6 @@ public final class Q00128_PailakaSongOfIceAndFire extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -132,10 +132,6 @@ public final class Q00129_PailakaDevilsLegacy extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return getNoQuestMsg(player);
}
switch (npc.getId())
{

View File

@@ -173,10 +173,6 @@ public class Q00134_TempleMissionary extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -164,10 +164,6 @@ public class Q00135_TempleExecutor extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -189,10 +189,6 @@ public class Q00136_MoreThanMeetsTheEye extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -129,10 +129,7 @@ public class Q00137_TempleChampionPart1 extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
if (qs.isCompleted())
{
return getAlreadyCompletedMsg(player);

View File

@@ -156,10 +156,7 @@ public class Q00138_TempleChampionPart2 extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{
case SYLVAIN:

View File

@@ -159,10 +159,6 @@ public class Q00139_ShadowFoxPart1 extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -169,10 +169,6 @@ public class Q00140_ShadowFoxPart2 extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -142,10 +142,6 @@ public class Q00141_ShadowFoxPart3 extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
}
switch (st.getState())
{

View File

@@ -193,10 +193,6 @@ public class Q00142_FallenAngelRequestOfDawn extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -169,10 +169,6 @@ public class Q00143_FallenAngelRequestOfDusk extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -107,7 +107,7 @@ public class Q00144_PailakaInjuredDragon extends Quest
public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
final QuestState qs = getQuestState(player, false);
if (qs == null)
{
return htmltext;
@@ -241,12 +241,8 @@ public class Q00144_PailakaInjuredDragon extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance talker)
{
String htmltext = getNoQuestMsg(talker);
final QuestState qs = getQuestState(talker, true);
if (qs == null)
{
return htmltext;
}
String htmltext = getNoQuestMsg(talker);
switch (npc.getId())
{

View File

@@ -85,10 +85,6 @@ public class Q00146_TheZeroHour extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -102,16 +102,12 @@ public final class Q00149_PrimalMotherIstina extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
final int npcId = npc.getId();
switch (qs.getState())
{
case State.CREATED:
{
if (npcId == RUMIESE)
if (npc.getId() == RUMIESE)
{
htmltext = "33293-01.htm";
}

View File

@@ -92,16 +92,12 @@ public final class Q00150_ExtremeChallengePrimalMotherResurrected extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
final int npcId = npc.getId();
switch (qs.getState())
{
case State.CREATED:
{
if (npcId == RUMIESE)
if (npc.getId() == RUMIESE)
{
htmltext = "33293-01.htm";
}

View File

@@ -117,10 +117,6 @@ public class Q00210_ObtainAWolfPet extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -152,10 +152,6 @@ public class Q00237_WindsOfChange extends Quest
{
String htmltext = getNoQuestMsg(talker);
final QuestState st = getQuestState(talker, true);
if (st == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -138,10 +138,6 @@ public class Q00238_SuccessFailureOfBusiness extends Quest
{
String htmltext = getNoQuestMsg(talker);
final QuestState st = getQuestState(talker, true);
if (st == null)
{
return htmltext;
}
switch (st.getState())
{

View File

@@ -144,10 +144,6 @@ public class Q00239_WontYouJoinUs extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -107,10 +107,6 @@ public class Q00240_ImTheOnlyOneYouCanTrust extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -115,12 +115,9 @@ public class Q00245_ComeToMe extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
}
String htmltext = getNoQuestMsg(player);
if (npc.getId() == FERRIS)
{
switch (st.getState())

View File

@@ -104,10 +104,6 @@ public class Q00254_LegendaryTales extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
}
switch (st.getState())
{

View File

@@ -337,10 +337,6 @@ public class Q00270_TheOneWhoEndsSilence extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -172,10 +172,6 @@ public class Q00278_HomeSecurity extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
if (qs.isCreated())
{

View File

@@ -184,10 +184,6 @@ public class Q00307_ControlDeviceOfTheGiants extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -136,11 +136,6 @@ public class Q00310_OnlyWhatRemains extends Quest
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{
case State.CREATED:

View File

@@ -163,10 +163,7 @@ public final class Q00336_CoinsOfMagic extends Quest
{
final QuestState qs = getQuestState(player, true);
final String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{
case PANO:

View File

@@ -172,10 +172,6 @@ public class Q00337_AudienceWithTheLandDragon extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -219,10 +219,6 @@ public class Q00350_EnhanceYourWeapon extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
if (qs.getState() == State.CREATED)
{

View File

@@ -112,10 +112,6 @@ public class Q00376_ExplorationOfTheGiantsCavePart1 extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
if (qs.isCreated())
{

View File

@@ -123,10 +123,6 @@ public class Q00377_ExplorationOfTheGiantsCavePart2 extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
if (qs.isCreated())
{

View File

@@ -103,7 +103,8 @@ public final class Q00386_StolenDignity extends Quest
{
final QuestState qs = getQuestState(player, true);
final String htmltext = getNoQuestMsg(player);
if ((qs != null) && (npc.getId() == WAREHOUSE_KEEPER_ROMP))
if (npc.getId() == WAREHOUSE_KEEPER_ROMP)
{
if (qs.isCreated())
{

View File

@@ -106,11 +106,6 @@ public class Q00431_WeddingMarch extends Quest
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{
case State.CREATED:

View File

@@ -107,11 +107,6 @@ public final class Q00432_BirthdayPartySong extends Quest
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
}
switch (st.getState())
{
case State.CREATED:

View File

@@ -91,11 +91,6 @@ public class Q00450_GraveRobberRescue extends Quest
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
}
if (npc.getId() == KANEMIKA)
{
switch (st.getState())

View File

@@ -90,11 +90,6 @@ public final class Q00451_LuciensAltar extends Quest
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
}
final int npcId = npc.getId();
if (npcId == DAICHIR)
{

View File

@@ -92,10 +92,6 @@ public class Q00452_FindingtheLostSoldiers extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
if (npc.getId() == JAKAN)
{

View File

@@ -132,12 +132,8 @@ public class Q00455_WingsOfSand extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return getNoQuestMsg(player);
}
String htmltext = getNoQuestMsg(player);
switch (qs.getState())
{
case State.CREATED:

View File

@@ -186,11 +186,6 @@ public final class Q00456_DontKnowDontCare extends Quest
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
if (CommonUtil.contains(SEPARATED_SOUL, npc.getId()))
{
switch (qs.getState())

View File

@@ -206,10 +206,6 @@ public final class Q00457_LostAndFound extends Quest
{
String htmltext = getNoQuestMsg(player);
QuestState qs = getQuestState(player, true);
if (qs == null)
{
qs = newQuestState(player);
}
switch (qs.getState())
{

View File

@@ -288,10 +288,6 @@ public class Q00458_PerfectForm extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -201,10 +201,6 @@ public class Q00463_IMustBeaGenius extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
}
switch (st.getState())
{

View File

@@ -135,10 +135,7 @@ public class Q00466_PlacingMySmallPower extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{
case State.COMPLETED:

View File

@@ -110,11 +110,6 @@ public final class Q00490_DutyOfTheSurvivor extends Quest
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
}
if (npc.getId() == VOLLODOS)
{
switch (st.getState())

View File

@@ -102,13 +102,9 @@ public class Q00491_InNominePatris extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
if (npc.getId() == SIRIK)
{
switch (qs.getState())

View File

@@ -97,11 +97,6 @@ public final class Q00493_KickingOutUnwelcomeGuests extends Quest
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
}
if (npc.getId() == GEORGIO)
{
switch (st.getState())

View File

@@ -70,12 +70,8 @@ public class Q00494_IncarnationOfGreedZellakaGroup extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
String htmltext = getNoQuestMsg(player);
switch (qs.getState())
{

View File

@@ -70,12 +70,8 @@ public class Q00495_IncarnationOfJealousyPellineGroup extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
String htmltext = getNoQuestMsg(player);
switch (qs.getState())
{

View File

@@ -70,12 +70,8 @@ public class Q00496_IncarnationOfGluttonyKaliosGroup extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
String htmltext = getNoQuestMsg(player);
switch (qs.getState())
{

View File

@@ -70,12 +70,8 @@ public class Q00497_IncarnationOfGreedZellakaSolo extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
String htmltext = getNoQuestMsg(player);
switch (qs.getState())
{

View File

@@ -70,12 +70,8 @@ public class Q00498_IncarnationOfJealousyPellineSolo extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
String htmltext = getNoQuestMsg(player);
switch (qs.getState())
{

View File

@@ -70,12 +70,8 @@ public class Q00499_IncarnationOfGluttonyKaliosSolo extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
String htmltext = getNoQuestMsg(player);
switch (qs.getState())
{

View File

@@ -151,13 +151,8 @@ public class Q00500_BrothersBoundInChains extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance talker)
{
String htmltext = getNoQuestMsg(talker);
final QuestState qs = getQuestState(talker, true);
if (qs == null)
{
return htmltext;
}
String htmltext = getNoQuestMsg(talker);
switch (qs.getState())
{

View File

@@ -170,14 +170,10 @@ public class Q00508_AClansReputation extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
final L2Clan clan = player.getClan();
String htmltext = getNoQuestMsg(player);
switch (qs.getState())
{
case State.CREATED:

View File

@@ -152,14 +152,10 @@ public class Q00509_AClansFame extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
final L2Clan clan = player.getClan();
String htmltext = getNoQuestMsg(player);
switch (qs.getState())
{
case State.CREATED:

View File

@@ -112,14 +112,10 @@ public class Q00510_AClansPrestige extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
final L2Clan clan = player.getClan();
String htmltext = getNoQuestMsg(player);
switch (qs.getState())
{
case State.CREATED:

View File

@@ -219,12 +219,8 @@ public class Q00551_OlympiadStarter extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
String htmltext = getNoQuestMsg(player);
if ((player.getLevel() < 75) || !player.isNoble())
{

View File

@@ -155,10 +155,6 @@ public class Q00553_OlympiadUndefeated extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
if ((player.getLevel() < 75) || !player.isNoble())
{

View File

@@ -188,10 +188,6 @@ public class Q00617_GatherTheFlames extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -151,10 +151,7 @@ public class Q00618_IntoTheFlame extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{
case KLEIN:

View File

@@ -130,32 +130,30 @@ public final class Q00624_TheFinestIngredientsPart1 extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st != null)
switch (st.getState())
{
switch (st.getState())
case State.CREATED:
{
case State.CREATED:
htmltext = (player.getLevel() >= MIN_LVL) ? "31521-01.htm" : "31521-00.htm";
break;
}
case State.STARTED:
{
switch (st.getCond())
{
htmltext = (player.getLevel() >= MIN_LVL) ? "31521-01.htm" : "31521-00.htm";
break;
}
case State.STARTED:
{
switch (st.getCond())
case 1:
{
case 1:
{
htmltext = "31521-03.html";
break;
}
case 2:
{
htmltext = "31521-04.html";
break;
}
htmltext = "31521-03.html";
break;
}
case 2:
{
htmltext = "31521-04.html";
break;
}
break;
}
break;
}
}
return htmltext;

View File

@@ -154,10 +154,7 @@ public class Q00626_ADarkTwilight extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{
case State.CREATED:

View File

@@ -167,10 +167,7 @@ public final class Q00627_HeartInSearchOfPower extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState st = getQuestState(player, true);
if (st == null)
{
return htmltext;
}
switch (st.getState())
{
case State.CREATED:

View File

@@ -194,10 +194,6 @@ public class Q00631_DeliciousTopChoiceMeat extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
if (qs.isCreated())
{

View File

@@ -113,10 +113,6 @@ public class Q00641_AttackSailren extends Quest
{
String htmltext = getNoQuestMsg(player);
QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -223,10 +223,6 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -118,12 +118,8 @@ public class Q00645_GhostsOfBatur extends Quest
public String onTalk(L2Npc npc, L2PcInstance player)
{
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return getNoQuestMsg(player);
}
String htmltext = getNoQuestMsg(player);
switch (qs.getState())
{
case State.CREATED:

View File

@@ -143,10 +143,6 @@ public class Q00647_InfluxOfMachines extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -108,10 +108,6 @@ public final class Q00650_ABrokenDream extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

View File

@@ -76,10 +76,6 @@ public class Q00652_AnAgedExAdventurer extends Quest
{
String htmltext = getNoQuestMsg(player);
final QuestState qs = getQuestState(player, true);
if (qs == null)
{
return htmltext;
}
switch (npc.getId())
{

View File

@@ -602,10 +602,6 @@ public final class Q00662_AGameOfCards extends Quest
{
final QuestState st = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (st == null)
{
return htmltext;
}
switch (st.getState())
{

View File

@@ -134,12 +134,8 @@ public class Q00663_SeductiveWhispers extends Quest
@Override
public String onTalk(L2Npc npc, L2PcInstance talker)
{
String htmltext = getNoQuestMsg(talker);
final QuestState qs = getQuestState(talker, true);
if (qs == null)
{
return htmltext;
}
String htmltext = getNoQuestMsg(talker);
switch (qs.getState())
{

View File

@@ -141,10 +141,6 @@ public class Q00688_DefeatTheElrokianRaiders extends Quest
{
final QuestState qs = getQuestState(player, true);
String htmltext = getNoQuestMsg(player);
if (qs == null)
{
return htmltext;
}
switch (qs.getState())
{

Some files were not shown because too many files have changed in this diff Show More