From 86f4f257bd6cdbab23da2b47ea1adcf9e4d61238 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 31 Aug 2017 01:14:56 +0000 Subject: [PATCH] Removed null check after getQuestState initialized. --- .../Q00013_ParcelDelivery.java | 4 - .../Q00015_SweetWhispers.java | 4 - .../Q00017_LightAndDarkness.java | 4 - .../Q00020_BringUpWithLove.java | 4 - .../Q00026_TiredOfWaiting.java | 4 - .../Q00032_AnObviousLie.java | 4 - .../Q00033_MakeAPairOfDressShoes.java | 4 - .../Q00034_InSearchOfCloth.java | 4 - .../Q00035_FindGlitteringJewelry.java | 4 - .../Q00036_MakeASewingKit.java | 4 - .../Q00037_MakeFormalWear.java | 5 +- .../Q00042_HelpTheUncle.java | 4 - .../Q00043_HelpTheSister.java | 4 - .../Q00044_HelpTheSon/Q00044_HelpTheSon.java | 4 - .../Q00109_InSearchOfTheNest.java | 4 - .../Q00110_ToThePrimevalIsle.java | 4 - .../Q00111_ElrokianHuntersProof.java | 4 - .../Q00113_StatusOfTheBeaconTower.java | 5 - .../Q00114_ResurrectionOfAnOldManager.java | 8 +- .../Q00115_TheOtherSideOfTruth.java | 4 - .../Q00119_LastImperialPrince.java | 4 - .../Q00121_PavelTheGiant.java | 4 - .../Q00122_OminousNews.java | 4 - .../Q00124_MeetingTheElroki.java | 4 - .../Q00125_TheNameOfEvil1.java | 4 - .../Q00126_TheNameOfEvil2.java | 4 - .../Q00128_PailakaSongOfIceAndFire.java | 4 - .../Q00129_PailakaDevilsLegacy.java | 4 - .../Q00134_TempleMissionary.java | 4 - .../Q00135_TempleExecutor.java | 4 - .../Q00136_MoreThanMeetsTheEye.java | 4 - .../Q00137_TempleChampionPart1.java | 5 +- .../Q00138_TempleChampionPart2.java | 5 +- .../Q00139_ShadowFoxPart1.java | 4 - .../Q00140_ShadowFoxPart2.java | 4 - .../Q00141_ShadowFoxPart3.java | 4 - .../Q00142_FallenAngelRequestOfDawn.java | 4 - .../Q00143_FallenAngelRequestOfDusk.java | 4 - .../Q00144_PailakaInjuredDragon.java | 8 +- .../Q00146_TheZeroHour.java | 4 - .../Q00149_PrimalMotherIstina.java | 8 +- ...tremeChallengePrimalMotherResurrected.java | 8 +- .../Q00210_ObtainAWolfPet.java | 4 - .../Q00237_WindsOfChange.java | 4 - .../Q00238_SuccessFailureOfBusiness.java | 4 - .../Q00239_WontYouJoinUs.java | 4 - .../Q00240_ImTheOnlyOneYouCanTrust.java | 4 - .../Q00245_ComeToMe/Q00245_ComeToMe.java | 7 +- .../Q00254_LegendaryTales.java | 4 - .../Q00270_TheOneWhoEndsSilence.java | 4 - .../Q00278_HomeSecurity.java | 4 - .../Q00307_ControlDeviceOfTheGiants.java | 4 - .../Q00310_OnlyWhatRemains.java | 5 - .../Q00336_CoinsOfMagic.java | 5 +- .../Q00337_AudienceWithTheLandDragon.java | 4 - .../Q00350_EnhanceYourWeapon.java | 4 - ...00376_ExplorationOfTheGiantsCavePart1.java | 4 - ...00377_ExplorationOfTheGiantsCavePart2.java | 4 - .../Q00386_StolenDignity.java | 3 +- .../Q00431_WeddingMarch.java | 5 - .../Q00432_BirthdayPartySong.java | 5 - .../Q00450_GraveRobberRescue.java | 5 - .../Q00451_LuciensAltar.java | 5 - .../Q00452_FindingtheLostSoldiers.java | 4 - .../Q00455_WingsOfSand.java | 6 +- .../Q00456_DontKnowDontCare.java | 5 - .../Q00457_LostAndFound.java | 4 - .../Q00458_PerfectForm.java | 4 - .../Q00463_IMustBeaGenius.java | 4 - .../Q00466_PlacingMySmallPower.java | 5 +- .../Q00490_DutyOfTheSurvivor.java | 5 - .../Q00491_InNominePatris.java | 6 +- .../Q00493_KickingOutUnwelcomeGuests.java | 5 - ...Q00494_IncarnationOfGreedZellakaGroup.java | 6 +- ...495_IncarnationOfJealousyPellineGroup.java | 6 +- ...0496_IncarnationOfGluttonyKaliosGroup.java | 6 +- .../Q00497_IncarnationOfGreedZellakaSolo.java | 6 +- ...0498_IncarnationOfJealousyPellineSolo.java | 6 +- ...00499_IncarnationOfGluttonyKaliosSolo.java | 6 +- .../Q00500_BrothersBoundInChains.java | 7 +- .../Q00508_AClansReputation.java | 8 +- .../Q00509_AClansFame/Q00509_AClansFame.java | 8 +- .../Q00510_AClansPrestige.java | 8 +- .../Q00551_OlympiadStarter.java | 6 +- .../Q00553_OlympiadUndefeated.java | 4 - .../Q00617_GatherTheFlames.java | 4 - .../Q00618_IntoTheFlame.java | 5 +- .../Q00624_TheFinestIngredientsPart1.java | 38 +- .../Q00626_ADarkTwilight.java | 5 +- .../Q00627_HeartInSearchOfPower.java | 5 +- .../Q00631_DeliciousTopChoiceMeat.java | 4 - .../Q00641_AttackSailren.java | 4 - .../Q00643_RiseAndFallOfTheElrokiTribe.java | 4 - .../Q00645_GhostsOfBatur.java | 6 +- .../Q00647_InfluxOfMachines.java | 4 - .../Q00650_ABrokenDream.java | 4 - .../Q00652_AnAgedExAdventurer.java | 4 - .../Q00662_AGameOfCards.java | 4 - .../Q00663_SeductiveWhispers.java | 6 +- .../Q00688_DefeatTheElrokianRaiders.java | 4 - .../Q00699_GuardianOfTheSkies.java | 36 +- .../Q00700_CursedLife/Q00700_CursedLife.java | 40 +- .../Q00701_ProofOfExistence.java | 6 +- .../Q00702_ATrapForRevenge.java | 6 +- .../Q00751_LiberatingTheSpirits.java | 6 +- .../Q00752_UncoverTheSecret.java | 6 +- .../Q00753_ReactingToACrisis.java | 6 +- .../Q00756_TopQualityPetra.java | 2 +- .../Q00757_TriolsMovement.java | 6 +- .../Q00758_TheFallenKingsMen.java | 6 +- .../Q00761_AssistingTheGoldenRamArmy.java | 2 +- .../Q00762_AnOminousRequest.java | 2 +- .../Q00763_ADauntingTask.java | 2 +- .../Q00775_RetrievingTheChaosFragment.java | 5 +- .../Q00776_SlayDarkLordEkimus.java | 7 +- .../Q00777_SlayDarkLordTiat.java | 7 +- .../Q00778_OperationRoaringFlame.java | 7 +- .../Q00787_TheRoleOfAWatcher.java | 6 +- .../Q00901_HowLavasaurusesAreMade.java | 4 - .../Q00902_ReclaimOurEra.java | 4 - .../Q00903_TheCallOfAntharas.java | 6 +- .../Q00905_RefinedDragonBlood.java | 6 +- .../Q00906_TheCallOfValakas.java | 6 +- .../Q00907_DragonTrophyValakas.java | 6 +- .../Q00943_FillingTheEnergyOfDestruction.java | 6 +- .../Q10273_GoodDayToFly.java | 4 - .../Q10274_CollectingInTheAir.java | 4 - .../Q10275_ContainingTheAttributePower.java | 4 - .../Q10282_ToTheSeedOfAnnihilation.java | 4 - .../Q10283_RequestOfIceMerchant.java | 4 - .../Q10288_SecretMission.java | 4 - .../Q10289_FadeToBlack.java | 4 - .../Q10291_FireDragonDestroyer.java | 5 - ...303_CrossroadsBetweenLightAndDarkness.java | 2 +- .../Q10304_ForForgottenHeroes.java | 2 +- .../Q10307_TheCorruptedLeaderHisTruth.java | 5 +- .../Q10311_PeacefulDaysAreOver.java | 5 +- .../Q10312_AbandonedGodsCreature.java | 5 +- .../Q10315_ToThePrisonOfDarkness.java | 5 +- .../Q10316_UndecayingMemoryOfThePast.java | 11 +- .../Q10317_OrbisWitch/Q10317_OrbisWitch.java | 5 +- .../Q10318_DecayingDarkness.java | 4 - ...Q10322_SearchingForTheMysteriousPower.java | 2 +- .../Q10323_TrainLikeItsReal.java | 2 +- .../Q10325_SearchingForNewPower.java | 2 +- .../Q10326_RespectYourElders.java | 2 +- ...10327_IntruderWhoWantsTheBookOfGiants.java | 2 +- .../Q10328_RequestToSealTheEvilFragment.java | 2 +- .../Q10329_BackupSeekers.java | 2 +- .../Q10331_StartOfFate.java | 2 +- .../Q10339_FightingTheForgotten.java | 2 +- .../Q10351_OwnerOfHall.java | 10 +- .../Q10353_CertificationOfValue.java | 5 +- .../Q10354_ResurrectedOwnerOfHall.java | 11 +- .../Q10360_CertificationOfFate.java | 2 +- .../Q10361_RolesOfTheSeeker.java | 2 +- .../Q10362_CertificationOfTheSeeker.java | 2 +- .../Q10363_RequestOfTheSeeker.java | 2 +- .../Q10364_ObligationsOfTheSeeker.java | 2 +- .../Q10365_SeekerEscort.java | 2 +- .../Q10366_RuinsStatusUpdate.java | 2 +- .../Q10374_ThatPlaceSuccubus.java | 6 +- .../Q10377_TheInvadedExecutionGrounds.java | 6 +- .../Q10381_ToTheSeedOfHellfire.java | 5 - .../Q10388_ConspiracyBehindDoor.java | 6 +- .../Q10389_TheVoiceOfAuthority.java | 6 +- .../Q10409_ASuspiciousVagabondInTheSwamp.java | 2 +- ...Q10412_ASuspiciousVagabondInTheForest.java | 2 +- .../Q10416_InSearchOfTheEyeOfArgos.java | 2 +- .../Q10417_DaimonTheWhiteEyed.java | 2 +- ...2_AssassinationOfTheVarkaSilenosChief.java | 2 +- ...10427_AssassinationOfTheKetraOrcChief.java | 2 +- .../Q10432_ChasingVarangka.java | 4 - ...alOfPunishmentSelMahumTrainingGrounds.java | 5 +- .../Q10435_ChasingKeltron.java | 4 - ...eSealOfPunishmentPlainsOfTheLizardmen.java | 5 +- .../Q10438_ChasingLoygen.java | 4 - .../Q10441_ChasingMeccadan.java | 4 - .../Q10443_TheAnnihilatedPlains2.java | 7 +- .../Q10444_TheOriginOfMonsters.java | 2 +- .../Q10446_HitAndRun/Q10446_HitAndRun.java | 13 +- .../Q10447_TimingIsEverything.java | 13 +- .../Q10452_IsItEdible/Q10452_IsItEdible.java | 5 +- .../Q10455_ElikiasLetter.java | 4 - .../Q10459_ASickAmbition.java | 4 - .../Q10461_TappingThePowerWithin.java | 5 - .../Q10701_TheRoadToDestruction.java | 5 - .../Q10702_TheRoadToInfinity.java | 5 - .../Q10703_BottleOfIstinasSoul.java | 8 +- .../Q10704_BottleOfOctavisSoul.java | 8 +- .../Q10705_BottleOfTautisSoul.java | 8 +- .../Q10707_FlamesOfSorrow.java | 5 - .../Q10708_StrengthenTheBarrier.java | 5 - .../Q10712_TheMinstrelsSongPart1.java | 5 +- .../Q10731_TheMinstrelsSongPart6.java | 4 +- .../Q10767_AWholeNewLevelOfAlchemy.java | 7 +- .../Q00013_ParcelDelivery.java | 4 - .../Q00015_SweetWhispers.java | 4 - .../Q00017_LightAndDarkness.java | 4 - .../Q00020_BringUpWithLove.java | 4 - .../Q00026_TiredOfWaiting.java | 4 - .../Q00032_AnObviousLie.java | 4 - .../Q00033_MakeAPairOfDressShoes.java | 4 - .../Q00034_InSearchOfCloth.java | 4 - .../Q00035_FindGlitteringJewelry.java | 4 - .../Q00036_MakeASewingKit.java | 4 - .../Q00037_MakeFormalWear.java | 5 +- .../Q00042_HelpTheUncle.java | 4 - .../Q00043_HelpTheSister.java | 4 - .../Q00044_HelpTheSon/Q00044_HelpTheSon.java | 4 - .../Q00109_InSearchOfTheNest.java | 4 - .../Q00110_ToThePrimevalIsle.java | 4 - .../Q00111_ElrokianHuntersProof.java | 4 - .../Q00113_StatusOfTheBeaconTower.java | 5 - .../Q00114_ResurrectionOfAnOldManager.java | 8 +- .../Q00115_TheOtherSideOfTruth.java | 4 - .../Q00119_LastImperialPrince.java | 4 - .../Q00121_PavelTheGiant.java | 4 - .../Q00122_OminousNews.java | 4 - .../Q00124_MeetingTheElroki.java | 4 - .../Q00125_TheNameOfEvil1.java | 4 - .../Q00126_TheNameOfEvil2.java | 4 - .../Q00128_PailakaSongOfIceAndFire.java | 4 - .../Q00129_PailakaDevilsLegacy.java | 4 - .../Q00134_TempleMissionary.java | 4 - .../Q00135_TempleExecutor.java | 4 - .../Q00136_MoreThanMeetsTheEye.java | 4 - .../Q00137_TempleChampionPart1.java | 5 +- .../Q00138_TempleChampionPart2.java | 5 +- .../Q00139_ShadowFoxPart1.java | 4 - .../Q00140_ShadowFoxPart2.java | 4 - .../Q00141_ShadowFoxPart3.java | 4 - .../Q00142_FallenAngelRequestOfDawn.java | 4 - .../Q00143_FallenAngelRequestOfDusk.java | 4 - .../Q00144_PailakaInjuredDragon.java | 8 +- .../Q00146_TheZeroHour.java | 4 - .../Q00149_PrimalMotherIstina.java | 8 +- ...tremeChallengePrimalMotherResurrected.java | 8 +- .../Q00210_ObtainAWolfPet.java | 4 - .../Q00237_WindsOfChange.java | 4 - .../Q00238_SuccessFailureOfBusiness.java | 4 - .../Q00239_WontYouJoinUs.java | 4 - .../Q00240_ImTheOnlyOneYouCanTrust.java | 4 - .../Q00245_ComeToMe/Q00245_ComeToMe.java | 7 +- .../Q00254_LegendaryTales.java | 4 - .../Q00270_TheOneWhoEndsSilence.java | 4 - .../Q00278_HomeSecurity.java | 4 - .../Q00307_ControlDeviceOfTheGiants.java | 4 - .../Q00310_OnlyWhatRemains.java | 5 - .../Q00336_CoinsOfMagic.java | 5 +- .../Q00337_AudienceWithTheLandDragon.java | 4 - ...00376_ExplorationOfTheGiantsCavePart1.java | 4 - ...00377_ExplorationOfTheGiantsCavePart2.java | 4 - .../Q00386_StolenDignity.java | 3 +- .../Q00431_WeddingMarch.java | 5 - .../Q00432_BirthdayPartySong.java | 5 - .../Q00450_GraveRobberRescue.java | 5 - .../Q00451_LuciensAltar.java | 5 - .../Q00452_FindingtheLostSoldiers.java | 4 - .../Q00455_WingsOfSand.java | 6 +- .../Q00456_DontKnowDontCare.java | 5 - .../Q00457_LostAndFound.java | 4 - .../Q00458_PerfectForm.java | 4 - .../Q00463_IMustBeaGenius.java | 4 - .../Q00466_PlacingMySmallPower.java | 5 +- .../Q00490_DutyOfTheSurvivor.java | 5 - .../Q00491_InNominePatris.java | 6 +- .../Q00493_KickingOutUnwelcomeGuests.java | 5 - ...Q00494_IncarnationOfGreedZellakaGroup.java | 6 +- ...495_IncarnationOfJealousyPellineGroup.java | 6 +- ...0496_IncarnationOfGluttonyKaliosGroup.java | 6 +- .../Q00497_IncarnationOfGreedZellakaSolo.java | 6 +- ...0498_IncarnationOfJealousyPellineSolo.java | 6 +- ...00499_IncarnationOfGluttonyKaliosSolo.java | 6 +- .../Q00500_BrothersBoundInChains.java | 7 +- .../Q00508_AClansReputation.java | 8 +- .../Q00509_AClansFame/Q00509_AClansFame.java | 8 +- .../Q00510_AClansPrestige.java | 8 +- .../Q00551_OlympiadStarter.java | 6 +- .../Q00553_OlympiadUndefeated.java | 4 - .../Q00617_GatherTheFlames.java | 4 - .../Q00618_IntoTheFlame.java | 5 +- .../Q00626_ADarkTwilight.java | 5 +- .../Q00627_HeartInSearchOfPower.java | 5 +- .../Q00631_DeliciousTopChoiceMeat.java | 4 - .../Q00641_AttackSailren.java | 4 - .../Q00643_RiseAndFallOfTheElrokiTribe.java | 4 - .../Q00645_GhostsOfBatur.java | 6 +- .../Q00647_InfluxOfMachines.java | 4 - .../Q00650_ABrokenDream.java | 4 - .../Q00652_AnAgedExAdventurer.java | 4 - .../Q00662_AGameOfCards.java | 4 - .../Q00663_SeductiveWhispers.java | 6 +- .../Q00688_DefeatTheElrokianRaiders.java | 4 - .../Q00751_LiberatingTheSpirits.java | 6 +- .../Q00752_UncoverTheSecret.java | 6 +- .../Q00753_ReactingToACrisis.java | 6 +- .../Q00756_TopQualityPetra.java | 2 +- .../Q00757_TriolsMovement.java | 6 +- .../Q00758_TheFallenKingsMen.java | 6 +- .../Q00760_BlockTheExit.java | 2 +- .../Q00761_AssistingTheGoldenRamArmy.java | 2 +- .../Q00762_AnOminousRequest.java | 2 +- .../Q00763_ADauntingTask.java | 2 +- .../Q00775_RetrievingTheChaosFragment.java | 5 +- .../Q00776_SlayDarkLordEkimus.java | 7 +- .../Q00777_SlayDarkLordTiat.java | 7 +- .../Q00778_OperationRoaringFlame.java | 7 +- .../Q00783_VestigeOfTheMagicPower.java | 7 +- .../Q00787_TheRoleOfAWatcher.java | 6 +- .../Q00901_HowLavasaurusesAreMade.java | 4 - .../Q00902_ReclaimOurEra.java | 4 - .../Q00903_TheCallOfAntharas.java | 6 +- .../Q00905_RefinedDragonBlood.java | 6 +- .../Q00906_TheCallOfValakas.java | 6 +- .../Q00907_DragonTrophyValakas.java | 6 +- .../Q00943_FillingTheEnergyOfDestruction.java | 6 +- .../Q10273_GoodDayToFly.java | 4 - .../Q10274_CollectingInTheAir.java | 4 - .../Q10275_ContainingTheAttributePower.java | 4 - .../Q10282_ToTheSeedOfAnnihilation.java | 4 - .../Q10283_RequestOfIceMerchant.java | 4 - .../Q10288_SecretMission.java | 4 - .../Q10289_FadeToBlack.java | 4 - .../Q10291_FireDragonDestroyer.java | 5 - .../Q10297_GrandOpeningComeToOurPub.java | 5 - ...303_CrossroadsBetweenLightAndDarkness.java | 2 +- .../Q10304_ForForgottenHeroes.java | 2 +- .../Q10307_TheCorruptedLeaderHisTruth.java | 5 +- .../Q10311_PeacefulDaysAreOver.java | 5 +- .../Q10312_AbandonedGodsCreature.java | 5 +- .../Q10315_ToThePrisonOfDarkness.java | 5 +- .../Q10316_UndecayingMemoryOfThePast.java | 11 +- .../Q10317_OrbisWitch/Q10317_OrbisWitch.java | 5 +- .../Q10318_DecayingDarkness.java | 4 - ...Q10322_SearchingForTheMysteriousPower.java | 2 +- .../Q10323_TrainLikeItsReal.java | 2 +- .../Q10325_SearchingForNewPower.java | 2 +- .../Q10326_RespectYourElders.java | 2 +- ...10327_IntruderWhoWantsTheBookOfGiants.java | 2 +- .../Q10328_RequestToSealTheEvilFragment.java | 2 +- .../Q10329_BackupSeekers.java | 2 +- .../Q10331_StartOfFate.java | 2 +- .../Q10339_FightingTheForgotten.java | 2 +- .../Q10351_OwnerOfHall.java | 10 +- .../Q10353_CertificationOfValue.java | 5 +- .../Q10354_ResurrectedOwnerOfHall.java | 11 +- .../Q10360_CertificationOfFate.java | 2 +- .../Q10361_RolesOfTheSeeker.java | 2 +- .../Q10362_CertificationOfTheSeeker.java | 2 +- .../Q10363_RequestOfTheSeeker.java | 2 +- .../Q10364_ObligationsOfTheSeeker.java | 2 +- .../Q10365_SeekerEscort.java | 2 +- .../Q10366_RuinsStatusUpdate.java | 2 +- .../Q10374_ThatPlaceSuccubus.java | 6 +- .../Q10377_TheInvadedExecutionGrounds.java | 6 +- .../Q10381_ToTheSeedOfHellfire.java | 5 - .../Q10388_ConspiracyBehindDoor.java | 6 +- .../Q10389_TheVoiceOfAuthority.java | 6 +- .../Q10409_ASuspiciousVagabondInTheSwamp.java | 2 +- ...Q10412_ASuspiciousVagabondInTheForest.java | 2 +- .../Q10416_InSearchOfTheEyeOfArgos.java | 2 +- .../Q10417_DaimonTheWhiteEyed.java | 2 +- ...2_AssassinationOfTheVarkaSilenosChief.java | 2 +- ...10427_AssassinationOfTheKetraOrcChief.java | 2 +- .../Q10432_ChasingVarangka.java | 4 - ...alOfPunishmentSelMahumTrainingGrounds.java | 5 +- .../Q10435_ChasingKeltron.java | 4 - ...eSealOfPunishmentPlainsOfTheLizardmen.java | 5 +- .../Q10438_ChasingLoygen.java | 4 - .../Q10441_ChasingMeccadan.java | 4 - .../Q10443_TheAnnihilatedPlains2.java | 7 +- .../Q10444_TheOriginOfMonsters.java | 2 +- .../Q10446_HitAndRun/Q10446_HitAndRun.java | 13 +- .../Q10447_TimingIsEverything.java | 13 +- .../Q10452_IsItEdible/Q10452_IsItEdible.java | 5 +- .../Q10455_ElikiasLetter.java | 4 - .../Q10459_ASickAmbition.java | 4 - .../Q10461_TappingThePowerWithin.java | 5 - .../Q10701_TheRoadToDestruction.java | 5 - .../Q10702_TheRoadToInfinity.java | 5 - .../Q10703_BottleOfIstinasSoul.java | 8 +- .../Q10704_BottleOfOctavisSoul.java | 8 +- .../Q10705_BottleOfTautisSoul.java | 8 +- .../Q10707_FlamesOfSorrow.java | 5 - .../Q10708_StrengthenTheBarrier.java | 5 - .../Q10712_TheMinstrelsSongPart1.java | 5 +- .../Q10731_TheMinstrelsSongPart6.java | 4 +- .../Q10767_AWholeNewLevelOfAlchemy.java | 7 +- ...Q10817_ExaltedOneWhoOvercomesTheLimit.java | 4 - .../Q10823_ExaltedOneWhoShattersTheLimit.java | 4 - .../Q00013_ParcelDelivery.java | 4 - .../Q00015_SweetWhispers.java | 4 - .../Q00017_LightAndDarkness.java | 4 - .../Q00020_BringUpWithLove.java | 4 - .../Q00032_AnObviousLie.java | 4 - .../Q00033_MakeAPairOfDressShoes.java | 4 - .../Q00034_InSearchOfCloth.java | 4 - .../Q00035_FindGlitteringJewelry.java | 4 - .../Q00036_MakeASewingKit.java | 4 - .../Q00037_MakeFormalWear.java | 5 +- .../Q00042_HelpTheUncle.java | 4 - .../Q00043_HelpTheSister.java | 4 - .../Q00044_HelpTheSon/Q00044_HelpTheSon.java | 4 - .../Q00109_InSearchOfTheNest.java | 4 - .../Q00110_ToThePrimevalIsle.java | 4 - .../Q00111_ElrokianHuntersProof.java | 4 - .../Q00115_TheOtherSideOfTruth.java | 4 - .../Q00119_LastImperialPrince.java | 4 - .../Q00124_MeetingTheElroki.java | 4 - .../Q00125_TheNameOfEvil1.java | 4 - .../Q00126_TheNameOfEvil2.java | 4 - .../Q00128_PailakaSongOfIceAndFire.java | 4 - .../Q00129_PailakaDevilsLegacy.java | 4 - .../Q00134_TempleMissionary.java | 4 - .../Q00135_TempleExecutor.java | 4 - .../Q00136_MoreThanMeetsTheEye.java | 4 - .../Q00137_TempleChampionPart1.java | 5 +- .../Q00138_TempleChampionPart2.java | 5 +- .../Q00139_ShadowFoxPart1.java | 4 - .../Q00140_ShadowFoxPart2.java | 4 - .../Q00141_ShadowFoxPart3.java | 4 - .../Q00142_FallenAngelRequestOfDawn.java | 4 - .../Q00143_FallenAngelRequestOfDusk.java | 4 - .../Q00144_PailakaInjuredDragon.java | 8 +- .../Q00146_TheZeroHour.java | 4 - .../Q00149_PrimalMotherIstina.java | 8 +- ...tremeChallengePrimalMotherResurrected.java | 8 +- .../Q00210_ObtainAWolfPet.java | 4 - .../Q00237_WindsOfChange.java | 4 - .../Q00238_SuccessFailureOfBusiness.java | 4 - .../Q00239_WontYouJoinUs.java | 4 - .../Q00240_ImTheOnlyOneYouCanTrust.java | 4 - .../Q00245_ComeToMe/Q00245_ComeToMe.java | 7 +- .../Q00254_LegendaryTales.java | 4 - .../Q00270_TheOneWhoEndsSilence.java | 4 - .../Q00278_HomeSecurity.java | 4 - .../Q00310_OnlyWhatRemains.java | 5 - .../Q00337_AudienceWithTheLandDragon.java | 4 - .../Q00386_StolenDignity.java | 3 +- .../Q00450_GraveRobberRescue.java | 5 - .../Q00451_LuciensAltar.java | 5 - .../Q00452_FindingtheLostSoldiers.java | 4 - .../Q00455_WingsOfSand.java | 6 +- .../Q00456_DontKnowDontCare.java | 5 - .../Q00457_LostAndFound.java | 4 - .../Q00458_PerfectForm.java | 4 - .../Q00466_PlacingMySmallPower.java | 5 +- .../Q00490_DutyOfTheSurvivor.java | 5 - .../Q00491_InNominePatris.java | 6 +- .../Q00493_KickingOutUnwelcomeGuests.java | 5 - ...Q00494_IncarnationOfGreedZellakaGroup.java | 6 +- ...495_IncarnationOfJealousyPellineGroup.java | 6 +- ...0496_IncarnationOfGluttonyKaliosGroup.java | 6 +- .../Q00497_IncarnationOfGreedZellakaSolo.java | 6 +- ...0498_IncarnationOfJealousyPellineSolo.java | 6 +- ...00499_IncarnationOfGluttonyKaliosSolo.java | 6 +- .../Q00500_BrothersBoundInChains.java | 7 +- .../Q00508_AClansReputation.java | 8 +- .../Q00509_AClansFame/Q00509_AClansFame.java | 8 +- .../Q00510_AClansPrestige.java | 8 +- .../Q00551_OlympiadStarter.java | 6 +- .../Q00553_OlympiadUndefeated.java | 4 - .../Q00617_GatherTheFlames.java | 4 - .../Q00618_IntoTheFlame.java | 5 +- .../Q00627_HeartInSearchOfPower.java | 5 +- .../Q00631_DeliciousTopChoiceMeat.java | 4 - .../Q00641_AttackSailren.java | 4 - .../Q00643_RiseAndFallOfTheElrokiTribe.java | 4 - .../Q00645_GhostsOfBatur.java | 6 +- .../Q00662_AGameOfCards.java | 4 - .../Q00663_SeductiveWhispers.java | 6 +- .../Q00688_DefeatTheElrokianRaiders.java | 4 - .../Q00751_LiberatingTheSpirits.java | 6 +- .../Q00752_UncoverTheSecret.java | 6 +- .../Q00753_ReactingToACrisis.java | 6 +- .../Q00756_TopQualityPetra.java | 2 +- .../Q00757_TriolsMovement.java | 6 +- .../Q00758_TheFallenKingsMen.java | 6 +- .../Q00760_BlockTheExit.java | 2 +- .../Q00761_AssistingTheGoldenRamArmy.java | 2 +- .../Q00762_AnOminousRequest.java | 2 +- .../Q00763_ADauntingTask.java | 2 +- .../Q00775_RetrievingTheChaosFragment.java | 5 +- .../Q00776_SlayDarkLordEkimus.java | 7 +- .../Q00777_SlayDarkLordTiat.java | 7 +- .../Q00778_OperationRoaringFlame.java | 7 +- .../Q00783_VestigeOfTheMagicPower.java | 7 +- .../Q00787_TheRoleOfAWatcher.java | 6 +- .../Q00901_HowLavasaurusesAreMade.java | 4 - .../Q00902_ReclaimOurEra.java | 4 - .../Q00903_TheCallOfAntharas.java | 6 +- .../Q00905_RefinedDragonBlood.java | 6 +- .../Q00906_TheCallOfValakas.java | 6 +- .../Q00907_DragonTrophyValakas.java | 6 +- .../Q10273_GoodDayToFly.java | 4 - .../Q10274_CollectingInTheAir.java | 4 - .../Q10275_ContainingTheAttributePower.java | 4 - .../Q10282_ToTheSeedOfAnnihilation.java | 4 - .../Q10283_RequestOfIceMerchant.java | 4 - .../Q10288_SecretMission.java | 4 - .../Q10289_FadeToBlack.java | 4 - .../Q10291_FireDragonDestroyer.java | 5 - .../Q10297_GrandOpeningComeToOurPub.java | 5 - ...303_CrossroadsBetweenLightAndDarkness.java | 2 +- .../Q10304_ForForgottenHeroes.java | 2 +- .../Q10307_TheCorruptedLeaderHisTruth.java | 5 +- .../Q10311_PeacefulDaysAreOver.java | 5 +- .../Q10312_AbandonedGodsCreature.java | 5 +- .../Q10315_ToThePrisonOfDarkness.java | 5 +- .../Q10316_UndecayingMemoryOfThePast.java | 11 +- .../Q10317_OrbisWitch/Q10317_OrbisWitch.java | 5 +- .../Q10318_DecayingDarkness.java | 4 - .../Q10331_StartOfFate.java | 2 +- .../Q10339_FightingTheForgotten.java | 2 +- .../Q10351_OwnerOfHall.java | 10 +- .../Q10353_CertificationOfValue.java | 5 +- .../Q10354_ResurrectedOwnerOfHall.java | 11 +- .../Q10360_CertificationOfFate.java | 2 +- .../Q10362_CertificationOfTheSeeker.java | 2 +- .../Q10363_RequestOfTheSeeker.java | 2 +- .../Q10364_ObligationsOfTheSeeker.java | 2 +- .../Q10365_ForTheSearchdogKing.java | 2 +- ...Q10366_ReportOnTheSituationAtTheRuins.java | 8 +- .../Q10374_ThatPlaceSuccubus.java | 6 +- .../Q10377_TheInvadedExecutionGrounds.java | 6 +- .../Q10381_ToTheSeedOfHellfire.java | 5 - .../Q10388_ConspiracyBehindDoor.java | 6 +- .../Q10389_TheVoiceOfAuthority.java | 6 +- .../Q10407_LetsGoFishing.java | 2 +- .../Q10409_ASuspiciousVagabondInTheSwamp.java | 2 +- ...Q10412_ASuspiciousVagabondInTheForest.java | 2 +- .../Q10416_InSearchOfTheEyeOfArgos.java | 2 +- .../Q10417_DaimonTheWhiteEyed.java | 2 +- ...2_AssassinationOfTheVarkaSilenosChief.java | 2 +- ...10427_AssassinationOfTheKetraOrcChief.java | 2 +- .../Q10443_TheAnnihilatedPlains2.java | 7 +- .../Q10444_TheOriginOfMonsters.java | 2 +- .../Q10446_HitAndRun/Q10446_HitAndRun.java | 13 +- .../Q10447_TimingIsEverything.java | 13 +- .../Q10452_IsItEdible/Q10452_IsItEdible.java | 5 +- .../Q10455_ElikiasLetter.java | 4 - .../Q10459_ASickAmbition.java | 4 - .../Q10461_TappingThePowerWithin.java | 5 - .../Q10541_TrainLikeTheRealThing.java | 2 +- .../Q10542_SearchingForNewPower.java | 2 +- .../Q10543_SheddingWeight.java | 2 +- .../Q10544_SeekerSupplies.java | 2 +- .../Q10701_TheRoadToDestruction.java | 5 - .../Q10702_TheRoadToInfinity.java | 5 - .../Q10703_BottleOfIstinasSoul.java | 8 +- .../Q10704_BottleOfOctavisSoul.java | 8 +- .../Q10705_BottleOfTautisSoul.java | 8 +- .../Q10707_FlamesOfSorrow.java | 5 - .../Q10708_StrengthenTheBarrier.java | 5 - .../Q10712_TheMinstrelsSongPart1.java | 5 +- .../Q10731_TheMinstrelsSongPart6.java | 4 +- .../Q10767_AWholeNewLevelOfAlchemy.java | 7 +- ...Q10817_ExaltedOneWhoOvercomesTheLimit.java | 4 - .../Q10823_ExaltedOneWhoShattersTheLimit.java | 4 - .../SubclassCertification.java | 9 +- .../instances/ChambersOfDelusion/Chamber.java | 8 +- .../scripts/quests/AbstractSagaQuest.java | 403 +++++++++--------- .../Q00002_WhatWomenWant.java | 2 +- .../Q00003_WillTheSealBeBroken.java | 2 +- .../Q00004_LongLiveThePaagrioLord.java | 2 +- .../Q00005_MinersFavor.java | 2 +- .../Q00006_StepIntoTheFuture.java | 6 +- .../Q00007_ATripBegins.java | 6 +- .../Q00008_AnAdventureBegins.java | 6 +- .../Q00009_IntoTheCityOfHumans.java | 6 +- .../Q00010_IntoTheWorld.java | 6 +- .../Q00011_SecretMeetingWithKetraOrcs.java | 8 +- .../Q00012_SecretMeetingWithVarkaSilenos.java | 8 +- .../Q00013_ParcelDelivery.java | 8 +- .../Q00014_WhereaboutsOfTheArchaeologist.java | 8 +- .../Q00015_SweetWhispers.java | 8 +- .../Q00016_TheComingDarkness.java | 7 +- .../Q00017_LightAndDarkness.java | 6 +- .../Q00018_MeetingWithTheGoldenRam.java | 8 +- .../Q00019_GoToThePastureland.java | 6 +- .../Q00020_BringUpWithLove.java | 4 - .../Q00021_HiddenTruth.java | 334 ++++++++------- ...00024_InhabitantsOfTheForestOfTheDead.java | 7 +- .../Q00026_TiredOfWaiting.java | 6 +- .../Q00027_ChestCaughtWithABaitOfWind.java | 6 +- .../Q00028_ChestCaughtWithABaitOfIcyAir.java | 8 +- .../Q00029_ChestCaughtWithABaitOfEarth.java | 8 +- .../Q00030_ChestCaughtWithABaitOfFire.java | 6 +- .../Q00031_SecretBuriedInTheSwamp.java | 5 +- .../Q00032_AnObviousLie.java | 4 - .../Q00033_MakeAPairOfDressShoes.java | 6 +- .../Q00034_InSearchOfCloth.java | 6 +- .../Q00035_FindGlitteringJewelry.java | 6 +- .../Q00036_MakeASewingKit.java | 6 +- .../Q00037_MakeFormalWear.java | 7 +- .../Q00040_ASpecialOrder.java | 5 +- .../Q00042_HelpTheUncle.java | 6 +- .../Q00043_HelpTheSister.java | 6 +- .../Q00044_HelpTheSon/Q00044_HelpTheSon.java | 6 +- .../Q00045_ToTalkingIsland.java | 5 +- ...0046_OnceMoreInTheArmsOfTheMotherTree.java | 5 +- .../Q00047_IntoTheDarkElvenForest.java | 5 +- .../Q00048_ToTheImmortalPlateau.java | 5 +- .../Q00049_TheRoadHome.java | 5 +- .../Q00050_LanoscosSpecialBait.java | 6 +- .../Q00051_OFullesSpecialBait.java | 6 +- .../Q00052_WilliesSpecialBait.java | 6 +- .../Q00053_LinnaeusSpecialBait.java | 6 +- .../Q00101_SwordOfSolidarity.java | 232 +++++----- .../Q00102_SeaOfSporesFever.java | 294 +++++++------ .../Q00104_SpiritOfMirrors.java | 96 ++--- .../Q00105_SkirmishWithOrcs.java | 4 - .../Q00106_ForgottenTruth.java | 4 - .../Q00108_JumbleTumbleDiamondFuss.java | 5 +- .../Q00109_InSearchOfTheNest.java | 6 +- .../Q00110_ToThePrimevalIsle.java | 6 +- .../Q00111_ElrokianHuntersProof.java | 4 - .../Q00112_WalkOfFate/Q00112_WalkOfFate.java | 4 - .../Q00113_StatusOfTheBeaconTower.java | 7 +- .../Q00114_ResurrectionOfAnOldManager.java | 8 +- .../Q00115_TheOtherSideOfTruth.java | 4 - .../Q00119_LastImperialPrince.java | 4 - .../Q00121_PavelTheGiant.java | 6 +- .../Q00122_OminousNews.java | 6 +- .../Q00124_MeetingTheElroki.java | 6 +- .../Q00125_TheNameOfEvil1.java | 4 - .../Q00126_TheNameOfEvil2.java | 4 - .../Q00128_PailakaSongOfIceAndFire.java | 6 +- .../Q00129_PailakaDevilsLegacy.java | 6 +- .../Q00130_PathToHellbound.java | 4 - .../Q00131_BirdInACage.java | 4 - .../Q00132_MatrasCuriosity.java | 6 +- .../Q00133_ThatsBloodyHot.java | 4 - .../Q00134_TempleMissionary.java | 6 +- .../Q00135_TempleExecutor.java | 6 +- .../Q00136_MoreThanMeetsTheEye.java | 4 - .../Q00137_TempleChampionPart1.java | 7 +- .../Q00138_TempleChampionPart2.java | 7 +- .../Q00139_ShadowFoxPart1.java | 6 +- .../Q00140_ShadowFoxPart2.java | 6 +- .../Q00141_ShadowFoxPart3.java | 6 +- .../Q00142_FallenAngelRequestOfDawn.java | 6 +- .../Q00143_FallenAngelRequestOfDusk.java | 6 +- .../Q00144_PailakaInjuredDragon.java | 5 - .../Q00146_TheZeroHour.java | 6 +- ...Q00147_PathtoBecominganEliteMercenary.java | 6 +- ...0148_PathtoBecominganExaltedMercenary.java | 6 +- .../Q00151_CureForFever.java | 6 +- .../Q00152_ShardsOfGolem.java | 170 ++++---- .../Q00153_DeliverGoods.java | 132 +++--- .../Q00154_SacrificeToTheSea.java | 1 + .../Q00155_FindSirWindawood.java | 6 +- .../Q00156_MillenniumLove.java | 92 ++-- .../Q00157_RecoverSmuggledGoods.java | 42 +- .../Q00158_SeedOfEvil/Q00158_SeedOfEvil.java | 6 +- .../Q00159_ProtectTheWaterSource.java | 100 +++-- .../Q00160_NerupasRequest.java | 1 + .../Q00161_FruitOfTheMotherTree.java | 6 +- .../Q00162_CurseOfTheUndergroundFortress.java | 46 +- .../Q00163_LegacyOfThePoet.java | 44 +- .../Q00164_BloodFiend/Q00164_BloodFiend.java | 44 +- .../Q00165_ShilensHunt.java | 44 +- .../Q00166_MassOfDarkness.java | 92 ++-- .../Q00167_DwarvenKinship.java | 76 ++-- .../Q00168_DeliverSupplies.java | 166 ++++---- .../Q00169_OffspringOfNightmares.java | 42 +- .../Q00170_DangerousSeduction.java | 6 +- .../Q00172_NewHorizons.java | 16 +- .../Q00173_ToTheIsleOfSouls.java | 6 +- .../Q00174_SupplyCheck.java | 6 +- .../Q00176_StepsForHonor.java | 6 +- .../Q00179_IntoTheLargeCavern.java | 6 +- .../Q00182_NewRecruits.java | 6 +- .../Q00234_FatesWhisper.java | 5 +- .../Q00237_WindsOfChange.java | 6 +- .../Q00238_SuccessFailureOfBusiness.java | 6 +- .../Q00239_WontYouJoinUs.java | 6 +- .../Q00240_ImTheOnlyOneYouCanTrust.java | 6 +- .../Q00241_PossessorOfAPreciousSoul1.java | 6 +- .../Q00242_PossessorOfAPreciousSoul2.java | 6 +- .../Q00246_PossessorOfAPreciousSoul3.java | 6 +- .../Q00247_PossessorOfAPreciousSoul4.java | 6 +- .../Q00249_PoisonedPlainsOfTheLizardmen.java | 6 +- .../Q00250_WatchWhatYouEat.java | 6 +- .../Q00251_NoSecrets/Q00251_NoSecrets.java | 6 +- .../Q00254_LegendaryTales.java | 6 +- .../Q00257_TheGuardIsBusy.java | 4 - .../Q00258_BringWolfPelts.java | 4 - .../Q00259_RequestFromTheFarmOwner.java | 4 - .../Q00260_OrcHunting/Q00260_OrcHunting.java | 4 - .../Q00261_CollectorsDream.java | 4 - .../Q00262_TradeWithTheIvoryTower.java | 6 +- .../Q00263_OrcSubjugation.java | 6 +- .../Q00264_KeenClaws/Q00264_KeenClaws.java | 4 - .../Q00265_BondsOfSlavery.java | 4 - .../Q00266_PleasOfPixies.java | 5 +- .../Q00267_WrathOfVerdure.java | 42 +- .../Q00268_TracesOfEvil.java | 50 ++- .../Q00270_TheOneWhoEndsSilence.java | 4 - .../Q00271_ProofOfValor.java | 68 ++- .../Q00272_WrathOfAncestors.java | 44 +- .../Q00273_InvadersOfTheHolyLand.java | 40 +- .../Q00274_SkirmishWithTheWerewolves.java | 4 - .../Q00275_DarkWingedSpies.java | 4 - .../Q00276_TotemOfTheHestui.java | 4 - .../Q00277_GatekeepersOffering.java | 6 +- .../Q00278_HomeSecurity.java | 6 +- .../Q00279_TargetOfOpportunity.java | 6 +- .../Q00280_TheFoodChain.java | 4 - .../Q00281_HeadForTheHills.java | 4 - .../Q00283_TheFewTheProudTheBrave.java | 4 - .../Q00287_FiguringItOut.java | 11 +- .../Q00288_HandleWithCare.java | 4 - .../Q00289_NoMoreSoupForYou.java | 6 +- .../Q00290_ThreatRemoval.java | 4 - .../Q00293_TheHiddenVeins.java | 4 - .../Q00297_GatekeepersFavor.java | 6 +- .../Q00300_HuntingLetoLizardman.java | 6 +- .../Q00303_CollectArrowheads.java | 6 +- .../Q00306_CrystalOfFireAndIce.java | 6 +- .../Q00307_ControlDeviceOfTheGiants.java | 6 +- .../Q00308_ReedFieldMaintenance.java | 6 +- .../Q00309_ForAGoodCause.java | 6 +- .../Q00310_OnlyWhatRemains.java | 7 +- .../Q00311_ExpulsionOfEvilSpirits.java | 4 - .../Q00312_TakeAdvantageOfTheCrisis.java | 10 +- .../Q00313_CollectSpores.java | 6 +- .../Q00316_DestroyPlagueCarriers.java | 4 - .../Q00317_CatchTheWind.java | 4 - .../Q00319_ScentOfDeath.java | 6 +- .../Q00320_BonesTellTheFuture.java | 6 +- .../Q00324_SweetestVenom.java | 32 +- .../Q00325_GrimCollector.java | 6 +- .../Q00326_VanquishRemnants.java | 48 +-- .../Q00328_SenseForBusiness.java | 38 +- .../Q00329_CuriosityOfADwarf.java | 6 +- .../Q00331_ArrowOfVengeance.java | 38 +- .../Q00334_TheWishingPotion.java | 336 ++++++++------- .../Q00336_CoinsOfMagic.java | 5 +- .../Q00338_AlligatorHunter.java | 6 +- .../Q00341_HuntingForWildBeasts.java | 32 +- .../Q00350_EnhanceYourWeapon.java | 6 +- .../Q00354_ConquestOfAlligatorIsland.java | 4 - .../Q00360_PlunderTheirSupplies.java | 4 - .../Q00365_DevilsLegacy.java | 4 - .../Q00368_TrespassingIntoTheHolyGround.java | 4 - ...00376_ExplorationOfTheGiantsCavePart1.java | 4 - ...00377_ExplorationOfTheGiantsCavePart2.java | 4 - .../Q00384_WarehouseKeepersPastime.java | 42 +- .../Q00386_StolenDignity.java | 2 +- .../Q00423_TakeYourBestShot.java | 4 - .../Q00431_WeddingMarch.java | 7 +- .../Q00432_BirthdayPartySong.java | 7 +- .../Q00450_GraveRobberRescue.java | 7 +- .../Q00451_LuciensAltar.java | 7 +- .../Q00452_FindingtheLostSoldiers.java | 6 +- .../Q00453_NotStrongEnoughAlone.java | 6 +- .../Q00455_WingsOfSand.java | 6 +- .../Q00456_DontKnowDontCare.java | 5 - .../Q00457_LostAndFound.java | 4 - .../Q00458_PerfectForm.java | 6 +- .../Q00461_RumbleInTheBase.java | 6 +- .../Q00463_IMustBeaGenius.java | 6 +- .../quests/Q00464_Oath/Q00464_Oath.java | 6 +- ...504_CompetitionForTheBanditStronghold.java | 8 +- .../Q00508_AClansReputation.java | 8 +- .../Q00509_AClansFame/Q00509_AClansFame.java | 8 +- .../Q00510_AClansPrestige.java | 8 +- .../Q00511_AwlUnderFoot.java | 3 +- .../Q00551_OlympiadStarter.java | 6 +- .../Q00552_OlympiadVeteran.java | 6 +- .../Q00553_OlympiadUndefeated.java | 6 +- .../Q00601_WatchingEyes.java | 7 +- .../Q00602_ShadowOfLight.java | 7 +- .../Q00605_AllianceWithKetraOrcs.java | 6 +- .../Q00606_BattleAgainstVarkaSilenos.java | 6 +- .../Q00607_ProveYourCourageKetra.java | 6 +- .../Q00608_SlayTheEnemyCommanderKetra.java | 6 +- .../Q00609_MagicalPowerOfWaterPart1.java | 6 +- .../Q00610_MagicalPowerOfWaterPart2.java | 6 +- .../Q00611_AllianceWithVarkaSilenos.java | 6 +- .../Q00612_BattleAgainstKetraOrcs.java | 6 +- .../Q00613_ProveYourCourageVarka.java | 6 +- .../Q00614_SlayTheEnemyCommanderVarka.java | 6 +- .../Q00615_MagicalPowerOfFirePart1.java | 6 +- .../Q00616_MagicalPowerOfFirePart2.java | 6 +- .../Q00617_GatherTheFlames.java | 6 +- .../Q00618_IntoTheFlame.java | 7 +- .../Q00619_RelicsOfTheOldEmpire.java | 4 - .../Q00624_TheFinestIngredientsPart1.java | 38 +- .../Q00626_ADarkTwilight.java | 7 +- .../Q00627_HeartInSearchOfPower.java | 7 +- .../Q00628_HuntGoldenRam.java | 4 - .../Q00629_CleanUpTheSwampOfScreams.java | 4 - .../Q00631_DeliciousTopChoiceMeat.java | 4 - .../Q00632_NecromancersRequest.java | 4 - .../Q00633_InTheForgottenVillage.java | 4 - .../Q00636_TruthBeyond.java | 4 - .../Q00637_ThroughOnceMore.java | 4 - .../Q00638_SeekersOfTheHolyGrail.java | 4 - .../Q00639_GuardiansOfTheHolyGrail.java | 5 +- .../Q00641_AttackSailren.java | 4 - .../Q00643_RiseAndFallOfTheElrokiTribe.java | 4 - .../Q00644_GraveRobberAnnihilation.java | 4 - .../Q00645_GhostsOfBatur.java | 6 +- .../Q00646_SignsOfRevolt.java | 5 +- .../Q00647_InfluxOfMachines.java | 6 +- .../Q00649_ALooterAndARailroadMan.java | 4 - .../Q00650_ABrokenDream.java | 4 - .../Q00651_RunawayYouth.java | 6 +- .../Q00652_AnAgedExAdventurer.java | 6 +- .../Q00653_WildMaiden/Q00653_WildMaiden.java | 6 +- ...00659_IdRatherBeCollectingFairyBreath.java | 4 - .../Q00660_AidingTheFloranVillage.java | 4 - .../Q00662_AGameOfCards.java | 4 - .../Q00663_SeductiveWhispers.java | 6 +- .../Q00688_DefeatTheElrokianRaiders.java | 4 - .../Q00690_JudesRequest.java | 7 +- .../Q00691_MatrasSuspiciousRequest.java | 6 +- .../Q00692_HowtoOpposeEvil.java | 6 +- ...Q00694_BreakThroughTheHallOfSuffering.java | 6 +- .../Q00695_DefendTheHallOfSuffering.java | 6 +- .../Q00696_ConquerTheHallOfErosion.java | 6 +- .../Q00697_DefendTheHallOfErosion.java | 6 +- .../Q00698_BlockTheLordsEscape.java | 6 +- .../Q00699_GuardianOfTheSkies.java | 36 +- .../Q00700_CursedLife/Q00700_CursedLife.java | 40 +- .../Q00701_ProofOfExistence.java | 6 +- .../Q00702_ATrapForRevenge.java | 6 +- .../Q00708_PathToBecomingALordGludio.java | 7 +- .../Q00709_PathToBecomingALordDion.java | 7 +- .../Q00710_PathToBecomingALordGiran.java | 7 +- .../Q00711_PathToBecomingALordInnadril.java | 7 +- .../Q00712_PathToBecomingALordOren.java | 7 +- .../Q00713_PathToBecomingALordAden.java | 7 +- .../Q00714_PathToBecomingALordSchuttgart.java | 7 +- .../Q00715_PathToBecomingALordGoddard.java | 7 +- .../Q00716_PathToBecomingALordRune.java | 7 +- .../Q00726_LightWithinTheDarkness.java | 7 +- .../Q00901_HowLavasaurusesAreMade.java | 6 +- .../Q00902_ReclaimOurEra.java | 4 - .../Q00903_TheCallOfAntharas.java | 6 +- .../Q00905_RefinedDragonBlood.java | 6 +- .../Q00906_TheCallOfValakas.java | 6 +- .../Q00907_DragonTrophyValakas.java | 6 +- .../Q00998_FallenAngelSelect.java | 4 +- .../Q10267_JourneyToGracia.java | 6 +- .../Q10268_ToTheSeedOfInfinity.java | 6 +- .../Q10269_ToTheSeedOfDestruction.java | 6 +- .../Q10271_TheEnvelopingDarkness.java | 4 - .../Q10272_LightFragment.java | 4 - .../Q10273_GoodDayToFly.java | 6 +- .../Q10274_CollectingInTheAir.java | 4 - .../Q10275_ContainingTheAttributePower.java | 6 +- .../Q10276_MutatedKaneusGludio.java | 6 +- .../Q10277_MutatedKaneusDion.java | 6 +- .../Q10278_MutatedKaneusHeine.java | 6 +- .../Q10279_MutatedKaneusOren.java | 6 +- .../Q10280_MutatedKaneusSchuttgart.java | 6 +- .../Q10281_MutatedKaneusRune.java | 6 +- .../Q10282_ToTheSeedOfAnnihilation.java | 6 +- .../Q10288_SecretMission.java | 6 +- .../Q10289_FadeToBlack.java | 4 - .../Q10291_FireDragonDestroyer.java | 7 +- .../Q10502_FreyaEmbroideredSoulCloak.java | 6 +- .../TerritoryWarSuperClass.java | 6 +- .../scripts/quests/AbstractSagaQuest.java | 2 +- .../Q00002_WhatWomenWant.java | 2 +- .../Q00003_WillTheSealBeBroken.java | 2 +- .../Q00004_LongLiveThePaagrioLord.java | 2 +- .../Q00005_MinersFavor.java | 2 +- .../Q00101_SwordOfSolidarity.java | 232 +++++----- .../Q00102_SeaOfSporesFever.java | 294 +++++++------ .../Q00104_SpiritOfMirrors.java | 96 ++--- .../Q00105_SkirmishWithOrcs.java | 4 - .../Q00106_ForgottenTruth.java | 4 - .../Q00108_JumbleTumbleDiamondFuss.java | 5 +- .../Q00127_FishingSpecialistsRequest.java | 5 +- .../Q00151_CureForFever.java | 6 +- .../Q00152_ShardsOfGolem.java | 170 ++++---- .../Q00153_DeliverGoods.java | 132 +++--- .../Q00154_SacrificeToTheSea.java | 1 + .../Q00155_FindSirWindawood.java | 6 +- .../Q00156_MillenniumLove.java | 92 ++-- .../Q00157_RecoverSmuggledGoods.java | 42 +- .../Q00158_SeedOfEvil/Q00158_SeedOfEvil.java | 6 +- .../Q00159_ProtectTheWaterSource.java | 100 +++-- .../Q00160_NerupasRequest.java | 1 + .../Q00161_FruitOfTheMotherTree.java | 6 +- .../Q00162_CurseOfTheUndergroundFortress.java | 46 +- .../Q00163_LegacyOfThePoet.java | 44 +- .../Q00164_BloodFiend/Q00164_BloodFiend.java | 44 +- .../Q00165_ShilensHunt.java | 44 +- .../Q00166_MassOfDarkness.java | 92 ++-- .../Q00167_DwarvenKinship.java | 76 ++-- .../Q00168_DeliverSupplies.java | 166 ++++---- .../Q00169_OffspringOfNightmares.java | 42 +- .../Q00170_DangerousSeduction.java | 6 +- .../Q00257_TheGuardIsBusy.java | 4 - .../Q00258_BringWolfPelts.java | 4 - .../Q00259_RequestFromTheFarmOwner.java | 4 - .../Q00260_OrcHunting/Q00260_OrcHunting.java | 4 - .../Q00261_CollectorsDream.java | 4 - .../Q00262_TradeWithTheIvoryTower.java | 6 +- .../Q00263_OrcSubjugation.java | 6 +- .../Q00264_KeenClaws/Q00264_KeenClaws.java | 4 - .../Q00265_BondsOfSlavery.java | 4 - .../Q00266_PleasOfPixies.java | 5 +- .../Q00267_WrathOfVerdure.java | 42 +- .../Q00271_ProofOfValor.java | 68 ++- .../Q00272_WrathOfAncestors.java | 44 +- .../Q00273_InvadersOfTheHolyLand.java | 38 +- .../Q00274_SkirmishWithTheWerewolves.java | 4 - .../Q00275_DarkWingedSpies.java | 4 - .../Q00276_TotemOfTheHestui.java | 4 - .../Q00277_GatekeepersOffering.java | 6 +- .../Q00293_TheHiddenVeins.java | 4 - .../Q00297_GatekeepersFavor.java | 6 +- .../Q00300_HuntingLetoLizardman.java | 6 +- .../Q00303_CollectArrowheads.java | 6 +- .../Q00306_CrystalOfFireAndIce.java | 6 +- .../Q00313_CollectSpores.java | 6 +- .../Q00316_DestroyPlagueCarriers.java | 4 - .../Q00317_CatchTheWind.java | 4 - .../Q00319_ScentOfDeath.java | 6 +- .../Q00320_BonesTellTheFuture.java | 6 +- .../Q00324_SweetestVenom.java | 32 +- .../Q00325_GrimCollector.java | 6 +- .../Q00326_VanquishRemnants.java | 48 +-- .../Q00328_SenseForBusiness.java | 38 +- .../Q00329_CuriosityOfADwarf.java | 6 +- .../Q00331_ArrowOfVengeance.java | 38 +- .../Q00354_ConquestOfAlligatorIsland.java | 4 - .../Q00360_PlunderTheirSupplies.java | 4 - .../Q00374_WhisperOfDreamsPart1.java | 2 +- .../Q00375_WhisperOfDreamsPart2.java | 6 +- .../Q00662_AGameOfCards.java | 4 - 938 files changed, 3353 insertions(+), 6561 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java index 94e03caf28..f547c238c0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java @@ -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()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java index 2a1d45203a..59cd95e537 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java @@ -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()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java index b7da8812da..c7d21a7cff 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java index a42969d03a..eef946964a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java index 122dc68a41..12f212eff5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java index f371444897..848c880b09 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java index 7cafd26718..e82b40e3ba 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java index 85faa6afee..fb282ddc78 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java index 8eaa1af11d..de1ae29652 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java index 31249eaf1d..a1bceafc0d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java index 7ffee80974..23a8b99e2d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java @@ -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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java index 6d703356da..c1bb4bb793 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java index 5f37813750..beb75704c1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java index 9381b7fda7..5091e034e2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java index f31c72a7f0..542b8c49e9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java index a5eda7ad83..97dc71b494 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java index 4bcecf353c..db3c5409f9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java index 58ee71fd30..1b20afe586 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java @@ -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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java index 8549a291ea..299ff814a4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java index 25b602347b..438a86ea56 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java index 7f791be187..79b0a3c788 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java index f1d2edf2f1..69ebdf1555 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java index 0c1e49abc0..b90e5142b5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java index e2a2b2b86f..2156e67fb1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java index f5c33191fa..cbde91959f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java index 0ac50cae8c..6446a8e79c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java index 98a14113b5..cbe366f514 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java index 4afcd995c6..d8bf48e1d8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java index 0c0f4a790b..fb75b12734 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java index 05326d9321..c0e9504c8c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java index d202e25c8d..a2b1afebe4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java index f4c473205d..556da9f623 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java @@ -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); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java index 1dc5642fe4..557711055a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java @@ -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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java index 4f9eb0b0af..7f9f03cbc7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java index a00416910c..cecba767ca 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java index 3ab96a793b..29480b1d05 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java index 2543f0eefc..b4d909af0c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java index 86e17af3c4..3ec3602c92 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index 568fc7c863..4cd38419a1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java index 3b16335fc7..b404fdc3b7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java index 34fb7ca5bf..cf4b660f8c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java @@ -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"; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java index e7f164a4c0..76d6e56330 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java @@ -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"; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java index 0093f473af..c753988154 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java index f49a855859..0734e14ce9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java index aca0a2b6ae..b79000e374 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java index 9119e76faa..200b592da7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java index 933bd2efea..9043339b2a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java index 044b3a7aac..7365ac2d05 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java @@ -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()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java index a758078879..0c1c6731e1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java index b10503c769..b1a74d1d5c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java index 44b9fe9aee..f8fe7565d1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java index da5c9622ec..25603d93d6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java index ed9c280f6e..9528435120 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java @@ -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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java index 3ab525a589..3ce6fd9132 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java @@ -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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java index 61be883b1b..b213181e4e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index 6b68f2cd17..53c7dc8107 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -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) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java index ef565a4f9d..f984d4e2c7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java index a7c477a18b..960a8eaabf 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java index edbe0131c2..ecd4a9dabd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java index 3c5c56d53b..96bf06e868 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java @@ -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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java index 8dfe70df11..4405e35450 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java @@ -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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java index 6c9ad24221..5143fb930e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java @@ -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()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java index 1594444991..52d6818580 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java @@ -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) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java index 8e83b51ba3..43d17ab2f7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java @@ -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) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java index 37bb2cb4ba..9a519a895d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java @@ -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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index ccab36dfd7..485b980d6a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -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()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java index cdbdb5888c..e3734e785e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java index da1230bdb3..f9197ef9c3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java index 3ae6967f1a..afe4e89620 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java index 907c4ee0ba..57e97aff33 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java @@ -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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java index 10e3231701..bcb77da0c6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java @@ -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()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java index d420e15166..1270a10dad 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java @@ -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()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java index a3139dc1f6..c250f77aaa 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java @@ -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()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java index 66ed78d741..aa50cf4fc0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java index e293e69323..c6a3748e07 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java index 6968ea2726..eb83fcf0fa 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java index 027c00748d..7a836e018f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java index 021b731eca..9fa5e62685 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java index 15f89f1a7c..4bfd9fc326 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java index 41862e9a4d..e949f329ed 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java index 311685c0df..57a2abe980 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java @@ -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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java index ebe669792f..d2d83fc864 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java @@ -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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java index ea0546d6b9..cb03a5a8c6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java @@ -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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java index add1cc08a5..90665125e8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java index 897ad48897..5646eb5dfd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java index 4c9fbad86f..87e6b9afbd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java index ec6c354cc2..d928e261c5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java @@ -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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java index fbb5fe7835..5c0e50ac11 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java @@ -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; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java index 5254673040..c3171e8f44 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java @@ -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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java index 8f3e965049..3dcac18726 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java @@ -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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java index e7fb2dca53..196f5cfb3c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java index eb22e45cdf..7a78b8b4f7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java index 01523aead3..5ef242a30f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java index c1e04db7b5..1d4f07fd40 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java @@ -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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java index 0cf1bbfac6..db82cf7768 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java index 7ebc039a9c..2462e88b85 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java index fd05471ff2..723734030c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java index 157c661dc0..584cf991e7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index b3e71325e5..73cc53bfd5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java index d5402ad93b..1b400a4fe2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java @@ -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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java index d016e36f02..4b53617549 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java @@ -140,31 +140,29 @@ public class Q00699_GuardianOfTheSkies extends Quest { QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: + st = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName()); + htmltext = ((st == null) || (!st.isCompleted()) || (player.getLevel() < MIN_LVL)) ? "32557-02.htm" : "32557-01.htm"; + break; + } + case State.STARTED: + { + final long feathers = getQuestItemsCount(player, VULTURES_GOLDEN_FEATHER); + if (feathers > 0) { - st = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName()); - htmltext = ((st == null) || (!st.isCompleted()) || (player.getLevel() < MIN_LVL)) ? "32557-02.htm" : "32557-01.htm"; - break; + giveAdena(player, (feathers * VULTURES_GOLDEN_FEATHER_ADENA) + (feathers > BONUS_COUNT ? BONUS : 0), true); + takeItems(player, VULTURES_GOLDEN_FEATHER, -1); + htmltext = (feathers > BONUS_COUNT) ? "32557-07.html" : "32557-06.html"; } - case State.STARTED: + else { - final long feathers = getQuestItemsCount(player, VULTURES_GOLDEN_FEATHER); - if (feathers > 0) - { - giveAdena(player, (feathers * VULTURES_GOLDEN_FEATHER_ADENA) + (feathers > BONUS_COUNT ? BONUS : 0), true); - takeItems(player, VULTURES_GOLDEN_FEATHER, -1); - htmltext = (feathers > BONUS_COUNT) ? "32557-07.html" : "32557-06.html"; - } - else - { - htmltext = "32557-05.html"; - } - break; + htmltext = "32557-05.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java index c9910c8777..e4eaa760a9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java @@ -114,33 +114,31 @@ public class Q00700_CursedLife 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 = "32560-01.htm"; + break; + } + case State.STARTED: + { + long bones = getQuestItemsCount(player, SWALLOWED_BONES); + long ribs = getQuestItemsCount(player, SWALLOWED_STERNUM); + long skulls = getQuestItemsCount(player, SWALLOWED_SKULL); + long sum = bones + ribs + skulls; + if (sum > 0) { - htmltext = "32560-01.htm"; - break; + giveAdena(player, ((bones * SWALLOWED_BONES_ADENA) + (ribs * SWALLOWED_STERNUM_ADENA) + (skulls * SWALLOWED_SKULL_ADENA) + (sum >= 10 ? BONUS : 0)), true); + takeItems(player, -1, SWALLOWED_BONES, SWALLOWED_STERNUM, SWALLOWED_SKULL); + htmltext = sum < 10 ? "32560-07.html" : "32560-08.html"; } - case State.STARTED: + else { - long bones = getQuestItemsCount(player, SWALLOWED_BONES); - long ribs = getQuestItemsCount(player, SWALLOWED_STERNUM); - long skulls = getQuestItemsCount(player, SWALLOWED_SKULL); - long sum = bones + ribs + skulls; - if (sum > 0) - { - giveAdena(player, ((bones * SWALLOWED_BONES_ADENA) + (ribs * SWALLOWED_STERNUM_ADENA) + (skulls * SWALLOWED_SKULL_ADENA) + (sum >= 10 ? BONUS : 0)), true); - takeItems(player, -1, SWALLOWED_BONES, SWALLOWED_STERNUM, SWALLOWED_SKULL); - htmltext = sum < 10 ? "32560-07.html" : "32560-08.html"; - } - else - { - htmltext = "32560-06.html"; - } - break; + htmltext = "32560-06.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java index 59a35792c3..35f56fc417 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java @@ -137,12 +137,8 @@ public class Q00701_ProofOfExistence 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); switch (st.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java index 48665c2331..40e650abd9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java @@ -361,12 +361,8 @@ public class Q00702_ATrapForRevenge 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() == PLENOS) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java index 990a5419e1..c732336311 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java @@ -111,13 +111,9 @@ public final class Q00751_LiberatingTheSpirits 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() == RODERIK) { switch (qs.getState()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java index cb86f3ed0a..541a94f969 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java @@ -108,13 +108,9 @@ public final class Q00752_UncoverTheSecret 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() == HESET) { switch (qs.getState()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java index c5468c4bcd..14c16ede41 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java @@ -110,13 +110,9 @@ public final class Q00753_ReactingToACrisis 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() == BERNA) { switch (qs.getState()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java index dcb07a38ea..ad1c8ce542 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java @@ -75,8 +75,8 @@ public class Q00756_TopQualityPetra extends Quest @Override public String onItemTalk(L2ItemInstance item, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); boolean startQuest = false; switch (qs.getState()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java index 265c540e22..e791034bf2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java @@ -138,13 +138,9 @@ public class Q00757_TriolsMovement 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() == RADZEN) { switch (qs.getState()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java index 41ce54bc6c..9463cab32b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java @@ -138,13 +138,9 @@ public class Q00758_TheFallenKingsMen 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() == INTENDANT) { switch (qs.getState()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java index 4f773466fc..65a0a44216 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java @@ -143,7 +143,7 @@ public final class Q00761_AssistingTheGoldenRamArmy extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java index 04f87f8635..7f43e513e4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java @@ -172,7 +172,7 @@ public final class Q00762_AnOminousRequest extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java index 5b70608d0b..af9241032c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java @@ -149,7 +149,7 @@ public final class Q00763_ADauntingTask extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java index 00617a5782..fdee665c08 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java @@ -158,10 +158,7 @@ public class Q00775_RetrievingTheChaosFragment extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + if (npc.getId() == LEONA_BLACKBIRD) { switch (qs.getState()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java index f29a84fccf..47edb3d5ab 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java @@ -87,12 +87,9 @@ public class Q00776_SlayDarkLordEkimus 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 (npc.getId() == TEPIOS) { switch (qs.getState()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java index 1b496c0b00..083dea1518 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java @@ -88,12 +88,9 @@ public class Q00777_SlayDarkLordTiat 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 (npc.getId() == ALLENOS) { switch (qs.getState()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java index e33befa8af..b6b93e340a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java @@ -119,12 +119,9 @@ public class Q00778_OperationRoaringFlame 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 (npc.getId() == BRUENER) { switch (qs.getState()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java index 4be31df448..51d8ab0a10 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java @@ -193,13 +193,9 @@ public class Q00787_TheRoleOfAWatcher 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() == NAMO) { switch (qs.getState()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java index 2d42e6ec64..a39157e4df 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java @@ -153,10 +153,6 @@ public class Q00901_HowLavasaurusesAreMade extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java index a0b21a08a2..d77adbb3e6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java @@ -164,10 +164,6 @@ public final class Q00902_ReclaimOurEra extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java index db23dff402..9526ce7489 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java @@ -123,12 +123,8 @@ public class Q00903_TheCallOfAntharas 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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java index 4537e1e02a..a8342a22b2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java @@ -161,12 +161,8 @@ public final class Q00905_RefinedDragonBlood 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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java index 7b5838c6cd..37ec15bdb0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java @@ -104,12 +104,8 @@ public class Q00906_TheCallOfValakas 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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java index 8fb4293333..b892453da4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java @@ -101,12 +101,8 @@ public class Q00907_DragonTrophyValakas 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: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java index 6a556fbd28..e24927ebff 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java @@ -114,12 +114,8 @@ public class Q00943_FillingTheEnergyOfDestruction 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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java index 02b18583d5..11501a86b8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java @@ -132,10 +132,6 @@ public class Q10273_GoodDayToFly extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } final int transform = qs.getInt("transform"); switch (qs.getState()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java index 6586a1b2db..c656aadbf4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java @@ -126,10 +126,6 @@ public class Q10274_CollectingInTheAir extends Quest { String htmltext = getNoQuestMsg(player); QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java index e43b35992a..a5ff268b25 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java @@ -176,10 +176,6 @@ public class Q10275_ContainingTheAttributePower extends Quest { String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java index 5183782505..1b3c7f096d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java @@ -82,10 +82,6 @@ public final class Q10282_ToTheSeedOfAnnihilation 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()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java index 29c70d67f3..e144a76d5e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java @@ -123,10 +123,6 @@ public class Q10283_RequestOfIceMerchant extends Quest { String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java index e583b78cc3..488485b419 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java @@ -122,10 +122,6 @@ public class Q10288_SecretMission extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java index 988c25a824..f0a86954cb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java @@ -239,10 +239,6 @@ public class Q10289_FadeToBlack extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } if (qs.isCreated()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java index 3fcaa6427f..78889d17f5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java @@ -111,11 +111,6 @@ public class Q10291_FireDragonDestroyer extends Quest String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st == null) - { - return htmltext; - } - switch (st.getState()) { case State.CREATED: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java index 7a00fb7b98..1e2c17e41f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java @@ -155,8 +155,8 @@ public class Q10303_CrossroadsBetweenLightAndDarkness extends Quest @Override public String onItemTalk(L2ItemInstance item, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); if (qs.isCompleted()) { htmltext = getNoQuestMsg(player); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java index 3bf4adf8ae..6ddaa2c637 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java @@ -242,8 +242,8 @@ public class Q10304_ForForgottenHeroes extends Quest @Override public String onItemTalk(L2ItemInstance item, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); final QuestState qs1 = player.getQuestState(Q10302_UnsettlingShadowAndRumors.class.getSimpleName()); boolean startQuest = false; switch (qs.getState()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java index 390a0689c4..4976225bed 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java @@ -93,10 +93,7 @@ public final class Q10307_TheCorruptedLeaderHisTruth extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (npc.getId()) { case NAOMI_KASHERON: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java index c60fda9625..861b299742 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java @@ -88,10 +88,7 @@ public final class Q10311_PeacefulDaysAreOver extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (npc.getId()) { case SELINA: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java index 152136e335..eb5c503cf5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java @@ -114,10 +114,7 @@ public final class Q10312_AbandonedGodsCreature extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + if (qs.isCreated()) { htmltext = "33031-01.htm"; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java index 0bc1de1c05..b0aefbc199 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java @@ -93,10 +93,7 @@ public final class Q10315_ToThePrisonOfDarkness extends Quest final QuestState qs1 = player.getQuestState(Q10307_TheCorruptedLeaderHisTruth.class.getSimpleName()); final QuestState qs2 = player.getQuestState(Q10311_PeacefulDaysAreOver.class.getSimpleName()); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java index 6dc82eb03a..adbb5ce5da 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java @@ -117,19 +117,12 @@ public final class Q10316_UndecayingMemoryOfThePast 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 == OPERA) - { - htmltext = "32946-01.htm"; - } + htmltext = "32946-01.htm"; break; } case State.STARTED: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java index ccf96c977a..09fec4436e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java @@ -87,10 +87,7 @@ public final class Q10317_OrbisWitch extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (npc.getId()) { case OPERA: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java index 2e8c0b76fc..136e523cca 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java @@ -112,10 +112,6 @@ public final class Q10318_DecayingDarkness 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()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java index 808e82ea4f..e09d4e7d27 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java @@ -153,7 +153,7 @@ public final class Q10322_SearchingForTheMysteriousPower extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java index ef4642e43e..c50bf2ed94 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java @@ -146,7 +146,7 @@ public final class Q10323_TrainLikeItsReal extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java index 8791eec687..4098b78da0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java @@ -131,7 +131,7 @@ public final class Q10325_SearchingForNewPower extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java index 899aab4af2..372f446bc8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java @@ -186,7 +186,7 @@ public final class Q10326_RespectYourElders extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java index 2e6fb159af..677f5e91a8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java @@ -93,7 +93,7 @@ public final class Q10327_IntruderWhoWantsTheBookOfGiants extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10328_RequestToSealTheEvilFragment/Q10328_RequestToSealTheEvilFragment.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10328_RequestToSealTheEvilFragment/Q10328_RequestToSealTheEvilFragment.java index 8d208a62ec..8e7decf7b5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10328_RequestToSealTheEvilFragment/Q10328_RequestToSealTheEvilFragment.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10328_RequestToSealTheEvilFragment/Q10328_RequestToSealTheEvilFragment.java @@ -93,7 +93,7 @@ public final class Q10328_RequestToSealTheEvilFragment extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java index 1adb578e90..a2c9e77d46 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java @@ -244,7 +244,7 @@ public final class Q10329_BackupSeekers extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java index a4700856d0..d03c4ff79f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java @@ -324,7 +324,7 @@ public final class Q10331_StartOfFate extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java index 93fbc1b28b..e59e46d164 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java @@ -109,7 +109,7 @@ public final class Q10339_FightingTheForgotten extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java index 4f261a2848..1d1e01f92c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java @@ -96,20 +96,12 @@ public final class Q10351_OwnerOfHall 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 == LYDIA) - { - htmltext = "32892-01.htm"; - } + htmltext = "32892-01.htm"; break; } case State.STARTED: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java index 92293d2c57..db54151757 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java @@ -144,10 +144,7 @@ public final class Q10353_CertificationOfValue extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java index ebec723c8d..731babaa45 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java @@ -95,19 +95,12 @@ public final class Q10354_ResurrectedOwnerOfHall 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 == LYDIA) - { - htmltext = "32892-01.htm"; - } + htmltext = "32892-01.htm"; break; } case State.STARTED: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java index 1002f1336d..0053eece49 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java @@ -269,7 +269,7 @@ public final class Q10360_CertificationOfFate extends Quest String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if ((st == null) || (player.getRace() == Race.ERTHEIA) || (player.getLevel() < MIN_LEVEL)) + if ((player.getRace() == Race.ERTHEIA) || (player.getLevel() < MIN_LEVEL)) { return htmltext; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10361_RolesOfTheSeeker/Q10361_RolesOfTheSeeker.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10361_RolesOfTheSeeker/Q10361_RolesOfTheSeeker.java index 4ebeef34a1..7d3b6aceeb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10361_RolesOfTheSeeker/Q10361_RolesOfTheSeeker.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10361_RolesOfTheSeeker/Q10361_RolesOfTheSeeker.java @@ -89,7 +89,7 @@ public final class Q10361_RolesOfTheSeeker extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java index ffaf097c19..0e73ac5307 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java @@ -146,7 +146,7 @@ public final class Q10362_CertificationOfTheSeeker extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java index f581f2413a..d46a7679c7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java @@ -127,7 +127,7 @@ public final class Q10363_RequestOfTheSeeker extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java index fea5f20781..1d885eec3a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java @@ -133,7 +133,7 @@ public final class Q10364_ObligationsOfTheSeeker extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java index 73940fe8fc..61a2a24a9a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java @@ -266,7 +266,7 @@ public final class Q10365_SeekerEscort extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java index bfdd3b56e1..faba27d73f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java @@ -161,7 +161,7 @@ public final class Q10366_RuinsStatusUpdate extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java index ac877828b0..7d11890d82 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java @@ -109,11 +109,7 @@ public class Q10374_ThatPlaceSuccubus extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; - if (qs == null) - { - return htmltext; - } + String htmltext = getNoQuestMsg(player); if ((npc.getId() == ZENYA) && (player.getClassId().level() == ClassLevel.THIRD.ordinal())) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java index a34c606824..a6f0510941 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java @@ -157,12 +157,8 @@ public final class Q10377_TheInvadedExecutionGrounds 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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java index 0b227fbd41..3505bda7a1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java @@ -104,11 +104,6 @@ public final class Q10381_ToTheSeedOfHellfire extends Quest final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } - switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java index 7e5b250c0f..8cbe5bed6e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java @@ -88,12 +88,8 @@ public class Q10388_ConspiracyBehindDoor 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); final int npcId = npc.getId(); switch (qs.getState()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java index 2d2a71927e..4c7045a813 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java @@ -99,12 +99,8 @@ public class Q10389_TheVoiceOfAuthority 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()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java index 68a832ccee..e6b1d5c993 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java @@ -96,7 +96,7 @@ public final class Q10409_ASuspiciousVagabondInTheSwamp extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java index 88dc4ea94a..b485792a30 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java @@ -96,7 +96,7 @@ public final class Q10412_ASuspiciousVagabondInTheForest extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java index 90ea53ee79..edafc33194 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java @@ -94,7 +94,7 @@ public final class Q10416_InSearchOfTheEyeOfArgos extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java index 32933c074e..f4f02c3edd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java @@ -108,7 +108,7 @@ public final class Q10417_DaimonTheWhiteEyed extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); if (st.getState() == State.CREATED) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java index 83fdd25119..d065756bd4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java @@ -109,8 +109,8 @@ public final class Q10422_AssassinationOfTheVarkaSilenosChief 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 (npc.getId() == HANSEN) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java index e5c35231e2..ba0ab82b44 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java @@ -109,8 +109,8 @@ public final class Q10427_AssassinationOfTheKetraOrcChief 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 (npc.getId() == LUGONNES) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10432_ChasingVarangka/Q10432_ChasingVarangka.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10432_ChasingVarangka/Q10432_ChasingVarangka.java index 839d776c99..28cd9f91dd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10432_ChasingVarangka/Q10432_ChasingVarangka.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10432_ChasingVarangka/Q10432_ChasingVarangka.java @@ -108,10 +108,6 @@ public class Q10432_ChasingVarangka extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds.java index bee95ee518..eacd45eb0a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds.java @@ -161,10 +161,7 @@ public class Q10434_TheSealOfPunishmentSelMahumTrainingGrounds extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10435_ChasingKeltron/Q10435_ChasingKeltron.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10435_ChasingKeltron/Q10435_ChasingKeltron.java index 194ac3b610..25395f9ad4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10435_ChasingKeltron/Q10435_ChasingKeltron.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10435_ChasingKeltron/Q10435_ChasingKeltron.java @@ -105,10 +105,6 @@ public class Q10435_ChasingKeltron extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen.java index 6a2f129b06..d8a35826a7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen.java @@ -153,10 +153,7 @@ public class Q10437_TheSealOfPunishmentPlainsOfTheLizardmen extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10438_ChasingLoygen/Q10438_ChasingLoygen.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10438_ChasingLoygen/Q10438_ChasingLoygen.java index 6b30f30456..e77ec97320 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10438_ChasingLoygen/Q10438_ChasingLoygen.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10438_ChasingLoygen/Q10438_ChasingLoygen.java @@ -106,10 +106,6 @@ public class Q10438_ChasingLoygen extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10441_ChasingMeccadan/Q10441_ChasingMeccadan.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10441_ChasingMeccadan/Q10441_ChasingMeccadan.java index da088b7aef..1cfca419d9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10441_ChasingMeccadan/Q10441_ChasingMeccadan.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10441_ChasingMeccadan/Q10441_ChasingMeccadan.java @@ -139,10 +139,6 @@ public class Q10441_ChasingMeccadan extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java index b89f96cfa5..e089032c0d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java @@ -97,11 +97,8 @@ public final class Q10443_TheAnnihilatedPlains2 extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; - if (qs == null) - { - return null; - } + String htmltext = getNoQuestMsg(player); + switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java index 944cd840b3..5e90857618 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java @@ -98,7 +98,7 @@ public final class Q10444_TheOriginOfMonsters extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java index da132be681..d220f643b0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java @@ -100,20 +100,13 @@ public final class Q10446_HitAndRun 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 == BRUENER) - { - htmltext = "33840-01.htm"; - break; - } + htmltext = "33840-01.htm"; + break; } case State.STARTED: { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java index 2599a2a8af..9e7ccd3f5a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java @@ -113,20 +113,13 @@ public class Q10447_TimingIsEverything 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 == BRUENER) - { - htmltext = "33840-01.htm"; - break; - } + htmltext = "33840-01.htm"; + break; } case State.STARTED: { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java index 6369f6494a..4b74d4587b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java @@ -94,10 +94,7 @@ public final class Q10452_IsItEdible extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + if (qs.isCreated()) { htmltext = "32743-01.htm"; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java index 94cf707091..4faa73b2c8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java @@ -103,10 +103,6 @@ public class Q10455_ElikiasLetter extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java index 14d3d0ec4b..1ce9fe1b48 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java @@ -96,10 +96,6 @@ public class Q10459_ASickAmbition extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java index c208e16aae..a1644bd81c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java @@ -94,11 +94,6 @@ public final class Q10461_TappingThePowerWithin extends Quest final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } - switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java index eb2dc83d9f..e973c51135 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java @@ -91,11 +91,6 @@ public final class Q10701_TheRoadToDestruction extends Quest final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } - switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java index 8187f8ba1f..1d6d2955ca 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java @@ -91,11 +91,6 @@ public final class Q10702_TheRoadToInfinity extends Quest final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } - switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java index 5a337ecc5d..e788c57e3c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java @@ -96,16 +96,12 @@ public final class Q10703_BottleOfIstinasSoul 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) && (getQuestItemsCount(player, ISTINAS_SOUL_BOTTLE) >= 1)) + if (getQuestItemsCount(player, ISTINAS_SOUL_BOTTLE) >= 1) { htmltext = "33293-01.html"; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java index 54b87bb1d0..553c3de339 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java @@ -97,16 +97,12 @@ public final class Q10704_BottleOfOctavisSoul 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 == LYDIA) && (getQuestItemsCount(player, OCTAVIS_SOUL_BOTTLE) >= 1)) + if (getQuestItemsCount(player, OCTAVIS_SOUL_BOTTLE) >= 1) { htmltext = "32892-01.html"; } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java index f69687fc64..e55c53fb1a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java @@ -97,16 +97,12 @@ public final class Q10705_BottleOfTautisSoul 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 == FERGASON) && (getQuestItemsCount(player, BOTTLE_OF_TAUTIS_SOUL) >= 1)) + if (getQuestItemsCount(player, BOTTLE_OF_TAUTIS_SOUL) >= 1) { htmltext = "33681-01.html"; break; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java index a1adacaa4d..3d92416050 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java @@ -122,11 +122,6 @@ public final class Q10707_FlamesOfSorrow extends Quest String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st == null) - { - return htmltext; - } - switch (st.getState()) { case State.CREATED: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java index a147692e11..071758b8f3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java @@ -120,11 +120,6 @@ public final class Q10708_StrengthenTheBarrier extends Quest String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st == null) - { - return htmltext; - } - switch (st.getState()) { case State.CREATED: diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10712_TheMinstrelsSongPart1/Q10712_TheMinstrelsSongPart1.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10712_TheMinstrelsSongPart1/Q10712_TheMinstrelsSongPart1.java index 18f7432b55..f8b51f4aff 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10712_TheMinstrelsSongPart1/Q10712_TheMinstrelsSongPart1.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10712_TheMinstrelsSongPart1/Q10712_TheMinstrelsSongPart1.java @@ -85,10 +85,7 @@ public final class Q10712_TheMinstrelsSongPart1 extends LetterQuest { final QuestState qs = getQuestState(player, false); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + if (qs.isStarted() && (npc.getId() == LIBERATTO)) { htmltext = "33955-01.html"; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10731_TheMinstrelsSongPart6/Q10731_TheMinstrelsSongPart6.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10731_TheMinstrelsSongPart6/Q10731_TheMinstrelsSongPart6.java index 5fb61f265a..28c755f4d3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10731_TheMinstrelsSongPart6/Q10731_TheMinstrelsSongPart6.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10731_TheMinstrelsSongPart6/Q10731_TheMinstrelsSongPart6.java @@ -24,8 +24,8 @@ import com.l2jmobius.gameserver.model.quest.QuestState; import quests.LetterQuest; /** - * The Minstrel's Song, Part 1 (10712) - * @URL https://l2wiki.com/The_Minstrel%27s_Song,_Part_1 + * The Minstrel's Song, Part 6 (10731) + * @URL https://l2wiki.com/The_Minstrel%27s_Song,_Part_6 * @author Gigi */ public final class Q10731_TheMinstrelsSongPart6 extends LetterQuest diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java index 2d254c5886..0efb5383f4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java @@ -110,11 +110,8 @@ public class Q10767_AWholeNewLevelOfAlchemy extends Quest { case State.CREATED: { - if (npc.getId() == VERUTI) - { - htmltext = "33977-01.htm"; - break; - } + htmltext = "33977-01.htm"; + break; } case State.STARTED: { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java index 94e03caf28..f547c238c0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java @@ -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()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java index 2a1d45203a..59cd95e537 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java @@ -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()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java index b7da8812da..c7d21a7cff 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java index a42969d03a..eef946964a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java index 122dc68a41..12f212eff5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java index f371444897..848c880b09 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java index 7cafd26718..e82b40e3ba 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java index 85faa6afee..fb282ddc78 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java index 8eaa1af11d..de1ae29652 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java index 31249eaf1d..a1bceafc0d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java index 7ffee80974..23a8b99e2d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java @@ -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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java index 6d703356da..c1bb4bb793 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java index 5f37813750..beb75704c1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java index 9381b7fda7..5091e034e2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java index f31c72a7f0..542b8c49e9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java index a5eda7ad83..97dc71b494 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java index 4bcecf353c..db3c5409f9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java index 58ee71fd30..1b20afe586 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java @@ -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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java index 8549a291ea..299ff814a4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java index 25b602347b..438a86ea56 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java index 7f791be187..79b0a3c788 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java index f1d2edf2f1..69ebdf1555 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java index 0c1e49abc0..b90e5142b5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java index e2a2b2b86f..2156e67fb1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java index f5c33191fa..cbde91959f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java index 0ac50cae8c..6446a8e79c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java index 98a14113b5..cbe366f514 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java index 4afcd995c6..d8bf48e1d8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java index 0c0f4a790b..fb75b12734 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java index 05326d9321..c0e9504c8c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java index d202e25c8d..a2b1afebe4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java index f4c473205d..556da9f623 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java @@ -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); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java index 1dc5642fe4..557711055a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java @@ -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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java index 4f9eb0b0af..7f9f03cbc7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java index a00416910c..cecba767ca 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java index 3ab96a793b..29480b1d05 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java index 2543f0eefc..b4d909af0c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java index 86e17af3c4..3ec3602c92 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index 568fc7c863..4cd38419a1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java index 3b16335fc7..b404fdc3b7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java index 34fb7ca5bf..cf4b660f8c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java @@ -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"; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java index e7f164a4c0..76d6e56330 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java @@ -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"; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java index 0093f473af..c753988154 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java index f49a855859..0734e14ce9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java index aca0a2b6ae..b79000e374 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java index 9119e76faa..200b592da7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java index 933bd2efea..9043339b2a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java index 044b3a7aac..7365ac2d05 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java @@ -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()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java index a758078879..0c1c6731e1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java index b10503c769..b1a74d1d5c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java index 44b9fe9aee..f8fe7565d1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java index da5c9622ec..25603d93d6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java index ed9c280f6e..9528435120 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java @@ -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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java index 3ab525a589..3ce6fd9132 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java @@ -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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java index 61be883b1b..b213181e4e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java index ef565a4f9d..f984d4e2c7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java index a7c477a18b..960a8eaabf 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java index edbe0131c2..ecd4a9dabd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java index 3c5c56d53b..96bf06e868 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java @@ -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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java index 8dfe70df11..4405e35450 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java @@ -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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java index 6c9ad24221..5143fb930e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java @@ -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()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java index 1594444991..52d6818580 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java @@ -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) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java index 8e83b51ba3..43d17ab2f7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java @@ -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) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java index 37bb2cb4ba..9a519a895d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java @@ -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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index ccab36dfd7..485b980d6a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -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()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java index cdbdb5888c..e3734e785e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java index da1230bdb3..f9197ef9c3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java index 3ae6967f1a..afe4e89620 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java index 907c4ee0ba..57e97aff33 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java @@ -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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java index 10e3231701..bcb77da0c6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java @@ -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()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java index d420e15166..1270a10dad 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java @@ -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()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java index a3139dc1f6..c250f77aaa 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java @@ -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()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java index 66ed78d741..aa50cf4fc0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java index e293e69323..c6a3748e07 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java index 6968ea2726..eb83fcf0fa 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java index 027c00748d..7a836e018f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java index 021b731eca..9fa5e62685 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java index 15f89f1a7c..4bfd9fc326 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java index 41862e9a4d..e949f329ed 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java index 311685c0df..57a2abe980 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java @@ -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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java index ebe669792f..d2d83fc864 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java @@ -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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java index ea0546d6b9..cb03a5a8c6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java @@ -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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java index add1cc08a5..90665125e8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java index 897ad48897..5646eb5dfd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java index 4c9fbad86f..87e6b9afbd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java index ec6c354cc2..d928e261c5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java @@ -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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java index 5254673040..c3171e8f44 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java @@ -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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java index 8f3e965049..3dcac18726 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java @@ -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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java index e7fb2dca53..196f5cfb3c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java index eb22e45cdf..7a78b8b4f7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java index 01523aead3..5ef242a30f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java index c1e04db7b5..1d4f07fd40 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java @@ -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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java index 0cf1bbfac6..db82cf7768 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java index 7ebc039a9c..2462e88b85 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java index fd05471ff2..723734030c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java index 157c661dc0..584cf991e7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index b3e71325e5..73cc53bfd5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java index d5402ad93b..1b400a4fe2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java @@ -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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java index 990a5419e1..c732336311 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java @@ -111,13 +111,9 @@ public final class Q00751_LiberatingTheSpirits 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() == RODERIK) { switch (qs.getState()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java index cb86f3ed0a..541a94f969 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java @@ -108,13 +108,9 @@ public final class Q00752_UncoverTheSecret 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() == HESET) { switch (qs.getState()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java index c5468c4bcd..14c16ede41 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java @@ -110,13 +110,9 @@ public final class Q00753_ReactingToACrisis 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() == BERNA) { switch (qs.getState()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java index dcb07a38ea..ad1c8ce542 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java @@ -75,8 +75,8 @@ public class Q00756_TopQualityPetra extends Quest @Override public String onItemTalk(L2ItemInstance item, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); boolean startQuest = false; switch (qs.getState()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java index 265c540e22..e791034bf2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java @@ -138,13 +138,9 @@ public class Q00757_TriolsMovement 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() == RADZEN) { switch (qs.getState()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java index 41ce54bc6c..9463cab32b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java @@ -138,13 +138,9 @@ public class Q00758_TheFallenKingsMen 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() == INTENDANT) { switch (qs.getState()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java index 6eb8902d03..52d23eed89 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java @@ -95,7 +95,7 @@ public final class Q00760_BlockTheExit extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java index 4f773466fc..65a0a44216 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java @@ -143,7 +143,7 @@ public final class Q00761_AssistingTheGoldenRamArmy extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java index 04f87f8635..7f43e513e4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java @@ -172,7 +172,7 @@ public final class Q00762_AnOminousRequest extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java index 5b70608d0b..af9241032c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java @@ -149,7 +149,7 @@ public final class Q00763_ADauntingTask extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java index 00617a5782..fdee665c08 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java @@ -158,10 +158,7 @@ public class Q00775_RetrievingTheChaosFragment extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + if (npc.getId() == LEONA_BLACKBIRD) { switch (qs.getState()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java index f29a84fccf..47edb3d5ab 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java @@ -87,12 +87,9 @@ public class Q00776_SlayDarkLordEkimus 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 (npc.getId() == TEPIOS) { switch (qs.getState()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java index 1b496c0b00..083dea1518 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java @@ -88,12 +88,9 @@ public class Q00777_SlayDarkLordTiat 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 (npc.getId() == ALLENOS) { switch (qs.getState()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java index e33befa8af..b6b93e340a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java @@ -119,12 +119,9 @@ public class Q00778_OperationRoaringFlame 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 (npc.getId() == BRUENER) { switch (qs.getState()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java index 5a3c175b09..ddece50d18 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java @@ -139,12 +139,9 @@ public class Q00783_VestigeOfTheMagicPower 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 (npc.getId() == LEONA_BLACKBIRD) { switch (qs.getState()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java index 4be31df448..51d8ab0a10 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java @@ -193,13 +193,9 @@ public class Q00787_TheRoleOfAWatcher 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() == NAMO) { switch (qs.getState()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java index 2d42e6ec64..a39157e4df 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java @@ -153,10 +153,6 @@ public class Q00901_HowLavasaurusesAreMade extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java index a0b21a08a2..d77adbb3e6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java @@ -164,10 +164,6 @@ public final class Q00902_ReclaimOurEra extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java index db23dff402..9526ce7489 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java @@ -123,12 +123,8 @@ public class Q00903_TheCallOfAntharas 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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java index 4537e1e02a..a8342a22b2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java @@ -161,12 +161,8 @@ public final class Q00905_RefinedDragonBlood 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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java index 7b5838c6cd..37ec15bdb0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java @@ -104,12 +104,8 @@ public class Q00906_TheCallOfValakas 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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java index 8fb4293333..b892453da4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java @@ -101,12 +101,8 @@ public class Q00907_DragonTrophyValakas 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: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java index 6a556fbd28..e24927ebff 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00943_FillingTheEnergyOfDestruction/Q00943_FillingTheEnergyOfDestruction.java @@ -114,12 +114,8 @@ public class Q00943_FillingTheEnergyOfDestruction 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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java index 02b18583d5..11501a86b8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java @@ -132,10 +132,6 @@ public class Q10273_GoodDayToFly extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } final int transform = qs.getInt("transform"); switch (qs.getState()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java index 6586a1b2db..c656aadbf4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java @@ -126,10 +126,6 @@ public class Q10274_CollectingInTheAir extends Quest { String htmltext = getNoQuestMsg(player); QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java index e43b35992a..a5ff268b25 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java @@ -176,10 +176,6 @@ public class Q10275_ContainingTheAttributePower extends Quest { String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java index 5183782505..1b3c7f096d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java @@ -82,10 +82,6 @@ public final class Q10282_ToTheSeedOfAnnihilation 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()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java index 29c70d67f3..e144a76d5e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java @@ -123,10 +123,6 @@ public class Q10283_RequestOfIceMerchant extends Quest { String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java index e583b78cc3..488485b419 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java @@ -122,10 +122,6 @@ public class Q10288_SecretMission extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java index 988c25a824..f0a86954cb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java @@ -239,10 +239,6 @@ public class Q10289_FadeToBlack extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } if (qs.isCreated()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java index 3fcaa6427f..78889d17f5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java @@ -111,11 +111,6 @@ public class Q10291_FireDragonDestroyer extends Quest String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st == null) - { - return htmltext; - } - switch (st.getState()) { case State.CREATED: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java index 62c0bfab2e..20ca998162 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java @@ -147,11 +147,6 @@ public final class Q10297_GrandOpeningComeToOurPub extends Quest final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } - switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java index 7a00fb7b98..1e2c17e41f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java @@ -155,8 +155,8 @@ public class Q10303_CrossroadsBetweenLightAndDarkness extends Quest @Override public String onItemTalk(L2ItemInstance item, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); if (qs.isCompleted()) { htmltext = getNoQuestMsg(player); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java index 3bf4adf8ae..6ddaa2c637 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java @@ -242,8 +242,8 @@ public class Q10304_ForForgottenHeroes extends Quest @Override public String onItemTalk(L2ItemInstance item, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); final QuestState qs1 = player.getQuestState(Q10302_UnsettlingShadowAndRumors.class.getSimpleName()); boolean startQuest = false; switch (qs.getState()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java index 390a0689c4..4976225bed 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java @@ -93,10 +93,7 @@ public final class Q10307_TheCorruptedLeaderHisTruth extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (npc.getId()) { case NAOMI_KASHERON: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java index c60fda9625..861b299742 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java @@ -88,10 +88,7 @@ public final class Q10311_PeacefulDaysAreOver extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (npc.getId()) { case SELINA: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java index 152136e335..eb5c503cf5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java @@ -114,10 +114,7 @@ public final class Q10312_AbandonedGodsCreature extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + if (qs.isCreated()) { htmltext = "33031-01.htm"; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java index 0bc1de1c05..b0aefbc199 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java @@ -93,10 +93,7 @@ public final class Q10315_ToThePrisonOfDarkness extends Quest final QuestState qs1 = player.getQuestState(Q10307_TheCorruptedLeaderHisTruth.class.getSimpleName()); final QuestState qs2 = player.getQuestState(Q10311_PeacefulDaysAreOver.class.getSimpleName()); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java index 6dc82eb03a..adbb5ce5da 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java @@ -117,19 +117,12 @@ public final class Q10316_UndecayingMemoryOfThePast 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 == OPERA) - { - htmltext = "32946-01.htm"; - } + htmltext = "32946-01.htm"; break; } case State.STARTED: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java index ccf96c977a..09fec4436e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java @@ -87,10 +87,7 @@ public final class Q10317_OrbisWitch extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (npc.getId()) { case OPERA: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java index 2e8c0b76fc..136e523cca 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java @@ -112,10 +112,6 @@ public final class Q10318_DecayingDarkness 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()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java index 808e82ea4f..e09d4e7d27 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10322_SearchingForTheMysteriousPower/Q10322_SearchingForTheMysteriousPower.java @@ -153,7 +153,7 @@ public final class Q10322_SearchingForTheMysteriousPower extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java index ef4642e43e..c50bf2ed94 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10323_TrainLikeItsReal/Q10323_TrainLikeItsReal.java @@ -146,7 +146,7 @@ public final class Q10323_TrainLikeItsReal extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java index 8791eec687..4098b78da0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10325_SearchingForNewPower/Q10325_SearchingForNewPower.java @@ -131,7 +131,7 @@ public final class Q10325_SearchingForNewPower extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java index 899aab4af2..372f446bc8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10326_RespectYourElders/Q10326_RespectYourElders.java @@ -186,7 +186,7 @@ public final class Q10326_RespectYourElders extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java index 2e6fb159af..677f5e91a8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10327_IntruderWhoWantsTheBookOfGiants/Q10327_IntruderWhoWantsTheBookOfGiants.java @@ -93,7 +93,7 @@ public final class Q10327_IntruderWhoWantsTheBookOfGiants extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10328_RequestToSealTheEvilFragment/Q10328_RequestToSealTheEvilFragment.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10328_RequestToSealTheEvilFragment/Q10328_RequestToSealTheEvilFragment.java index 8d208a62ec..8e7decf7b5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10328_RequestToSealTheEvilFragment/Q10328_RequestToSealTheEvilFragment.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10328_RequestToSealTheEvilFragment/Q10328_RequestToSealTheEvilFragment.java @@ -93,7 +93,7 @@ public final class Q10328_RequestToSealTheEvilFragment extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java index 1adb578e90..a2c9e77d46 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10329_BackupSeekers/Q10329_BackupSeekers.java @@ -244,7 +244,7 @@ public final class Q10329_BackupSeekers extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java index a4700856d0..d03c4ff79f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java @@ -324,7 +324,7 @@ public final class Q10331_StartOfFate extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java index 93fbc1b28b..e59e46d164 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java @@ -109,7 +109,7 @@ public final class Q10339_FightingTheForgotten extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java index 4f261a2848..1d1e01f92c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java @@ -96,20 +96,12 @@ public final class Q10351_OwnerOfHall 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 == LYDIA) - { - htmltext = "32892-01.htm"; - } + htmltext = "32892-01.htm"; break; } case State.STARTED: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java index 92293d2c57..db54151757 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java @@ -144,10 +144,7 @@ public final class Q10353_CertificationOfValue extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java index ebec723c8d..731babaa45 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java @@ -95,19 +95,12 @@ public final class Q10354_ResurrectedOwnerOfHall 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 == LYDIA) - { - htmltext = "32892-01.htm"; - } + htmltext = "32892-01.htm"; break; } case State.STARTED: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java index 1002f1336d..0053eece49 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java @@ -269,7 +269,7 @@ public final class Q10360_CertificationOfFate extends Quest String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if ((st == null) || (player.getRace() == Race.ERTHEIA) || (player.getLevel() < MIN_LEVEL)) + if ((player.getRace() == Race.ERTHEIA) || (player.getLevel() < MIN_LEVEL)) { return htmltext; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10361_RolesOfTheSeeker/Q10361_RolesOfTheSeeker.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10361_RolesOfTheSeeker/Q10361_RolesOfTheSeeker.java index 4ebeef34a1..7d3b6aceeb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10361_RolesOfTheSeeker/Q10361_RolesOfTheSeeker.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10361_RolesOfTheSeeker/Q10361_RolesOfTheSeeker.java @@ -89,7 +89,7 @@ public final class Q10361_RolesOfTheSeeker extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java index ffaf097c19..0e73ac5307 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java @@ -146,7 +146,7 @@ public final class Q10362_CertificationOfTheSeeker extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java index f581f2413a..d46a7679c7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java @@ -127,7 +127,7 @@ public final class Q10363_RequestOfTheSeeker extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java index fea5f20781..1d885eec3a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java @@ -133,7 +133,7 @@ public final class Q10364_ObligationsOfTheSeeker extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java index 73940fe8fc..61a2a24a9a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10365_SeekerEscort/Q10365_SeekerEscort.java @@ -266,7 +266,7 @@ public final class Q10365_SeekerEscort extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java index bfdd3b56e1..faba27d73f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10366_RuinsStatusUpdate/Q10366_RuinsStatusUpdate.java @@ -161,7 +161,7 @@ public final class Q10366_RuinsStatusUpdate extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java index ac877828b0..7d11890d82 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java @@ -109,11 +109,7 @@ public class Q10374_ThatPlaceSuccubus extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; - if (qs == null) - { - return htmltext; - } + String htmltext = getNoQuestMsg(player); if ((npc.getId() == ZENYA) && (player.getClassId().level() == ClassLevel.THIRD.ordinal())) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java index a34c606824..a6f0510941 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java @@ -157,12 +157,8 @@ public final class Q10377_TheInvadedExecutionGrounds 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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java index 0b227fbd41..3505bda7a1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java @@ -104,11 +104,6 @@ public final class Q10381_ToTheSeedOfHellfire extends Quest final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } - switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java index 7e5b250c0f..8cbe5bed6e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java @@ -88,12 +88,8 @@ public class Q10388_ConspiracyBehindDoor 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); final int npcId = npc.getId(); switch (qs.getState()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java index 2d2a71927e..4c7045a813 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java @@ -99,12 +99,8 @@ public class Q10389_TheVoiceOfAuthority 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()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java index 68a832ccee..e6b1d5c993 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java @@ -96,7 +96,7 @@ public final class Q10409_ASuspiciousVagabondInTheSwamp extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java index 88dc4ea94a..b485792a30 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java @@ -96,7 +96,7 @@ public final class Q10412_ASuspiciousVagabondInTheForest extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java index 90ea53ee79..edafc33194 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java @@ -94,7 +94,7 @@ public final class Q10416_InSearchOfTheEyeOfArgos extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java index 32933c074e..f4f02c3edd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java @@ -108,7 +108,7 @@ public final class Q10417_DaimonTheWhiteEyed extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); if (st.getState() == State.CREATED) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java index 83fdd25119..d065756bd4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java @@ -109,8 +109,8 @@ public final class Q10422_AssassinationOfTheVarkaSilenosChief 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 (npc.getId() == HANSEN) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java index e5c35231e2..ba0ab82b44 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java @@ -109,8 +109,8 @@ public final class Q10427_AssassinationOfTheKetraOrcChief 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 (npc.getId() == LUGONNES) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10432_ChasingVarangka/Q10432_ChasingVarangka.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10432_ChasingVarangka/Q10432_ChasingVarangka.java index 839d776c99..28cd9f91dd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10432_ChasingVarangka/Q10432_ChasingVarangka.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10432_ChasingVarangka/Q10432_ChasingVarangka.java @@ -108,10 +108,6 @@ public class Q10432_ChasingVarangka extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds.java index bee95ee518..eacd45eb0a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds/Q10434_TheSealOfPunishmentSelMahumTrainingGrounds.java @@ -161,10 +161,7 @@ public class Q10434_TheSealOfPunishmentSelMahumTrainingGrounds extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10435_ChasingKeltron/Q10435_ChasingKeltron.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10435_ChasingKeltron/Q10435_ChasingKeltron.java index 194ac3b610..25395f9ad4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10435_ChasingKeltron/Q10435_ChasingKeltron.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10435_ChasingKeltron/Q10435_ChasingKeltron.java @@ -105,10 +105,6 @@ public class Q10435_ChasingKeltron extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen.java index 6a2f129b06..d8a35826a7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen/Q10437_TheSealOfPunishmentPlainsOfTheLizardmen.java @@ -153,10 +153,7 @@ public class Q10437_TheSealOfPunishmentPlainsOfTheLizardmen extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10438_ChasingLoygen/Q10438_ChasingLoygen.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10438_ChasingLoygen/Q10438_ChasingLoygen.java index 6b30f30456..e77ec97320 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10438_ChasingLoygen/Q10438_ChasingLoygen.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10438_ChasingLoygen/Q10438_ChasingLoygen.java @@ -106,10 +106,6 @@ public class Q10438_ChasingLoygen extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10441_ChasingMeccadan/Q10441_ChasingMeccadan.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10441_ChasingMeccadan/Q10441_ChasingMeccadan.java index da088b7aef..1cfca419d9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10441_ChasingMeccadan/Q10441_ChasingMeccadan.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10441_ChasingMeccadan/Q10441_ChasingMeccadan.java @@ -139,10 +139,6 @@ public class Q10441_ChasingMeccadan extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java index b89f96cfa5..e089032c0d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java @@ -97,11 +97,8 @@ public final class Q10443_TheAnnihilatedPlains2 extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; - if (qs == null) - { - return null; - } + String htmltext = getNoQuestMsg(player); + switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java index 944cd840b3..5e90857618 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java @@ -98,7 +98,7 @@ public final class Q10444_TheOriginOfMonsters extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java index da132be681..d220f643b0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java @@ -100,20 +100,13 @@ public final class Q10446_HitAndRun 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 == BRUENER) - { - htmltext = "33840-01.htm"; - break; - } + htmltext = "33840-01.htm"; + break; } case State.STARTED: { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java index 2599a2a8af..9e7ccd3f5a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java @@ -113,20 +113,13 @@ public class Q10447_TimingIsEverything 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 == BRUENER) - { - htmltext = "33840-01.htm"; - break; - } + htmltext = "33840-01.htm"; + break; } case State.STARTED: { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java index 6369f6494a..4b74d4587b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java @@ -94,10 +94,7 @@ public final class Q10452_IsItEdible extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + if (qs.isCreated()) { htmltext = "32743-01.htm"; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java index 94cf707091..4faa73b2c8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java @@ -103,10 +103,6 @@ public class Q10455_ElikiasLetter extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java index 14d3d0ec4b..1ce9fe1b48 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java @@ -96,10 +96,6 @@ public class Q10459_ASickAmbition extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java index c208e16aae..a1644bd81c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java @@ -94,11 +94,6 @@ public final class Q10461_TappingThePowerWithin extends Quest final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } - switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java index eb2dc83d9f..e973c51135 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java @@ -91,11 +91,6 @@ public final class Q10701_TheRoadToDestruction extends Quest final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } - switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java index 8187f8ba1f..1d6d2955ca 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java @@ -91,11 +91,6 @@ public final class Q10702_TheRoadToInfinity extends Quest final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } - switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java index 5a337ecc5d..e788c57e3c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java @@ -96,16 +96,12 @@ public final class Q10703_BottleOfIstinasSoul 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) && (getQuestItemsCount(player, ISTINAS_SOUL_BOTTLE) >= 1)) + if (getQuestItemsCount(player, ISTINAS_SOUL_BOTTLE) >= 1) { htmltext = "33293-01.html"; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java index 54b87bb1d0..553c3de339 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java @@ -97,16 +97,12 @@ public final class Q10704_BottleOfOctavisSoul 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 == LYDIA) && (getQuestItemsCount(player, OCTAVIS_SOUL_BOTTLE) >= 1)) + if (getQuestItemsCount(player, OCTAVIS_SOUL_BOTTLE) >= 1) { htmltext = "32892-01.html"; } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java index f69687fc64..e55c53fb1a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java @@ -97,16 +97,12 @@ public final class Q10705_BottleOfTautisSoul 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 == FERGASON) && (getQuestItemsCount(player, BOTTLE_OF_TAUTIS_SOUL) >= 1)) + if (getQuestItemsCount(player, BOTTLE_OF_TAUTIS_SOUL) >= 1) { htmltext = "33681-01.html"; break; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java index a1adacaa4d..3d92416050 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java @@ -122,11 +122,6 @@ public final class Q10707_FlamesOfSorrow extends Quest String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st == null) - { - return htmltext; - } - switch (st.getState()) { case State.CREATED: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java index a147692e11..071758b8f3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java @@ -120,11 +120,6 @@ public final class Q10708_StrengthenTheBarrier extends Quest String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st == null) - { - return htmltext; - } - switch (st.getState()) { case State.CREATED: diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10712_TheMinstrelsSongPart1/Q10712_TheMinstrelsSongPart1.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10712_TheMinstrelsSongPart1/Q10712_TheMinstrelsSongPart1.java index 18f7432b55..f8b51f4aff 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10712_TheMinstrelsSongPart1/Q10712_TheMinstrelsSongPart1.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10712_TheMinstrelsSongPart1/Q10712_TheMinstrelsSongPart1.java @@ -85,10 +85,7 @@ public final class Q10712_TheMinstrelsSongPart1 extends LetterQuest { final QuestState qs = getQuestState(player, false); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + if (qs.isStarted() && (npc.getId() == LIBERATTO)) { htmltext = "33955-01.html"; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10731_TheMinstrelsSongPart6/Q10731_TheMinstrelsSongPart6.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10731_TheMinstrelsSongPart6/Q10731_TheMinstrelsSongPart6.java index 5fb61f265a..28c755f4d3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10731_TheMinstrelsSongPart6/Q10731_TheMinstrelsSongPart6.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10731_TheMinstrelsSongPart6/Q10731_TheMinstrelsSongPart6.java @@ -24,8 +24,8 @@ import com.l2jmobius.gameserver.model.quest.QuestState; import quests.LetterQuest; /** - * The Minstrel's Song, Part 1 (10712) - * @URL https://l2wiki.com/The_Minstrel%27s_Song,_Part_1 + * The Minstrel's Song, Part 6 (10731) + * @URL https://l2wiki.com/The_Minstrel%27s_Song,_Part_6 * @author Gigi */ public final class Q10731_TheMinstrelsSongPart6 extends LetterQuest diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java index 2d254c5886..0efb5383f4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java @@ -110,11 +110,8 @@ public class Q10767_AWholeNewLevelOfAlchemy extends Quest { case State.CREATED: { - if (npc.getId() == VERUTI) - { - htmltext = "33977-01.htm"; - break; - } + htmltext = "33977-01.htm"; + break; } case State.STARTED: { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java index c9b9e000da..f3c03a26fa 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java @@ -104,10 +104,6 @@ public final class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java index 7e87c33783..2271527247 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java @@ -108,10 +108,6 @@ public final class Q10823_ExaltedOneWhoShattersTheLimit extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java index 94e03caf28..f547c238c0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java @@ -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()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java index 2a1d45203a..59cd95e537 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java @@ -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()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java index b7da8812da..c7d21a7cff 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java index a42969d03a..eef946964a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java index f371444897..848c880b09 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java index 7cafd26718..e82b40e3ba 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java index 85faa6afee..fb282ddc78 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java index 8eaa1af11d..de1ae29652 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java index 31249eaf1d..a1bceafc0d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java index 7ffee80974..23a8b99e2d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java @@ -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: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java index 6d703356da..c1bb4bb793 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java index 5f37813750..beb75704c1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java index 9381b7fda7..5091e034e2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java index f31c72a7f0..542b8c49e9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java index a5eda7ad83..97dc71b494 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java index 4bcecf353c..db3c5409f9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java index 25b602347b..438a86ea56 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java index 7f791be187..79b0a3c788 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java index e2a2b2b86f..2156e67fb1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java index f5c33191fa..cbde91959f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java index 0ac50cae8c..6446a8e79c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java index 6f56ce673e..8ad8690c0c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java index 4afcd995c6..d8bf48e1d8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java index 0c0f4a790b..fb75b12734 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java index 05326d9321..c0e9504c8c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java index d202e25c8d..a2b1afebe4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java index f4c473205d..556da9f623 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java @@ -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); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java index 1dc5642fe4..557711055a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java @@ -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: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java index 4f9eb0b0af..7f9f03cbc7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java index a00416910c..cecba767ca 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java index 3ab96a793b..29480b1d05 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java index 2543f0eefc..b4d909af0c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java index 86e17af3c4..3ec3602c92 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index 568fc7c863..4cd38419a1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java index 3b16335fc7..b404fdc3b7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java index 34fb7ca5bf..cf4b660f8c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00149_PrimalMotherIstina/Q00149_PrimalMotherIstina.java @@ -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"; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java index e7f164a4c0..76d6e56330 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00150_ExtremeChallengePrimalMotherResurrected/Q00150_ExtremeChallengePrimalMotherResurrected.java @@ -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"; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java index 0093f473af..c753988154 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00210_ObtainAWolfPet/Q00210_ObtainAWolfPet.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java index f49a855859..0734e14ce9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java index aca0a2b6ae..b79000e374 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java index 9119e76faa..200b592da7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java index 933bd2efea..9043339b2a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java index 044b3a7aac..7365ac2d05 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00245_ComeToMe/Q00245_ComeToMe.java @@ -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()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java index a758078879..0c1c6731e1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java index b10503c769..b1a74d1d5c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java index 44b9fe9aee..f8fe7565d1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java index ed9c280f6e..9528435120 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java @@ -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: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java index 61be883b1b..b213181e4e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00337_AudienceWithTheLandDragon/Q00337_AudienceWithTheLandDragon.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java index ca775d791a..ce4bed4f11 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java index 6c9ad24221..5143fb930e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java @@ -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()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java index 1594444991..52d6818580 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java @@ -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) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java index 8e83b51ba3..43d17ab2f7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java @@ -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) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java index 37bb2cb4ba..9a519a895d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java @@ -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: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index ccab36dfd7..485b980d6a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -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()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java index cdbdb5888c..e3734e785e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java index da1230bdb3..f9197ef9c3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java index 907c4ee0ba..57e97aff33 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00466_PlacingMySmallPower/Q00466_PlacingMySmallPower.java @@ -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: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java index 10e3231701..bcb77da0c6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00490_DutyOfTheSurvivor/Q00490_DutyOfTheSurvivor.java @@ -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()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java index d420e15166..1270a10dad 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00491_InNominePatris/Q00491_InNominePatris.java @@ -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()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java index a3139dc1f6..c250f77aaa 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00493_KickingOutUnwelcomeGuests/Q00493_KickingOutUnwelcomeGuests.java @@ -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()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java index 66ed78d741..aa50cf4fc0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java index e293e69323..c6a3748e07 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java index 6968ea2726..eb83fcf0fa 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java index 027c00748d..7a836e018f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java index 021b731eca..9fa5e62685 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java index 15f89f1a7c..4bfd9fc326 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java index ae819e992a..e7ea10ad5f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00500_BrothersBoundInChains/Q00500_BrothersBoundInChains.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java index 311685c0df..57a2abe980 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java @@ -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: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java index ebe669792f..d2d83fc864 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java @@ -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: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java index ea0546d6b9..cb03a5a8c6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java @@ -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: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java index add1cc08a5..90665125e8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java index 897ad48897..5646eb5dfd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java index 4c9fbad86f..87e6b9afbd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java index ec6c354cc2..d928e261c5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java @@ -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: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java index 8f3e965049..3dcac18726 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java @@ -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: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java index e7fb2dca53..196f5cfb3c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java index eb22e45cdf..7a78b8b4f7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java index 01523aead3..5ef242a30f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java index c1e04db7b5..1d4f07fd40 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java @@ -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: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java index 157c661dc0..584cf991e7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index b3e71325e5..73cc53bfd5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java index d5402ad93b..1b400a4fe2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java @@ -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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java index 990a5419e1..c732336311 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java @@ -111,13 +111,9 @@ public final class Q00751_LiberatingTheSpirits 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() == RODERIK) { switch (qs.getState()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java index cb86f3ed0a..541a94f969 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00752_UncoverTheSecret/Q00752_UncoverTheSecret.java @@ -108,13 +108,9 @@ public final class Q00752_UncoverTheSecret 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() == HESET) { switch (qs.getState()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java index c5468c4bcd..14c16ede41 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00753_ReactingToACrisis/Q00753_ReactingToACrisis.java @@ -110,13 +110,9 @@ public final class Q00753_ReactingToACrisis 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() == BERNA) { switch (qs.getState()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java index dcb07a38ea..ad1c8ce542 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00756_TopQualityPetra/Q00756_TopQualityPetra.java @@ -75,8 +75,8 @@ public class Q00756_TopQualityPetra extends Quest @Override public String onItemTalk(L2ItemInstance item, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); boolean startQuest = false; switch (qs.getState()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java index 265c540e22..e791034bf2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00757_TriolsMovement/Q00757_TriolsMovement.java @@ -138,13 +138,9 @@ public class Q00757_TriolsMovement 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() == RADZEN) { switch (qs.getState()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java index 41ce54bc6c..9463cab32b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00758_TheFallenKingsMen/Q00758_TheFallenKingsMen.java @@ -138,13 +138,9 @@ public class Q00758_TheFallenKingsMen 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() == INTENDANT) { switch (qs.getState()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java index 6eb8902d03..52d23eed89 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00760_BlockTheExit/Q00760_BlockTheExit.java @@ -95,7 +95,7 @@ public final class Q00760_BlockTheExit extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java index 4f773466fc..65a0a44216 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00761_AssistingTheGoldenRamArmy/Q00761_AssistingTheGoldenRamArmy.java @@ -143,7 +143,7 @@ public final class Q00761_AssistingTheGoldenRamArmy extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java index 04f87f8635..7f43e513e4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00762_AnOminousRequest/Q00762_AnOminousRequest.java @@ -172,7 +172,7 @@ public final class Q00762_AnOminousRequest extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java index 5b70608d0b..af9241032c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java @@ -149,7 +149,7 @@ public final class Q00763_ADauntingTask extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java index 00617a5782..fdee665c08 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00775_RetrievingTheChaosFragment/Q00775_RetrievingTheChaosFragment.java @@ -158,10 +158,7 @@ public class Q00775_RetrievingTheChaosFragment extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + if (npc.getId() == LEONA_BLACKBIRD) { switch (qs.getState()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java index f29a84fccf..47edb3d5ab 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00776_SlayDarkLordEkimus/Q00776_SlayDarkLordEkimus.java @@ -87,12 +87,9 @@ public class Q00776_SlayDarkLordEkimus 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 (npc.getId() == TEPIOS) { switch (qs.getState()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java index 1b496c0b00..083dea1518 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00777_SlayDarkLordTiat/Q00777_SlayDarkLordTiat.java @@ -88,12 +88,9 @@ public class Q00777_SlayDarkLordTiat 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 (npc.getId() == ALLENOS) { switch (qs.getState()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java index e33befa8af..b6b93e340a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java @@ -119,12 +119,9 @@ public class Q00778_OperationRoaringFlame 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 (npc.getId() == BRUENER) { switch (qs.getState()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java index 5a3c175b09..ddece50d18 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00783_VestigeOfTheMagicPower/Q00783_VestigeOfTheMagicPower.java @@ -139,12 +139,9 @@ public class Q00783_VestigeOfTheMagicPower 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 (npc.getId() == LEONA_BLACKBIRD) { switch (qs.getState()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java index 4c31797fd2..212c6b7826 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00787_TheRoleOfAWatcher/Q00787_TheRoleOfAWatcher.java @@ -192,13 +192,9 @@ public class Q00787_TheRoleOfAWatcher 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() == NAMO) { switch (qs.getState()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java index 2d42e6ec64..a39157e4df 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java @@ -153,10 +153,6 @@ public class Q00901_HowLavasaurusesAreMade extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java index a0b21a08a2..d77adbb3e6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java @@ -164,10 +164,6 @@ public final class Q00902_ReclaimOurEra extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java index db23dff402..9526ce7489 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java @@ -123,12 +123,8 @@ public class Q00903_TheCallOfAntharas 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: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java index 4537e1e02a..a8342a22b2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java @@ -161,12 +161,8 @@ public final class Q00905_RefinedDragonBlood 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: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java index 7b5838c6cd..37ec15bdb0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java @@ -104,12 +104,8 @@ public class Q00906_TheCallOfValakas 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: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java index 8fb4293333..b892453da4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java @@ -101,12 +101,8 @@ public class Q00907_DragonTrophyValakas 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: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java index 02b18583d5..11501a86b8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java @@ -132,10 +132,6 @@ public class Q10273_GoodDayToFly extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } final int transform = qs.getInt("transform"); switch (qs.getState()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java index 6586a1b2db..c656aadbf4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java @@ -126,10 +126,6 @@ public class Q10274_CollectingInTheAir extends Quest { String htmltext = getNoQuestMsg(player); QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java index e43b35992a..a5ff268b25 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java @@ -176,10 +176,6 @@ public class Q10275_ContainingTheAttributePower extends Quest { String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java index 5183782505..1b3c7f096d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java @@ -82,10 +82,6 @@ public final class Q10282_ToTheSeedOfAnnihilation 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()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java index 29c70d67f3..e144a76d5e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java @@ -123,10 +123,6 @@ public class Q10283_RequestOfIceMerchant extends Quest { String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java index e583b78cc3..488485b419 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java @@ -122,10 +122,6 @@ public class Q10288_SecretMission extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java index 988c25a824..f0a86954cb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java @@ -239,10 +239,6 @@ public class Q10289_FadeToBlack extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } if (qs.isCreated()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java index 3fcaa6427f..78889d17f5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java @@ -111,11 +111,6 @@ public class Q10291_FireDragonDestroyer extends Quest String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st == null) - { - return htmltext; - } - switch (st.getState()) { case State.CREATED: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java index 62c0bfab2e..20ca998162 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10297_GrandOpeningComeToOurPub/Q10297_GrandOpeningComeToOurPub.java @@ -147,11 +147,6 @@ public final class Q10297_GrandOpeningComeToOurPub extends Quest final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } - switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java index 7a00fb7b98..1e2c17e41f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10303_CrossroadsBetweenLightAndDarkness/Q10303_CrossroadsBetweenLightAndDarkness.java @@ -155,8 +155,8 @@ public class Q10303_CrossroadsBetweenLightAndDarkness extends Quest @Override public String onItemTalk(L2ItemInstance item, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); if (qs.isCompleted()) { htmltext = getNoQuestMsg(player); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java index 6618063fa1..569ebe4ef7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10304_ForForgottenHeroes/Q10304_ForForgottenHeroes.java @@ -242,8 +242,8 @@ public class Q10304_ForForgottenHeroes extends Quest @Override public String onItemTalk(L2ItemInstance item, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); final QuestState qs1 = player.getQuestState(Q10302_UnsettlingShadowAndRumors.class.getSimpleName()); boolean startQuest = false; switch (qs.getState()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java index 390a0689c4..4976225bed 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10307_TheCorruptedLeaderHisTruth/Q10307_TheCorruptedLeaderHisTruth.java @@ -93,10 +93,7 @@ public final class Q10307_TheCorruptedLeaderHisTruth extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (npc.getId()) { case NAOMI_KASHERON: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java index c60fda9625..861b299742 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10311_PeacefulDaysAreOver/Q10311_PeacefulDaysAreOver.java @@ -88,10 +88,7 @@ public final class Q10311_PeacefulDaysAreOver extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (npc.getId()) { case SELINA: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java index 152136e335..eb5c503cf5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10312_AbandonedGodsCreature/Q10312_AbandonedGodsCreature.java @@ -114,10 +114,7 @@ public final class Q10312_AbandonedGodsCreature extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + if (qs.isCreated()) { htmltext = "33031-01.htm"; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java index 0bc1de1c05..b0aefbc199 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10315_ToThePrisonOfDarkness/Q10315_ToThePrisonOfDarkness.java @@ -93,10 +93,7 @@ public final class Q10315_ToThePrisonOfDarkness extends Quest final QuestState qs1 = player.getQuestState(Q10307_TheCorruptedLeaderHisTruth.class.getSimpleName()); final QuestState qs2 = player.getQuestState(Q10311_PeacefulDaysAreOver.class.getSimpleName()); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java index 6dc82eb03a..adbb5ce5da 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10316_UndecayingMemoryOfThePast/Q10316_UndecayingMemoryOfThePast.java @@ -117,19 +117,12 @@ public final class Q10316_UndecayingMemoryOfThePast 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 == OPERA) - { - htmltext = "32946-01.htm"; - } + htmltext = "32946-01.htm"; break; } case State.STARTED: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java index 2b0e8ee722..9d33479420 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10317_OrbisWitch/Q10317_OrbisWitch.java @@ -89,10 +89,7 @@ public final class Q10317_OrbisWitch extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (npc.getId()) { case OPERA: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java index 2e8c0b76fc..136e523cca 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10318_DecayingDarkness/Q10318_DecayingDarkness.java @@ -112,10 +112,6 @@ public final class Q10318_DecayingDarkness 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()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java index f61cf9dadb..8f52deb147 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10331_StartOfFate/Q10331_StartOfFate.java @@ -280,7 +280,7 @@ public final class Q10331_StartOfFate extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java index 93fbc1b28b..e59e46d164 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10339_FightingTheForgotten/Q10339_FightingTheForgotten.java @@ -109,7 +109,7 @@ public final class Q10339_FightingTheForgotten extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java index 4f261a2848..1d1e01f92c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java @@ -96,20 +96,12 @@ public final class Q10351_OwnerOfHall 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 == LYDIA) - { - htmltext = "32892-01.htm"; - } + htmltext = "32892-01.htm"; break; } case State.STARTED: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java index 92293d2c57..db54151757 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10353_CertificationOfValue/Q10353_CertificationOfValue.java @@ -144,10 +144,7 @@ public final class Q10353_CertificationOfValue extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java index ebec723c8d..731babaa45 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java @@ -95,19 +95,12 @@ public final class Q10354_ResurrectedOwnerOfHall 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 == LYDIA) - { - htmltext = "32892-01.htm"; - } + htmltext = "32892-01.htm"; break; } case State.STARTED: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java index 1e498b0c25..8e08fdb23e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10360_CertificationOfFate/Q10360_CertificationOfFate.java @@ -278,7 +278,7 @@ public final class Q10360_CertificationOfFate extends Quest String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if ((st == null) || (player.getRace() == Race.ERTHEIA) || (player.getLevel() < MIN_LEVEL)) + if ((player.getRace() == Race.ERTHEIA) || (player.getLevel() < MIN_LEVEL)) { return htmltext; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java index fd854dfee8..9ba7727d2b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10362_CertificationOfTheSeeker/Q10362_CertificationOfTheSeeker.java @@ -150,7 +150,7 @@ public final class Q10362_CertificationOfTheSeeker extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java index 0a19ff48ad..1681ddb876 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10363_RequestOfTheSeeker/Q10363_RequestOfTheSeeker.java @@ -106,7 +106,7 @@ public final class Q10363_RequestOfTheSeeker extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java index 5ead1339a5..186303183a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java @@ -132,7 +132,7 @@ public final class Q10364_ObligationsOfTheSeeker extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java index b6e788a8e7..eb65eb46d7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java @@ -116,7 +116,7 @@ public final class Q10365_ForTheSearchdogKing extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java index 655c16da67..5f34b87eff 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java @@ -45,7 +45,7 @@ public final class Q10366_ReportOnTheSituationAtTheRuins extends Quest 22994, // Avian 22995, // Rider 23122 - // Eyesaroch + // Eyesaroch }; // Misc private static final int MIN_LEVEL = 16; @@ -110,11 +110,7 @@ public final class Q10366_ReportOnTheSituationAtTheRuins extends Quest { case State.CREATED: { - if (npc.getId() == SEBION) - { - htmltext = "32978-01.htm"; - break; - } + htmltext = "32978-01.htm"; break; } case State.STARTED: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java index ac877828b0..7d11890d82 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java @@ -109,11 +109,7 @@ public class Q10374_ThatPlaceSuccubus extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; - if (qs == null) - { - return htmltext; - } + String htmltext = getNoQuestMsg(player); if ((npc.getId() == ZENYA) && (player.getClassId().level() == ClassLevel.THIRD.ordinal())) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java index a34c606824..a6f0510941 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10377_TheInvadedExecutionGrounds/Q10377_TheInvadedExecutionGrounds.java @@ -157,12 +157,8 @@ public final class Q10377_TheInvadedExecutionGrounds 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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java index 0b227fbd41..3505bda7a1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10381_ToTheSeedOfHellfire/Q10381_ToTheSeedOfHellfire.java @@ -104,11 +104,6 @@ public final class Q10381_ToTheSeedOfHellfire extends Quest final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } - switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java index 7e5b250c0f..8cbe5bed6e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10388_ConspiracyBehindDoor/Q10388_ConspiracyBehindDoor.java @@ -88,12 +88,8 @@ public class Q10388_ConspiracyBehindDoor 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); final int npcId = npc.getId(); switch (qs.getState()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java index 2d2a71927e..4c7045a813 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10389_TheVoiceOfAuthority/Q10389_TheVoiceOfAuthority.java @@ -99,12 +99,8 @@ public class Q10389_TheVoiceOfAuthority 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()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java index ea260669cc..f725217c9b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10407_LetsGoFishing/Q10407_LetsGoFishing.java @@ -159,7 +159,7 @@ public class Q10407_LetsGoFishing extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java index 68a832ccee..e6b1d5c993 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10409_ASuspiciousVagabondInTheSwamp/Q10409_ASuspiciousVagabondInTheSwamp.java @@ -96,7 +96,7 @@ public final class Q10409_ASuspiciousVagabondInTheSwamp extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java index 88dc4ea94a..b485792a30 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10412_ASuspiciousVagabondInTheForest/Q10412_ASuspiciousVagabondInTheForest.java @@ -96,7 +96,7 @@ public final class Q10412_ASuspiciousVagabondInTheForest extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java index 90ea53ee79..edafc33194 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10416_InSearchOfTheEyeOfArgos/Q10416_InSearchOfTheEyeOfArgos.java @@ -94,7 +94,7 @@ public final class Q10416_InSearchOfTheEyeOfArgos extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (st.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java index 32933c074e..f4f02c3edd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10417_DaimonTheWhiteEyed/Q10417_DaimonTheWhiteEyed.java @@ -108,7 +108,7 @@ public final class Q10417_DaimonTheWhiteEyed extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); if (st.getState() == State.CREATED) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java index 83fdd25119..d065756bd4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10422_AssassinationOfTheVarkaSilenosChief/Q10422_AssassinationOfTheVarkaSilenosChief.java @@ -109,8 +109,8 @@ public final class Q10422_AssassinationOfTheVarkaSilenosChief 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 (npc.getId() == HANSEN) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java index e5c35231e2..ba0ab82b44 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10427_AssassinationOfTheKetraOrcChief/Q10427_AssassinationOfTheKetraOrcChief.java @@ -109,8 +109,8 @@ public final class Q10427_AssassinationOfTheKetraOrcChief 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 (npc.getId() == LUGONNES) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java index b89f96cfa5..e089032c0d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10443_TheAnnihilatedPlains2/Q10443_TheAnnihilatedPlains2.java @@ -97,11 +97,8 @@ public final class Q10443_TheAnnihilatedPlains2 extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; - if (qs == null) - { - return null; - } + String htmltext = getNoQuestMsg(player); + switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java index 944cd840b3..5e90857618 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java @@ -98,7 +98,7 @@ public final class Q10444_TheOriginOfMonsters extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java index da132be681..d220f643b0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java @@ -100,20 +100,13 @@ public final class Q10446_HitAndRun 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 == BRUENER) - { - htmltext = "33840-01.htm"; - break; - } + htmltext = "33840-01.htm"; + break; } case State.STARTED: { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java index 2599a2a8af..9e7ccd3f5a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java @@ -113,20 +113,13 @@ public class Q10447_TimingIsEverything 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 == BRUENER) - { - htmltext = "33840-01.htm"; - break; - } + htmltext = "33840-01.htm"; + break; } case State.STARTED: { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java index 6369f6494a..4b74d4587b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10452_IsItEdible/Q10452_IsItEdible.java @@ -94,10 +94,7 @@ public final class Q10452_IsItEdible extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + if (qs.isCreated()) { htmltext = "32743-01.htm"; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java index 94cf707091..4faa73b2c8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10455_ElikiasLetter/Q10455_ElikiasLetter.java @@ -103,10 +103,6 @@ public class Q10455_ElikiasLetter extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java index 14d3d0ec4b..1ce9fe1b48 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java @@ -96,10 +96,6 @@ public class Q10459_ASickAmbition extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java index c208e16aae..a1644bd81c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10461_TappingThePowerWithin/Q10461_TappingThePowerWithin.java @@ -94,11 +94,6 @@ public final class Q10461_TappingThePowerWithin extends Quest final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } - switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java index 2b389a8791..ed1d1b65aa 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java @@ -146,7 +146,7 @@ public final class Q10541_TrainLikeTheRealThing extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java index 4265a2b49e..0a0f129995 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java @@ -124,8 +124,8 @@ public final class Q10542_SearchingForNewPower extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java index 30e18a9187..2375aa17aa 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java @@ -102,7 +102,7 @@ public final class Q10543_SheddingWeight extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java index fbed597cce..a4985a2f68 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10544_SeekerSupplies/Q10544_SeekerSupplies.java @@ -155,7 +155,7 @@ public final class Q10544_SeekerSupplies extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - String htmltext = null; + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java index eb2dc83d9f..e973c51135 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10701_TheRoadToDestruction/Q10701_TheRoadToDestruction.java @@ -91,11 +91,6 @@ public final class Q10701_TheRoadToDestruction extends Quest final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } - switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java index 8187f8ba1f..1d6d2955ca 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10702_TheRoadToInfinity/Q10702_TheRoadToInfinity.java @@ -91,11 +91,6 @@ public final class Q10702_TheRoadToInfinity extends Quest final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } - switch (qs.getState()) { case State.CREATED: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java index 5a337ecc5d..e788c57e3c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10703_BottleOfIstinasSoul/Q10703_BottleOfIstinasSoul.java @@ -96,16 +96,12 @@ public final class Q10703_BottleOfIstinasSoul 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) && (getQuestItemsCount(player, ISTINAS_SOUL_BOTTLE) >= 1)) + if (getQuestItemsCount(player, ISTINAS_SOUL_BOTTLE) >= 1) { htmltext = "33293-01.html"; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java index 54b87bb1d0..553c3de339 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10704_BottleOfOctavisSoul/Q10704_BottleOfOctavisSoul.java @@ -97,16 +97,12 @@ public final class Q10704_BottleOfOctavisSoul 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 == LYDIA) && (getQuestItemsCount(player, OCTAVIS_SOUL_BOTTLE) >= 1)) + if (getQuestItemsCount(player, OCTAVIS_SOUL_BOTTLE) >= 1) { htmltext = "32892-01.html"; } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java index f69687fc64..e55c53fb1a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10705_BottleOfTautisSoul/Q10705_BottleOfTautisSoul.java @@ -97,16 +97,12 @@ public final class Q10705_BottleOfTautisSoul 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 == FERGASON) && (getQuestItemsCount(player, BOTTLE_OF_TAUTIS_SOUL) >= 1)) + if (getQuestItemsCount(player, BOTTLE_OF_TAUTIS_SOUL) >= 1) { htmltext = "33681-01.html"; break; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java index a1adacaa4d..3d92416050 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10707_FlamesOfSorrow/Q10707_FlamesOfSorrow.java @@ -122,11 +122,6 @@ public final class Q10707_FlamesOfSorrow extends Quest String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st == null) - { - return htmltext; - } - switch (st.getState()) { case State.CREATED: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java index a147692e11..071758b8f3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10708_StrengthenTheBarrier/Q10708_StrengthenTheBarrier.java @@ -120,11 +120,6 @@ public final class Q10708_StrengthenTheBarrier extends Quest String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st == null) - { - return htmltext; - } - switch (st.getState()) { case State.CREATED: diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10712_TheMinstrelsSongPart1/Q10712_TheMinstrelsSongPart1.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10712_TheMinstrelsSongPart1/Q10712_TheMinstrelsSongPart1.java index 18f7432b55..f8b51f4aff 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10712_TheMinstrelsSongPart1/Q10712_TheMinstrelsSongPart1.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10712_TheMinstrelsSongPart1/Q10712_TheMinstrelsSongPart1.java @@ -85,10 +85,7 @@ public final class Q10712_TheMinstrelsSongPart1 extends LetterQuest { final QuestState qs = getQuestState(player, false); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + if (qs.isStarted() && (npc.getId() == LIBERATTO)) { htmltext = "33955-01.html"; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10731_TheMinstrelsSongPart6/Q10731_TheMinstrelsSongPart6.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10731_TheMinstrelsSongPart6/Q10731_TheMinstrelsSongPart6.java index 5fb61f265a..28c755f4d3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10731_TheMinstrelsSongPart6/Q10731_TheMinstrelsSongPart6.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10731_TheMinstrelsSongPart6/Q10731_TheMinstrelsSongPart6.java @@ -24,8 +24,8 @@ import com.l2jmobius.gameserver.model.quest.QuestState; import quests.LetterQuest; /** - * The Minstrel's Song, Part 1 (10712) - * @URL https://l2wiki.com/The_Minstrel%27s_Song,_Part_1 + * The Minstrel's Song, Part 6 (10731) + * @URL https://l2wiki.com/The_Minstrel%27s_Song,_Part_6 * @author Gigi */ public final class Q10731_TheMinstrelsSongPart6 extends LetterQuest diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java index 2d254c5886..0efb5383f4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10767_AWholeNewLevelOfAlchemy/Q10767_AWholeNewLevelOfAlchemy.java @@ -110,11 +110,8 @@ public class Q10767_AWholeNewLevelOfAlchemy extends Quest { case State.CREATED: { - if (npc.getId() == VERUTI) - { - htmltext = "33977-01.htm"; - break; - } + htmltext = "33977-01.htm"; + break; } case State.STARTED: { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java index c9b9e000da..f3c03a26fa 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10817_ExaltedOneWhoOvercomesTheLimit/Q10817_ExaltedOneWhoOvercomesTheLimit.java @@ -104,10 +104,6 @@ public final class Q10817_ExaltedOneWhoOvercomesTheLimit extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java index 7e87c33783..2271527247 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10823_ExaltedOneWhoShattersTheLimit/Q10823_ExaltedOneWhoShattersTheLimit.java @@ -108,10 +108,6 @@ public final class Q10823_ExaltedOneWhoShattersTheLimit extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java index 260170e21b..d161a5deb0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/npc/SubclassCertification/SubclassCertification.java @@ -91,13 +91,8 @@ public final class SubclassCertification extends AbstractNpcAI public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = getNoQuestMsg(player); - if (st != null) - { - st.setState(State.STARTED); - htmltext = "Main.html"; - } - return htmltext; + st.setState(State.STARTED); + return "Main.html"; } @Override diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java index c998194ab6..ad18d37617 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java @@ -34,7 +34,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.entity.Instance; import com.l2jmobius.gameserver.model.holders.SkillHolder; import com.l2jmobius.gameserver.model.instancezone.InstanceWorld; -import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.NpcStringId; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -621,12 +620,7 @@ public abstract class Chamber extends AbstractInstance public String onTalk(L2Npc npc, L2PcInstance player) { final int npcId = npc.getId(); - QuestState st = getQuestState(player, false); - - if (st == null) - { - st = newQuestState(player); - } + getQuestState(player, true); if (npcId == ENTRANCE_GATEKEEPER) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java index 24f2e20c6e..fb23269af7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/AbstractSagaQuest.java @@ -744,226 +744,223 @@ public abstract class AbstractSagaQuest extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st != null) + String htmltext = getNoQuestMsg(player); + final int npcId = npc.getId(); + if ((npcId == _npc[0]) && st.isCompleted()) { - final int npcId = npc.getId(); - if ((npcId == _npc[0]) && st.isCompleted()) + htmltext = getAlreadyCompletedMsg(player); + } + else if (player.getClassId().getId() == getPrevClass(player)) + { + switch (st.getCond()) { - htmltext = getAlreadyCompletedMsg(player); - } - else if (player.getClassId().getId() == getPrevClass(player)) - { - switch (st.getCond()) - { - case 0: - if (npcId == _npc[0]) + case 0: + if (npcId == _npc[0]) + { + htmltext = "0-01.htm"; + } + break; + case 1: + if (npcId == _npc[0]) + { + htmltext = "0-04.htm"; + } + else if (npcId == _npc[2]) + { + htmltext = "2-01.htm"; + } + break; + case 2: + if (npcId == _npc[2]) + { + htmltext = "2-02.htm"; + } + else if (npcId == _npc[1]) + { + htmltext = "1-01.htm"; + } + break; + case 3: + if ((npcId == _npc[1]) && hasQuestItems(player, Items[0])) + { + if ((Items[11] == 0) || hasQuestItems(player, Items[11])) { - htmltext = "0-01.htm"; + htmltext = "1-03.htm"; } - break; - case 1: - if (npcId == _npc[0]) + else { - htmltext = "0-04.htm"; + htmltext = "1-02.htm"; } - else if (npcId == _npc[2]) + } + break; + case 4: + if (npcId == _npc[1]) + { + htmltext = "1-04.htm"; + } + else if (npcId == _npc[2]) + { + htmltext = "2-03.htm"; + } + break; + case 5: + if (npcId == _npc[2]) + { + htmltext = "2-04.htm"; + } + else if (npcId == _npc[5]) + { + htmltext = "5-01.htm"; + } + break; + case 6: + if (npcId == _npc[5]) + { + htmltext = "5-03.htm"; + } + else if (npcId == _npc[6]) + { + htmltext = "6-01.htm"; + } + break; + case 7: + if (npcId == _npc[6]) + { + htmltext = "6-02.htm"; + } + break; + case 8: + if (npcId == _npc[6]) + { + htmltext = "6-04.htm"; + } + else if (npcId == _npc[7]) + { + htmltext = "7-01.htm"; + } + break; + case 9: + if (npcId == _npc[7]) + { + htmltext = "7-05.htm"; + } + break; + case 10: + if (npcId == _npc[7]) + { + htmltext = "7-07.htm"; + } + else if (npcId == _npc[3]) + { + htmltext = "3-01.htm"; + } + break; + case 11: + case 12: + if (npcId == _npc[3]) + { + if (hasQuestItems(player, Items[2])) { - htmltext = "2-01.htm"; + htmltext = "3-05.htm"; } - break; - case 2: - if (npcId == _npc[2]) + else { - htmltext = "2-02.htm"; + htmltext = "3-04.htm"; } - else if (npcId == _npc[1]) + } + break; + case 13: + if (npcId == _npc[3]) + { + htmltext = "3-06.htm"; + } + else if (npcId == _npc[8]) + { + htmltext = "8-01.htm"; + } + break; + case 14: + if (npcId == _npc[8]) + { + htmltext = "8-03.htm"; + } + else if (npcId == _npc[11]) + { + htmltext = "11-01.htm"; + } + break; + case 15: + if (npcId == _npc[11]) + { + htmltext = "11-02.htm"; + } + else if (npcId == _npc[9]) + { + htmltext = "9-01.htm"; + } + break; + case 16: + if (npcId == _npc[9]) + { + htmltext = "9-02.htm"; + } + break; + case 17: + if (npcId == _npc[9]) + { + htmltext = "9-04.htm"; + } + else if (npcId == _npc[10]) + { + htmltext = "10-01.htm"; + } + break; + case 18: + if (npcId == _npc[10]) + { + htmltext = "10-05.htm"; + } + break; + case 19: + if (npcId == _npc[10]) + { + htmltext = "10-07.htm"; + } + else if (npcId == _npc[0]) + { + htmltext = "0-06.htm"; + } + break; + case 20: + if (npcId == _npc[0]) + { + if (player.getLevel() >= 76) { - htmltext = "1-01.htm"; - } - break; - case 3: - if ((npcId == _npc[1]) && hasQuestItems(player, Items[0])) - { - if ((Items[11] == 0) || hasQuestItems(player, Items[11])) + htmltext = "0-09.htm"; + if ((getClassId(player) < 131) || (getClassId(player) > 135)) // in Kamael quests, npc wants to chat for a bit before changing class { - htmltext = "1-03.htm"; - } - else - { - htmltext = "1-02.htm"; - } - } - break; - case 4: - if (npcId == _npc[1]) - { - htmltext = "1-04.htm"; - } - else if (npcId == _npc[2]) - { - htmltext = "2-03.htm"; - } - break; - case 5: - if (npcId == _npc[2]) - { - htmltext = "2-04.htm"; - } - else if (npcId == _npc[5]) - { - htmltext = "5-01.htm"; - } - break; - case 6: - if (npcId == _npc[5]) - { - htmltext = "5-03.htm"; - } - else if (npcId == _npc[6]) - { - htmltext = "6-01.htm"; - } - break; - case 7: - if (npcId == _npc[6]) - { - htmltext = "6-02.htm"; - } - break; - case 8: - if (npcId == _npc[6]) - { - htmltext = "6-04.htm"; - } - else if (npcId == _npc[7]) - { - htmltext = "7-01.htm"; - } - break; - case 9: - if (npcId == _npc[7]) - { - htmltext = "7-05.htm"; - } - break; - case 10: - if (npcId == _npc[7]) - { - htmltext = "7-07.htm"; - } - else if (npcId == _npc[3]) - { - htmltext = "3-01.htm"; - } - break; - case 11: - case 12: - if (npcId == _npc[3]) - { - if (hasQuestItems(player, Items[2])) - { - htmltext = "3-05.htm"; - } - else - { - htmltext = "3-04.htm"; - } - } - break; - case 13: - if (npcId == _npc[3]) - { - htmltext = "3-06.htm"; - } - else if (npcId == _npc[8]) - { - htmltext = "8-01.htm"; - } - break; - case 14: - if (npcId == _npc[8]) - { - htmltext = "8-03.htm"; - } - else if (npcId == _npc[11]) - { - htmltext = "11-01.htm"; - } - break; - case 15: - if (npcId == _npc[11]) - { - htmltext = "11-02.htm"; - } - else if (npcId == _npc[9]) - { - htmltext = "9-01.htm"; - } - break; - case 16: - if (npcId == _npc[9]) - { - htmltext = "9-02.htm"; - } - break; - case 17: - if (npcId == _npc[9]) - { - htmltext = "9-04.htm"; - } - else if (npcId == _npc[10]) - { - htmltext = "10-01.htm"; - } - break; - case 18: - if (npcId == _npc[10]) - { - htmltext = "10-05.htm"; - } - break; - case 19: - if (npcId == _npc[10]) - { - htmltext = "10-07.htm"; - } - else if (npcId == _npc[0]) - { - htmltext = "0-06.htm"; - } - break; - case 20: - if (npcId == _npc[0]) - { - if (player.getLevel() >= 76) - { - htmltext = "0-09.htm"; - if ((getClassId(player) < 131) || (getClassId(player) > 135)) // in Kamael quests, npc wants to chat for a bit before changing class + st.exitQuest(false); + addExpAndSp(player, 2299404, 0); + giveAdena(player, 5000000, true); + giveItems(player, 6622, 1); // XXX rewardItems? + final int classId = getClassId(player); + final int prevClass = getPrevClass(player); + player.setClassId(classId); + if (!player.isSubClassActive() && (player.getBaseClass() == prevClass)) { - st.exitQuest(false); - addExpAndSp(player, 2299404, 0); - giveAdena(player, 5000000, true); - giveItems(player, 6622, 1); // XXX rewardItems? - final int classId = getClassId(player); - final int prevClass = getPrevClass(player); - player.setClassId(classId); - if (!player.isSubClassActive() && (player.getBaseClass() == prevClass)) - { - player.setBaseClass(classId); - } - player.broadcastUserInfo(); - cast(npc, player, 4339, 1); + player.setBaseClass(classId); } - } - else - { - htmltext = "0-010.htm"; + player.broadcastUserInfo(); + cast(npc, player, 4339, 1); } } - break; - } + else + { + htmltext = "0-010.htm"; + } + } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java index ccf978126a..d7bcca3b8a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java @@ -94,8 +94,8 @@ public class Q00002_WhatWomenWant extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); switch (npc.getId()) { case ARUJIEN: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java index 222808eb6b..b1c55b3175 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java @@ -110,8 +110,8 @@ public class Q00003_WillTheSealBeBroken extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); switch (st.getState()) { case State.CREATED: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java index 5e8a6d3097..e22205b761 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java @@ -85,8 +85,8 @@ public class Q00004_LongLiveThePaagrioLord extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); switch (npc.getId()) { case NAKUSIN: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java index 0390bcae39..2eb2eaed45 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java @@ -93,8 +93,8 @@ public class Q00005_MinersFavor extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); switch (npc.getId()) { case BOLTER: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java index efcd2c2011..d2100227fd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00006_StepIntoTheFuture/Q00006_StepIntoTheFuture.java @@ -100,12 +100,8 @@ public class Q00006_StepIntoTheFuture 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java index c4e8fe98c0..adf62db973 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00007_ATripBegins/Q00007_ATripBegins.java @@ -100,12 +100,8 @@ public class Q00007_ATripBegins 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java index c97912208c..195321e5fa 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00008_AnAdventureBegins/Q00008_AnAdventureBegins.java @@ -100,12 +100,8 @@ public class Q00008_AnAdventureBegins 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java index 9650a8127a..c39d04b5d0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00009_IntoTheCityOfHumans/Q00009_IntoTheCityOfHumans.java @@ -87,12 +87,8 @@ public class Q00009_IntoTheCityOfHumans 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java index 0326ad1754..a66ea94098 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00010_IntoTheWorld/Q00010_IntoTheWorld.java @@ -105,12 +105,8 @@ public class Q00010_IntoTheWorld 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java index 9d79633b55..3727951350 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00011_SecretMeetingWithKetraOrcs/Q00011_SecretMeetingWithKetraOrcs.java @@ -90,14 +90,10 @@ public class Q00011_SecretMeetingWithKetraOrcs 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); final int npcId = npc.getId(); + switch (st.getState()) { case State.COMPLETED: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java index 01590f90da..a24a332759 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00012_SecretMeetingWithVarkaSilenos/Q00012_SecretMeetingWithVarkaSilenos.java @@ -90,14 +90,10 @@ public class Q00012_SecretMeetingWithVarkaSilenos 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); final int npcId = npc.getId(); + switch (st.getState()) { case State.COMPLETED: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java index 5d06f70ea1..5ffdbc75d4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00013_ParcelDelivery/Q00013_ParcelDelivery.java @@ -82,14 +82,10 @@ public class Q00013_ParcelDelivery 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); final int npcId = npc.getId(); + switch (qs.getState()) { case State.COMPLETED: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java index b081e970cc..60fb943f92 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00014_WhereaboutsOfTheArchaeologist/Q00014_WhereaboutsOfTheArchaeologist.java @@ -82,14 +82,10 @@ public class Q00014_WhereaboutsOfTheArchaeologist 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); final int npcId = npc.getId(); + switch (st.getState()) { case State.COMPLETED: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java index 0ef30b9708..d41e5d4033 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00015_SweetWhispers/Q00015_SweetWhispers.java @@ -82,14 +82,10 @@ public class Q00015_SweetWhispers 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); final int npcId = npc.getId(); + switch (qs.getState()) { case State.COMPLETED: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java index 9171329fa9..46a7fc8f28 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00016_TheComingDarkness/Q00016_TheComingDarkness.java @@ -90,13 +90,8 @@ public class Q00016_TheComingDarkness 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); final QuestState qs2 = player.getQuestState(Q00017_LightAndDarkness.class.getSimpleName()); if ((qs2 != null) && !qs2.isCompleted()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java index 1bb6967381..0818c972a5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00017_LightAndDarkness/Q00017_LightAndDarkness.java @@ -95,12 +95,8 @@ public class Q00017_LightAndDarkness 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java index 6d6031b2d9..374104d55a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00018_MeetingWithTheGoldenRam/Q00018_MeetingWithTheGoldenRam.java @@ -91,14 +91,10 @@ public class Q00018_MeetingWithTheGoldenRam 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); final int npcId = npc.getId(); + switch (st.getState()) { case State.COMPLETED: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java index 539b1a9e72..cc4bf42f4e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00019_GoToThePastureland/Q00019_GoToThePastureland.java @@ -87,12 +87,8 @@ public class Q00019_GoToThePastureland 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 (npc.getId() == VLADIMIR) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java index 9ce0347f50..f308eb44f9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java index 273029e9d9..d90e69d41f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00021_HiddenTruth/Q00021_HiddenTruth.java @@ -218,216 +218,214 @@ public class Q00021_HiddenTruth extends Quest { QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (npc.getId()) { - switch (npc.getId()) + case MYSTERIOUS_WIZARD: { - case MYSTERIOUS_WIZARD: + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: - { - htmltext = "31522-01.htm"; - break; - } - case State.STARTED: - { - htmltext = "31522-05.html"; - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; - } + htmltext = "31522-01.htm"; + break; } - break; - } - case TOMBSTONE: - { - htmltext = "31523-01.html"; - break; - } - case GHOST_OF_VON_HELLMAN: - { - switch (st.getCond()) + case State.STARTED: { - case 2: + htmltext = "31522-05.html"; + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; + } + } + break; + } + case TOMBSTONE: + { + htmltext = "31523-01.html"; + break; + } + case GHOST_OF_VON_HELLMAN: + { + switch (st.getCond()) + { + case 2: + { + htmltext = "31524-01.html"; + break; + } + case 3: + { + if (PAGE_SPAWNED) { - htmltext = "31524-01.html"; - break; + htmltext = "31524-07b.html"; } - case 3: + else { - if (PAGE_SPAWNED) + if (PAGE_COUNT < 5) { - htmltext = "31524-07b.html"; + final L2Npc PAGE = addSpawn(GHOST_OF_VON_HELLMANS_PAGE, PAGE_LOC, true, 0); + PAGE_COUNT++; + PAGE_SPAWNED = true; + PAGE.setScriptValue(player.getObjectId()); + WalkingManager.getInstance().startMoving(PAGE, PAGE_ROUTE_NAME); + htmltext = "31524-07.html"; } else { - if (PAGE_COUNT < 5) - { - final L2Npc PAGE = addSpawn(GHOST_OF_VON_HELLMANS_PAGE, PAGE_LOC, true, 0); - PAGE_COUNT++; - PAGE_SPAWNED = true; - PAGE.setScriptValue(player.getObjectId()); - WalkingManager.getInstance().startMoving(PAGE, PAGE_ROUTE_NAME); - htmltext = "31524-07.html"; - } - else - { - htmltext = "31524-07a.html"; - } + htmltext = "31524-07a.html"; } - break; - } - case 4: - { - htmltext = "31524-07c.html"; - break; } + break; } - break; - } - case GHOST_OF_VON_HELLMANS_PAGE: - { - if (st.isCond(3)) + case 4: { - if (MOVE_ENDED) - { - htmltext = "31525-02.html"; - startQuestTimer("DESPAWN", 3000, npc, player); - } - else - { - htmltext = "31525-01.html"; - } + htmltext = "31524-07c.html"; + break; } - break; } - case BROKEN_BOOKSHELF: + break; + } + case GHOST_OF_VON_HELLMANS_PAGE: + { + if (st.isCond(3)) { - switch (st.getCond()) + if (MOVE_ENDED) { - case 3: - { - htmltext = "31526-01.html"; - break; - } - case 4: - { - st.setCond(5); - playSound(player, QuestSound.AMDSOUND_ED_CHIMES); - htmltext = "31526-10.html"; - break; - } - case 5: - { - htmltext = "31526-11.html"; - break; - } - case 6: - { - htmltext = "31526-15.html"; - break; - } + htmltext = "31525-02.html"; + startQuestTimer("DESPAWN", 3000, npc, player); + } + else + { + htmltext = "31525-01.html"; } - break; } - case AGRIPEL: + break; + } + case BROKEN_BOOKSHELF: + { + switch (st.getCond()) { - if (hasQuestItems(player, CROSS_OF_EINHASAD) && st.isCond(6)) + case 3: { - st.set("AGRIPEL", "1"); - if ((st.getInt("AGRIPEL") == 1) && (st.getInt("DOMINIC") == 1) && (st.getInt("BENEDICT") == 1)) - { - htmltext = "31348-03.html"; - st.setCond(7); - } - else if ((st.getInt("DOMINIC") == 1) || (st.getInt("BENEDICT") == 1)) - { - htmltext = "31348-02.html"; - } - else - { - htmltext = "31348-01.html"; - } + htmltext = "31526-01.html"; + break; } - else if (st.isCond(7)) + case 4: + { + st.setCond(5); + playSound(player, QuestSound.AMDSOUND_ED_CHIMES); + htmltext = "31526-10.html"; + break; + } + case 5: + { + htmltext = "31526-11.html"; + break; + } + case 6: + { + htmltext = "31526-15.html"; + break; + } + } + break; + } + case AGRIPEL: + { + if (hasQuestItems(player, CROSS_OF_EINHASAD) && st.isCond(6)) + { + st.set("AGRIPEL", "1"); + if ((st.getInt("AGRIPEL") == 1) && (st.getInt("DOMINIC") == 1) && (st.getInt("BENEDICT") == 1)) { htmltext = "31348-03.html"; + st.setCond(7); } - break; - } - - case BENEDICT: - { - if (hasQuestItems(player, CROSS_OF_EINHASAD) && st.isCond(6)) + else if ((st.getInt("DOMINIC") == 1) || (st.getInt("BENEDICT") == 1)) { - - st.set("BENEDICT", "1"); - if ((st.getInt("AGRIPEL") == 1) && (st.getInt("DOMINIC") == 1) && (st.getInt("BENEDICT") == 1)) - { - htmltext = "31349-03.html"; - st.setCond(7); - } - else if ((st.getInt("AGRIPEL") == 1) || (st.getInt("DOMINIC") == 1)) - { - htmltext = "31349-02.html"; - } - else - { - htmltext = "31349-01.html"; - } + htmltext = "31348-02.html"; } - else if (st.isCond(7)) + else + { + htmltext = "31348-01.html"; + } + } + else if (st.isCond(7)) + { + htmltext = "31348-03.html"; + } + break; + } + + case BENEDICT: + { + if (hasQuestItems(player, CROSS_OF_EINHASAD) && st.isCond(6)) + { + + st.set("BENEDICT", "1"); + if ((st.getInt("AGRIPEL") == 1) && (st.getInt("DOMINIC") == 1) && (st.getInt("BENEDICT") == 1)) { htmltext = "31349-03.html"; + st.setCond(7); } - break; - } - case DOMINIC: - { - if (hasQuestItems(player, CROSS_OF_EINHASAD) && st.isCond(6)) + else if ((st.getInt("AGRIPEL") == 1) || (st.getInt("DOMINIC") == 1)) { - st.set("DOMINIC", "1"); - if ((st.getInt("AGRIPEL") == 1) && (st.getInt("DOMINIC") == 1) && (st.getInt("BENEDICT") == 1)) - { - htmltext = "31350-03.html"; - st.setCond(7); - } - else if ((st.getInt("AGRIPEL") == 1) || (st.getInt("BENEDICT") == 1)) - { - htmltext = "31350-02.html"; - } - else - { - htmltext = "31350-01.html"; - } + htmltext = "31349-02.html"; } - else if (st.isCond(7)) + else + { + htmltext = "31349-01.html"; + } + } + else if (st.isCond(7)) + { + htmltext = "31349-03.html"; + } + break; + } + case DOMINIC: + { + if (hasQuestItems(player, CROSS_OF_EINHASAD) && st.isCond(6)) + { + st.set("DOMINIC", "1"); + if ((st.getInt("AGRIPEL") == 1) && (st.getInt("DOMINIC") == 1) && (st.getInt("BENEDICT") == 1)) { htmltext = "31350-03.html"; + st.setCond(7); + } + else if ((st.getInt("AGRIPEL") == 1) || (st.getInt("BENEDICT") == 1)) + { + htmltext = "31350-02.html"; + } + else + { + htmltext = "31350-01.html"; } - break; } - case INNOCENTIN: + else if (st.isCond(7)) { - if (st.isCond(7) && hasQuestItems(player, CROSS_OF_EINHASAD)) - { - htmltext = "31328-01.html"; - } - else if (st.isCompleted()) - { - st = player.getQuestState(Q00022_TragedyInVonHellmannForest.class.getSimpleName()); - if (st == null) - { - htmltext = "31328-06.html"; - } - } - break; + htmltext = "31350-03.html"; } + break; + } + case INNOCENTIN: + { + if (st.isCond(7) && hasQuestItems(player, CROSS_OF_EINHASAD)) + { + htmltext = "31328-01.html"; + } + else if (st.isCompleted()) + { + st = player.getQuestState(Q00022_TragedyInVonHellmannForest.class.getSimpleName()); + if (st == null) + { + htmltext = "31328-06.html"; + } + } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java index aac05f505b..0ff7cbf517 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java @@ -220,13 +220,8 @@ public class Q00024_InhabitantsOfTheForestOfTheDead 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java index 8004e7dcc2..b58e4a1253 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java @@ -116,12 +116,8 @@ public final class Q00026_TiredOfWaiting 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java index 8e464ed1ac..d3a28813c8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java @@ -87,12 +87,8 @@ public class Q00027_ChestCaughtWithABaitOfWind 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java index d9a8a445bc..a2384d0e60 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00028_ChestCaughtWithABaitOfIcyAir/Q00028_ChestCaughtWithABaitOfIcyAir.java @@ -87,14 +87,10 @@ public class Q00028_ChestCaughtWithABaitOfIcyAir 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); final int npcId = npc.getId(); + switch (st.getState()) { case State.COMPLETED: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java index fb66b66d47..f57063187e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00029_ChestCaughtWithABaitOfEarth/Q00029_ChestCaughtWithABaitOfEarth.java @@ -87,14 +87,10 @@ public class Q00029_ChestCaughtWithABaitOfEarth 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); final int npcId = npc.getId(); + switch (st.getState()) { case State.COMPLETED: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java index fa21edfdd2..f908913c76 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00030_ChestCaughtWithABaitOfFire/Q00030_ChestCaughtWithABaitOfFire.java @@ -86,12 +86,8 @@ public class Q00030_ChestCaughtWithABaitOfFire 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); final int npcId = npc.getId(); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java index dd24dbffba..c740055316 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00031_SecretBuriedInTheSwamp/Q00031_SecretBuriedInTheSwamp.java @@ -127,10 +127,7 @@ public final class Q00031_SecretBuriedInTheSwamp extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (npc.getId()) { case ABERCROMBIE: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java index dd6cae99b6..93a7b28047 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00032_AnObviousLie/Q00032_AnObviousLie.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java index 9654a42822..aecd00c969 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00033_MakeAPairOfDressShoes/Q00033_MakeAPairOfDressShoes.java @@ -122,12 +122,8 @@ public class Q00033_MakeAPairOfDressShoes 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java index 989d4a3305..1de5b27834 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00034_InSearchOfCloth/Q00034_InSearchOfCloth.java @@ -151,12 +151,8 @@ public class Q00034_InSearchOfCloth 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java index 6ed084afa3..909d306fc4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00035_FindGlitteringJewelry/Q00035_FindGlitteringJewelry.java @@ -135,12 +135,8 @@ public class Q00035_FindGlitteringJewelry 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java index 4c96e9cbb3..0d9a654ed6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00036_MakeASewingKit/Q00036_MakeASewingKit.java @@ -125,12 +125,8 @@ public class Q00036_MakeASewingKit 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java index e6ebfc6aaf..4764663ef0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00037_MakeFormalWear/Q00037_MakeFormalWear.java @@ -143,12 +143,9 @@ public class Q00037_MakeFormalWear 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 (npc.getId()) { case ALEXIS: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java index b20bd997e8..e0531bc4b9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00040_ASpecialOrder/Q00040_ASpecialOrder.java @@ -134,10 +134,7 @@ public final class Q00040_ASpecialOrder extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (npc.getId()) { case HELVETIA: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java index 6086be9923..72a66c77d7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java @@ -141,12 +141,8 @@ public class Q00042_HelpTheUncle 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java index d6ee9ac23a..ddf870786d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java @@ -141,12 +141,8 @@ public class Q00043_HelpTheSister 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java index 97facd2371..5467a1c449 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java @@ -142,12 +142,8 @@ public class Q00044_HelpTheSon 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java index b4519450a8..03c65f29de 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00045_ToTalkingIsland/Q00045_ToTalkingIsland.java @@ -188,10 +188,7 @@ public final class Q00045_ToTalkingIsland extends Quest { QuestState st = getQuestState(talker, true); String htmltext = getNoQuestMsg(talker); - if (st == null) - { - return htmltext; - } + switch (npc.getId()) { case GALLADUCCI: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java index 86b98f5c9c..ec34b32f81 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00046_OnceMoreInTheArmsOfTheMotherTree/Q00046_OnceMoreInTheArmsOfTheMotherTree.java @@ -188,10 +188,7 @@ public final class Q00046_OnceMoreInTheArmsOfTheMotherTree extends Quest { QuestState st = getQuestState(talker, true); String htmltext = getNoQuestMsg(talker); - if (st == null) - { - return htmltext; - } + switch (npc.getId()) { case GALLADUCCI: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java index 6228eb4310..5f0f006f2b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00047_IntoTheDarkElvenForest/Q00047_IntoTheDarkElvenForest.java @@ -188,10 +188,7 @@ public final class Q00047_IntoTheDarkElvenForest extends Quest { QuestState st = getQuestState(talker, true); String htmltext = getNoQuestMsg(talker); - if (st == null) - { - return htmltext; - } + switch (npc.getId()) { case GALLADUCCI: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java index e51937c9db..9d91295d78 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00048_ToTheImmortalPlateau/Q00048_ToTheImmortalPlateau.java @@ -188,10 +188,7 @@ public final class Q00048_ToTheImmortalPlateau extends Quest { QuestState st = getQuestState(talker, true); String htmltext = getNoQuestMsg(talker); - if (st == null) - { - return htmltext; - } + switch (npc.getId()) { case GALLADUCCI: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java index 0d89d39983..84fc9057af 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00049_TheRoadHome/Q00049_TheRoadHome.java @@ -188,10 +188,7 @@ public final class Q00049_TheRoadHome extends Quest { QuestState st = getQuestState(talker, true); String htmltext = getNoQuestMsg(talker); - if (st == null) - { - return htmltext; - } + switch (npc.getId()) { case GALLADUCCI: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java index c73af15905..92e8c7a387 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00050_LanoscosSpecialBait/Q00050_LanoscosSpecialBait.java @@ -108,12 +108,8 @@ public class Q00050_LanoscosSpecialBait 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java index 5624c9f8a3..75c3209dca 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00051_OFullesSpecialBait/Q00051_OFullesSpecialBait.java @@ -104,12 +104,8 @@ public class Q00051_OFullesSpecialBait 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java index 2ce4d55a35..968d173be7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00052_WilliesSpecialBait/Q00052_WilliesSpecialBait.java @@ -104,12 +104,8 @@ public class Q00052_WilliesSpecialBait 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java index 88f79beb1d..24e3abfb6c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java @@ -116,12 +116,8 @@ public class Q00053_LinnaeusSpecialBait 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java index 23c6132494..0fad8bf57a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java @@ -165,135 +165,133 @@ public class Q00101_SwordOfSolidarity extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (npc.getId()) { - switch (npc.getId()) + case ROIEN: { - case ROIEN: + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: - { - htmltext = (player.getRace() == Race.HUMAN) ? (player.getLevel() >= MIN_LVL) ? "30008-02.htm" : "30008-08.htm" : "30008-01.htm"; - break; - } - case State.STARTED: - { - switch (st.getCond()) - { - case 1: - { - if (hasQuestItems(player, ROIENS_LETTER)) - { - htmltext = "30008-05.html"; - } - break; - } - case 2: - { - if (hasAtLeastOneQuestItem(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP)) - { - htmltext = "30008-11.html"; - } - else if (hasQuestItems(player, DIRECTIONS_TO_RUINS)) - { - htmltext = "30008-10.html"; - } - break; - } - case 3: - { - if (hasQuestItems(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP)) - { - htmltext = "30008-12.html"; - } - break; - } - case 4: - { - if (hasQuestItems(player, ALTRANS_NOTE)) - { - takeItems(player, ALTRANS_NOTE, -1); - giveItems(player, BROKEN_SWORD_HANDLE, 1); - st.setCond(5, true); - htmltext = "30008-06.html"; - } - break; - } - case 5: - { - if (hasQuestItems(player, BROKEN_SWORD_HANDLE)) - { - htmltext = "30008-07.html"; - } - break; - } - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; - } + htmltext = (player.getRace() == Race.HUMAN) ? (player.getLevel() >= MIN_LVL) ? "30008-02.htm" : "30008-08.htm" : "30008-01.htm"; + break; + } + case State.STARTED: + { + switch (st.getCond()) + { + case 1: + { + if (hasQuestItems(player, ROIENS_LETTER)) + { + htmltext = "30008-05.html"; + } + break; + } + case 2: + { + if (hasAtLeastOneQuestItem(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP)) + { + htmltext = "30008-11.html"; + } + else if (hasQuestItems(player, DIRECTIONS_TO_RUINS)) + { + htmltext = "30008-10.html"; + } + break; + } + case 3: + { + if (hasQuestItems(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP)) + { + htmltext = "30008-12.html"; + } + break; + } + case 4: + { + if (hasQuestItems(player, ALTRANS_NOTE)) + { + takeItems(player, ALTRANS_NOTE, -1); + giveItems(player, BROKEN_SWORD_HANDLE, 1); + st.setCond(5, true); + htmltext = "30008-06.html"; + } + break; + } + case 5: + { + if (hasQuestItems(player, BROKEN_SWORD_HANDLE)) + { + htmltext = "30008-07.html"; + } + break; + } + } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } - break; } - case ALTRAN: + break; + } + case ALTRAN: + { + switch (st.getCond()) { - switch (st.getCond()) + case 1: { - case 1: + if (hasQuestItems(player, ROIENS_LETTER)) { - if (hasQuestItems(player, ROIENS_LETTER)) - { - htmltext = "30283-01.html"; - } - break; - } - case 2: - { - if (hasAtLeastOneQuestItem(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP)) - { - htmltext = "30283-08.html"; - } - else if (hasQuestItems(player, DIRECTIONS_TO_RUINS)) - { - htmltext = "30283-03.html"; - } - break; - } - case 3: - { - if (hasQuestItems(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP)) - { - takeItems(player, -1, DIRECTIONS_TO_RUINS, BROKEN_BLADE_TOP, BROKEN_BLADE_BOTTOM); - giveItems(player, ALTRANS_NOTE, 1); - st.setCond(4, true); - htmltext = "30283-04.html"; - } - break; - } - case 4: - { - if (hasQuestItems(player, ALTRANS_NOTE)) - { - htmltext = "30283-05.html"; - } - break; - } - case 5: - { - if (hasQuestItems(player, BROKEN_SWORD_HANDLE)) - { - htmltext = "30283-06.html"; - } - break; + htmltext = "30283-01.html"; } + break; + } + case 2: + { + if (hasAtLeastOneQuestItem(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP)) + { + htmltext = "30283-08.html"; + } + else if (hasQuestItems(player, DIRECTIONS_TO_RUINS)) + { + htmltext = "30283-03.html"; + } + break; + } + case 3: + { + if (hasQuestItems(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP)) + { + takeItems(player, -1, DIRECTIONS_TO_RUINS, BROKEN_BLADE_TOP, BROKEN_BLADE_BOTTOM); + giveItems(player, ALTRANS_NOTE, 1); + st.setCond(4, true); + htmltext = "30283-04.html"; + } + break; + } + case 4: + { + if (hasQuestItems(player, ALTRANS_NOTE)) + { + htmltext = "30283-05.html"; + } + break; + } + case 5: + { + if (hasQuestItems(player, BROKEN_SWORD_HANDLE)) + { + htmltext = "30283-06.html"; + } + break; } - break; } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java index 679afb6839..57f5ffe756 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java @@ -121,170 +121,168 @@ public class Q00102_SeaOfSporesFever extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (npc.getId()) { - switch (npc.getId()) + case ALBERIUS: { - case ALBERIUS: + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: - { - htmltext = player.getRace() == Race.ELF ? player.getLevel() >= MIN_LVL ? "30284-07.htm" : "30284-08.htm" : "30284-00.htm"; - break; - } - case State.STARTED: - { - switch (st.getCond()) - { - case 1: - { - if (hasQuestItems(player, ALBERIUS_LETTER)) - { - htmltext = "30284-03.html"; - } - break; - } - case 2: - { - if (hasQuestItems(player, EVERGREEN_AMULET)) - { - htmltext = "30284-09.html"; - } - break; - } - case 4: - { - if (hasQuestItems(player, COBENDELLS_MEDICINE1)) - { - takeItems(player, COBENDELLS_MEDICINE1, 1); - giveItems(player, ALBERIUS_LIST, 1); - st.setCond(5); - htmltext = "30284-04.html"; - } - break; - } - case 5: - { - if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) - { - htmltext = "30284-05.html"; - } - break; - } - case 6: - { - if (!hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) - { - giveItems(player, LESSER_HEALING_POTION, 100); - giveItems(player, ECHO_CRYSTAL_THEME_OF_BATTLE, 10); - giveItems(player, ECHO_CRYSTAL_THEME_OF_LOVE, 10); - giveItems(player, ECHO_CRYSTAL_THEME_OF_SOLITUDE, 10); - giveItems(player, ECHO_CRYSTAL_THEME_OF_FEAST, 10); - giveItems(player, ECHO_CRYSTAL_THEME_OF_CELEBRATION, 10); - if (player.isMageClass()) - { - giveItems(player, STAFF_OF_SENTINEL, 1); - giveItems(player, SPIRITSHOT_NO_GRADE, 500); - } - else - { - giveItems(player, SWORD_OF_SENTINEL, 1); - giveItems(player, SOULSHOT_NO_GRADE, 500); - } - addExpAndSp(player, 30202, 1339); - giveAdena(player, 6331, true); - st.exitQuest(false, true); - htmltext = "30284-06.html"; - } - break; - } - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; - } + htmltext = player.getRace() == Race.ELF ? player.getLevel() >= MIN_LVL ? "30284-07.htm" : "30284-08.htm" : "30284-00.htm"; + break; + } + case State.STARTED: + { + switch (st.getCond()) + { + case 1: + { + if (hasQuestItems(player, ALBERIUS_LETTER)) + { + htmltext = "30284-03.html"; + } + break; + } + case 2: + { + if (hasQuestItems(player, EVERGREEN_AMULET)) + { + htmltext = "30284-09.html"; + } + break; + } + case 4: + { + if (hasQuestItems(player, COBENDELLS_MEDICINE1)) + { + takeItems(player, COBENDELLS_MEDICINE1, 1); + giveItems(player, ALBERIUS_LIST, 1); + st.setCond(5); + htmltext = "30284-04.html"; + } + break; + } + case 5: + { + if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) + { + htmltext = "30284-05.html"; + } + break; + } + case 6: + { + if (!hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) + { + giveItems(player, LESSER_HEALING_POTION, 100); + giveItems(player, ECHO_CRYSTAL_THEME_OF_BATTLE, 10); + giveItems(player, ECHO_CRYSTAL_THEME_OF_LOVE, 10); + giveItems(player, ECHO_CRYSTAL_THEME_OF_SOLITUDE, 10); + giveItems(player, ECHO_CRYSTAL_THEME_OF_FEAST, 10); + giveItems(player, ECHO_CRYSTAL_THEME_OF_CELEBRATION, 10); + if (player.isMageClass()) + { + giveItems(player, STAFF_OF_SENTINEL, 1); + giveItems(player, SPIRITSHOT_NO_GRADE, 500); + } + else + { + giveItems(player, SWORD_OF_SENTINEL, 1); + giveItems(player, SOULSHOT_NO_GRADE, 500); + } + addExpAndSp(player, 30202, 1339); + giveAdena(player, 6331, true); + st.exitQuest(false, true); + htmltext = "30284-06.html"; + } + break; + } + } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } - break; } - case COBENDELL: + break; + } + case COBENDELL: + { + switch (st.getCond()) { - switch (st.getCond()) + case 1: { - case 1: + if (hasQuestItems(player, ALBERIUS_LETTER)) { - if (hasQuestItems(player, ALBERIUS_LETTER)) - { - takeItems(player, ALBERIUS_LETTER, 1); - giveItems(player, EVERGREEN_AMULET, 1); - st.setCond(2, true); - htmltext = "30156-03.html"; - } - break; - } - case 2: - { - if (hasQuestItems(player, EVERGREEN_AMULET) && (getQuestItemsCount(player, DRYADS_TEAR) < 10)) - { - htmltext = "30156-04.html"; - } - break; - } - case 3: - { - if (getQuestItemsCount(player, DRYADS_TEAR) >= 10) - { - takeItems(player, EVERGREEN_AMULET, -1); - takeItems(player, DRYADS_TEAR, -1); - giveItems(player, COBENDELLS_MEDICINE1, 1); - giveItems(player, COBENDELLS_MEDICINE2, 1); - giveItems(player, COBENDELLS_MEDICINE3, 1); - giveItems(player, COBENDELLS_MEDICINE4, 1); - giveItems(player, COBENDELLS_MEDICINE5, 1); - st.setCond(4, true); - htmltext = "30156-05.html"; - } - break; - } - case 4: - { - if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) - { - htmltext = "30156-06.html"; - } - break; - } - case 5: - { - if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) - { - htmltext = "30156-07.html"; - } - break; + takeItems(player, ALBERIUS_LETTER, 1); + giveItems(player, EVERGREEN_AMULET, 1); + st.setCond(2, true); + htmltext = "30156-03.html"; } + break; + } + case 2: + { + if (hasQuestItems(player, EVERGREEN_AMULET) && (getQuestItemsCount(player, DRYADS_TEAR) < 10)) + { + htmltext = "30156-04.html"; + } + break; + } + case 3: + { + if (getQuestItemsCount(player, DRYADS_TEAR) >= 10) + { + takeItems(player, EVERGREEN_AMULET, -1); + takeItems(player, DRYADS_TEAR, -1); + giveItems(player, COBENDELLS_MEDICINE1, 1); + giveItems(player, COBENDELLS_MEDICINE2, 1); + giveItems(player, COBENDELLS_MEDICINE3, 1); + giveItems(player, COBENDELLS_MEDICINE4, 1); + giveItems(player, COBENDELLS_MEDICINE5, 1); + st.setCond(4, true); + htmltext = "30156-05.html"; + } + break; + } + case 4: + { + if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) + { + htmltext = "30156-06.html"; + } + break; + } + case 5: + { + if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) + { + htmltext = "30156-07.html"; + } + break; } - break; } - case GARTRANDELL: - case RAYEN: - case VELTRESS: - case BERROS: + break; + } + case GARTRANDELL: + case RAYEN: + case VELTRESS: + case BERROS: + { + if (hasQuestItems(player, ALBERIUS_LIST, SENTINELS.get(npc.getId()))) { - if (hasQuestItems(player, ALBERIUS_LIST, SENTINELS.get(npc.getId()))) + takeItems(player, SENTINELS.get(npc.getId()), -1); + if (!hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) { - takeItems(player, SENTINELS.get(npc.getId()), -1); - if (!hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) - { - st.setCond(6); - } - htmltext = npc.getId() + "-01.html"; + st.setCond(6); } - break; + htmltext = npc.getId() + "-01.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java index dbec48cfd5..260cbd5ed9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java @@ -116,65 +116,63 @@ public final class Q00104_SpiritOfMirrors extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (npc.getId()) { - switch (npc.getId()) + case GALLINT: { - case GALLINT: + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: - { - htmltext = (player.getRace() == Race.HUMAN) ? (player.getLevel() >= MIN_LVL) ? "30017-03.htm" : "30017-02.htm" : "30017-01.htm"; - break; - } - case State.STARTED: - { - if (st.isCond(3) && hasQuestItems(player, SPIRITBOUND_WAND1, SPIRITBOUND_WAND2, SPIRITBOUND_WAND3)) - { - Q00281_HeadForTheHills.giveNewbieReward(player); - for (ItemHolder reward : REWARDS) - { - giveItems(player, reward); - } - addExpAndSp(player, 39750, 3407); - giveAdena(player, 16866, true); - st.exitQuest(false, true); - htmltext = "30017-06.html"; - } - else - { - htmltext = "30017-05.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; - } + htmltext = (player.getRace() == Race.HUMAN) ? (player.getLevel() >= MIN_LVL) ? "30017-03.htm" : "30017-02.htm" : "30017-01.htm"; + break; + } + case State.STARTED: + { + if (st.isCond(3) && hasQuestItems(player, SPIRITBOUND_WAND1, SPIRITBOUND_WAND2, SPIRITBOUND_WAND3)) + { + Q00281_HeadForTheHills.giveNewbieReward(player); + for (ItemHolder reward : REWARDS) + { + giveItems(player, reward); + } + addExpAndSp(player, 39750, 3407); + giveAdena(player, 16866, true); + st.exitQuest(false, true); + htmltext = "30017-06.html"; + } + else + { + htmltext = "30017-05.html"; + } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } - break; } - case ARNOLD: - case JOHNSTONE: - case KENYOS: + break; + } + case ARNOLD: + case JOHNSTONE: + case KENYOS: + { + if (st.isCond(1)) { - if (st.isCond(1)) + if (!st.isSet(npc.getName())) { - if (!st.isSet(npc.getName())) - { - st.set(npc.getName(), "1"); - } - if (st.isSet("Arnold") && st.isSet("Johnstone") && st.isSet("Kenyos")) - { - st.setCond(2, true); - } + st.set(npc.getName(), "1"); + } + if (st.isSet("Arnold") && st.isSet("Johnstone") && st.isSet("Kenyos")) + { + st.setCond(2, true); } - htmltext = npc.getId() + "-01.html"; - break; } + htmltext = npc.getId() + "-01.html"; + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java index 41378db126..a999588309 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java @@ -156,10 +156,6 @@ public final class Q00105_SkirmishWithOrcs extends Quest { final QuestState st = getQuestState(talker, true); String htmltext = getNoQuestMsg(talker); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java index 8de143affe..e7cb41049b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java @@ -115,10 +115,6 @@ public final class Q00106_ForgottenTruth extends Quest { final QuestState st = getQuestState(talker, true); String htmltext = getNoQuestMsg(talker); - if (st == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java index 8164d52972..de5ed6f559 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java @@ -146,10 +146,7 @@ public final class Q00108_JumbleTumbleDiamondFuss extends Quest { final QuestState st = getQuestState(talker, true); String htmltext = getNoQuestMsg(talker); - if (st == null) - { - return htmltext; - } + switch (npc.getId()) { case COLLECTOR_GOUPH: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java index aa53d9643b..acf259169f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00109_InSearchOfTheNest/Q00109_InSearchOfTheNest.java @@ -85,12 +85,8 @@ public class Q00109_InSearchOfTheNest 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java index 2bde363c67..ba03f6aee6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00110_ToThePrimevalIsle/Q00110_ToThePrimevalIsle.java @@ -74,12 +74,8 @@ public class Q00110_ToThePrimevalIsle 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java index 45a6c5ca50..cb376ee39f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00111_ElrokianHuntersProof/Q00111_ElrokianHuntersProof.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java index 5e5ba5e195..26e9211155 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00112_WalkOfFate/Q00112_WalkOfFate.java @@ -78,10 +78,6 @@ public class Q00112_WalkOfFate extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java index 9f002de392..ee07e7de3e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00113_StatusOfTheBeaconTower/Q00113_StatusOfTheBeaconTower.java @@ -90,13 +90,8 @@ public class Q00113_StatusOfTheBeaconTower 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java index 49147026bf..34b7439d5c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00114_ResurrectionOfAnOldManager/Q00114_ResurrectionOfAnOldManager.java @@ -424,14 +424,8 @@ 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); - } - + String htmltext = getNoQuestMsg(player); final int talk = qs.getInt("talk"); switch (npc.getId()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java index 0a30897591..aa706faf82 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00115_TheOtherSideOfTruth/Q00115_TheOtherSideOfTruth.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java index fdc8da90bb..80ad04dad1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00119_LastImperialPrince/Q00119_LastImperialPrince.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java index 34125ba29c..b93f3f4d9e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java @@ -69,12 +69,8 @@ public class Q00121_PavelTheGiant 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java index e22118c261..c67b581377 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java @@ -70,12 +70,8 @@ public class Q00122_OminousNews 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java index b03d488246..b9682a349f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java @@ -109,12 +109,8 @@ public class Q00124_MeetingTheElroki 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java index 15fc7d367f..ac6e709708 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java index 923cfbff85..3d08b33ccf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00126_TheNameOfEvil2/Q00126_TheNameOfEvil2.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java index eaf545c306..ea8868e697 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00128_PailakaSongOfIceAndFire/Q00128_PailakaSongOfIceAndFire.java @@ -180,12 +180,8 @@ public final class Q00128_PailakaSongOfIceAndFire extends Quest @Override public final 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java index f7142172b4..b01cdb4729 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00129_PailakaDevilsLegacy/Q00129_PailakaDevilsLegacy.java @@ -134,12 +134,8 @@ public final class Q00129_PailakaDevilsLegacy extends Quest @Override public final String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (qs == null) - { - return getNoQuestMsg(player); - } + String htmltext = getNoQuestMsg(player); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java index 171b89ec66..dfdeaa71a3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java @@ -122,10 +122,6 @@ public class Q00130_PathToHellbound extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java index e2437ba468..5c306609ab 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00131_BirdInACage/Q00131_BirdInACage.java @@ -166,10 +166,6 @@ public class Q00131_BirdInACage extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java index 90e07f7d37..c748d3e721 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00132_MatrasCuriosity/Q00132_MatrasCuriosity.java @@ -139,12 +139,8 @@ public final class Q00132_MatrasCuriosity extends Quest @Override public final 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 (st.isCreated()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java index 55a5e01234..81212967ae 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java @@ -151,10 +151,6 @@ public class Q00133_ThatsBloodyHot extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java index 933e6673ec..6872320457 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00134_TempleMissionary/Q00134_TempleMissionary.java @@ -171,12 +171,8 @@ public class Q00134_TempleMissionary 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java index 223f2d55b3..2244f2720d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00135_TempleExecutor/Q00135_TempleExecutor.java @@ -162,12 +162,8 @@ public class Q00135_TempleExecutor 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java index 2c107e61af..0b4fa48673 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00136_MoreThanMeetsTheEye/Q00136_MoreThanMeetsTheEye.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java index 5680de516b..e697c23612 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00137_TempleChampionPart1/Q00137_TempleChampionPart1.java @@ -125,12 +125,9 @@ public class Q00137_TempleChampionPart1 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 (qs.isCompleted()) { return getAlreadyCompletedMsg(player); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java index 0ce5c87ef0..62b47dd9c4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00138_TempleChampionPart2/Q00138_TempleChampionPart2.java @@ -154,12 +154,9 @@ public class Q00138_TempleChampionPart2 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 (npc.getId()) { case SYLVAIN: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java index e7e324ef66..ca8126200d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00139_ShadowFoxPart1/Q00139_ShadowFoxPart1.java @@ -157,12 +157,8 @@ public class Q00139_ShadowFoxPart1 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java index 0ceb72a593..98c626ec39 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00140_ShadowFoxPart2/Q00140_ShadowFoxPart2.java @@ -167,12 +167,8 @@ public class Q00140_ShadowFoxPart2 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java index 1fb15f661f..b2b18bab25 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00141_ShadowFoxPart3/Q00141_ShadowFoxPart3.java @@ -161,12 +161,8 @@ public class Q00141_ShadowFoxPart3 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java index 798d7cf0e4..753c2ac7b6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00142_FallenAngelRequestOfDawn/Q00142_FallenAngelRequestOfDawn.java @@ -191,12 +191,8 @@ public class Q00142_FallenAngelRequestOfDawn 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java index ecf140df30..a093ea46ae 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00143_FallenAngelRequestOfDusk/Q00143_FallenAngelRequestOfDusk.java @@ -167,12 +167,8 @@ public class Q00143_FallenAngelRequestOfDusk 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index fa936e7310..ffc48dd967 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -385,12 +385,7 @@ public class Q00144_PailakaInjuredDragon extends Quest @Override public final String onTalk(L2Npc npc, L2PcInstance player) { - final String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } final int cond = qs.getCond(); switch (npc.getId()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java index c9ead5de6e..de64a89e0c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00146_TheZeroHour/Q00146_TheZeroHour.java @@ -83,12 +83,8 @@ public class Q00146_TheZeroHour 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java index 2244ee8780..d6dd222240 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00147_PathtoBecominganEliteMercenary/Q00147_PathtoBecominganEliteMercenary.java @@ -82,12 +82,8 @@ public class Q00147_PathtoBecominganEliteMercenary 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java index aefd5ceccd..9a75816d98 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00148_PathtoBecominganExaltedMercenary/Q00148_PathtoBecominganExaltedMercenary.java @@ -79,12 +79,8 @@ public class Q00148_PathtoBecominganExaltedMercenary 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java index 3c1f703ba0..29b89d130b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java @@ -83,12 +83,8 @@ public class Q00151_CureForFever 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java index eaea5898b0..d0ac759acf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java @@ -108,104 +108,102 @@ public class Q00152_ShardsOfGolem extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (npc.getId()) { - switch (npc.getId()) + case HARRYS: { - case HARRYS: + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: - { - htmltext = player.getLevel() >= MIN_LVL ? "30035-02.htm" : "30035-01.htm"; - break; - } - case State.STARTED: - { - switch (st.getCond()) - { - case 1: - { - if (hasQuestItems(player, HARRYS_1ST_RECIEPT)) - { - htmltext = "30035-04a.html"; - } - break; - } - case 2: - case 3: - { - if (hasQuestItems(player, HARRYS_2ND_RECIEPT)) - { - htmltext = "30035-04.html"; - } - break; - } - case 4: - { - if (hasQuestItems(player, HARRYS_2ND_RECIEPT, TOOL_BOX)) - { - giveItems(player, WOODEN_BREASTPLATE, 1); - addExpAndSp(player, 5000, 0); - st.exitQuest(false, true); - htmltext = "30035-05.html"; - } - break; - } - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; - } + htmltext = player.getLevel() >= MIN_LVL ? "30035-02.htm" : "30035-01.htm"; + break; + } + case State.STARTED: + { + switch (st.getCond()) + { + case 1: + { + if (hasQuestItems(player, HARRYS_1ST_RECIEPT)) + { + htmltext = "30035-04a.html"; + } + break; + } + case 2: + case 3: + { + if (hasQuestItems(player, HARRYS_2ND_RECIEPT)) + { + htmltext = "30035-04.html"; + } + break; + } + case 4: + { + if (hasQuestItems(player, HARRYS_2ND_RECIEPT, TOOL_BOX)) + { + giveItems(player, WOODEN_BREASTPLATE, 1); + addExpAndSp(player, 5000, 0); + st.exitQuest(false, true); + htmltext = "30035-05.html"; + } + break; + } + } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } - break; } - case ALTRAN: + break; + } + case ALTRAN: + { + switch (st.getCond()) { - switch (st.getCond()) + case 1: { - case 1: + if (hasQuestItems(player, HARRYS_1ST_RECIEPT)) { - if (hasQuestItems(player, HARRYS_1ST_RECIEPT)) - { - htmltext = "30283-01.html"; - } - break; - } - case 2: - { - if (hasQuestItems(player, HARRYS_2ND_RECIEPT) && (getQuestItemsCount(player, GOLEM_SHARD) < 5)) - { - htmltext = "30283-03.html"; - } - break; - } - case 3: - { - if (hasQuestItems(player, HARRYS_2ND_RECIEPT) && (getQuestItemsCount(player, GOLEM_SHARD) >= 5)) - { - takeItems(player, GOLEM_SHARD, -1); - giveItems(player, TOOL_BOX, 1); - st.setCond(4, true); - htmltext = "30283-04.html"; - } - break; - } - case 4: - { - if (hasQuestItems(player, HARRYS_2ND_RECIEPT, TOOL_BOX)) - { - htmltext = "30283-05.html"; - } - break; + htmltext = "30283-01.html"; } + break; + } + case 2: + { + if (hasQuestItems(player, HARRYS_2ND_RECIEPT) && (getQuestItemsCount(player, GOLEM_SHARD) < 5)) + { + htmltext = "30283-03.html"; + } + break; + } + case 3: + { + if (hasQuestItems(player, HARRYS_2ND_RECIEPT) && (getQuestItemsCount(player, GOLEM_SHARD) >= 5)) + { + takeItems(player, GOLEM_SHARD, -1); + giveItems(player, TOOL_BOX, 1); + st.setCond(4, true); + htmltext = "30283-04.html"; + } + break; + } + case 4: + { + if (hasQuestItems(player, HARRYS_2ND_RECIEPT, TOOL_BOX)) + { + htmltext = "30283-05.html"; + } + break; } - break; } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java index b9f2ca91eb..5dd894f926 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java @@ -76,89 +76,87 @@ public class Q00153_DeliverGoods extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st != null) + String htmltext = getNoQuestMsg(player); + + if (npc.getId() == ARNOLD_ID) { - if (npc.getId() == ARNOLD_ID) + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: + htmltext = (player.getLevel() >= 2) ? "30041-01.htm" : "30041-00.htm"; + break; + case State.STARTED: + if (st.isCond(1)) + { + htmltext = "30041-03.html"; + } + else if (st.isCond(2)) + { + takeItems(player, DELIVERY_LIST_ID, -1); + takeItems(player, JACKSONS_RECEIPT_ID, -1); + takeItems(player, SILVIAS_RECEIPT_ID, -1); + takeItems(player, RANTS_RECEIPT_ID, -1); + // On retail it gives 2 rings but one at the time. + giveItems(player, RING_OF_KNOWLEDGE_ID, 1); + giveItems(player, RING_OF_KNOWLEDGE_ID, 1); + addExpAndSp(player, XP_REWARD_AMOUNT, 0); + st.exitQuest(false); + htmltext = "30041-04.html"; + } + break; + case State.COMPLETED: + htmltext = getAlreadyCompletedMsg(player); + break; + } + } + else + { + if (npc.getId() == JACKSON_ID) + { + if (hasQuestItems(player, HEAVY_WOOD_BOX_ID)) { - case State.CREATED: - htmltext = (player.getLevel() >= 2) ? "30041-01.htm" : "30041-00.htm"; - break; - case State.STARTED: - if (st.isCond(1)) - { - htmltext = "30041-03.html"; - } - else if (st.isCond(2)) - { - takeItems(player, DELIVERY_LIST_ID, -1); - takeItems(player, JACKSONS_RECEIPT_ID, -1); - takeItems(player, SILVIAS_RECEIPT_ID, -1); - takeItems(player, RANTS_RECEIPT_ID, -1); - // On retail it gives 2 rings but one at the time. - giveItems(player, RING_OF_KNOWLEDGE_ID, 1); - giveItems(player, RING_OF_KNOWLEDGE_ID, 1); - addExpAndSp(player, XP_REWARD_AMOUNT, 0); - st.exitQuest(false); - htmltext = "30041-04.html"; - } - break; - case State.COMPLETED: - htmltext = getAlreadyCompletedMsg(player); - break; + takeItems(player, HEAVY_WOOD_BOX_ID, -1); + giveItems(player, JACKSONS_RECEIPT_ID, 1); + htmltext = "30002-01.html"; + } + else + { + htmltext = "30002-02.html"; } } - else + else if (npc.getId() == SILVIA_ID) { - if (npc.getId() == JACKSON_ID) + if (hasQuestItems(player, CLOTH_BUNDLE_ID)) { - if (hasQuestItems(player, HEAVY_WOOD_BOX_ID)) - { - takeItems(player, HEAVY_WOOD_BOX_ID, -1); - giveItems(player, JACKSONS_RECEIPT_ID, 1); - htmltext = "30002-01.html"; - } - else - { - htmltext = "30002-02.html"; - } + takeItems(player, CLOTH_BUNDLE_ID, -1); + giveItems(player, SILVIAS_RECEIPT_ID, 1); + giveItems(player, SOULSHOT_NO_GRADE_ID, 3); + htmltext = "30003-01.html"; } - else if (npc.getId() == SILVIA_ID) + else { - if (hasQuestItems(player, CLOTH_BUNDLE_ID)) - { - takeItems(player, CLOTH_BUNDLE_ID, -1); - giveItems(player, SILVIAS_RECEIPT_ID, 1); - giveItems(player, SOULSHOT_NO_GRADE_ID, 3); - htmltext = "30003-01.html"; - } - else - { - htmltext = "30003-02.html"; - } + htmltext = "30003-02.html"; } - else if (npc.getId() == RANT_ID) + } + else if (npc.getId() == RANT_ID) + { + if (hasQuestItems(player, CLAY_POT_ID)) { - if (hasQuestItems(player, CLAY_POT_ID)) - { - takeItems(player, CLAY_POT_ID, -1); - giveItems(player, RANTS_RECEIPT_ID, 1); - htmltext = "30054-01.html"; - } - else - { - htmltext = "30054-02.html"; - } + takeItems(player, CLAY_POT_ID, -1); + giveItems(player, RANTS_RECEIPT_ID, 1); + htmltext = "30054-01.html"; } - - if (st.isCond(1) && hasQuestItems(player, JACKSONS_RECEIPT_ID) && hasQuestItems(player, SILVIAS_RECEIPT_ID) && hasQuestItems(player, RANTS_RECEIPT_ID)) + else { - st.setCond(2, true); + htmltext = "30054-02.html"; } } + + if (st.isCond(1) && hasQuestItems(player, JACKSONS_RECEIPT_ID) && hasQuestItems(player, SILVIAS_RECEIPT_ID) && hasQuestItems(player, RANTS_RECEIPT_ID)) + { + st.setCond(2, true); + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java index 1b1cbb293c..f536ef7934 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java @@ -70,6 +70,7 @@ public final class Q00154_SacrificeToTheSea extends Quest { final QuestState qs = getQuestState(talker, true); String htmltext = getNoQuestMsg(talker); + switch (npc.getId()) { case ROCKSWELL: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java index 839e877812..5a9b8114a0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java @@ -61,12 +61,8 @@ public class Q00155_FindSirWindawood 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java index f345de304c..e72d0765bf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java @@ -106,65 +106,63 @@ public class Q00156_MillenniumLove extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (npc.getId()) { - switch (npc.getId()) + case LILITH: { - case LILITH: + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: - { - htmltext = "30368-01.htm"; - break; - } - case State.STARTED: - { - if (st.isCond(1) && hasQuestItems(player, LILITHS_LETTER)) - { - htmltext = "30368-06.html"; - } - else if (st.isCond(2) && hasQuestItems(player, THEONS_DIARY)) - { - giveItems(player, GREATER_COMP_SOULSHOUT_PACKAGE_NO_GRADE, 1); - addExpAndSp(player, 3000, 0); - st.exitQuest(false, true); - htmltext = "30368-07.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; - } + htmltext = "30368-01.htm"; + break; + } + case State.STARTED: + { + if (st.isCond(1) && hasQuestItems(player, LILITHS_LETTER)) + { + htmltext = "30368-06.html"; + } + else if (st.isCond(2) && hasQuestItems(player, THEONS_DIARY)) + { + giveItems(player, GREATER_COMP_SOULSHOUT_PACKAGE_NO_GRADE, 1); + addExpAndSp(player, 3000, 0); + st.exitQuest(false, true); + htmltext = "30368-07.html"; + } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } - break; } - case BAENEDES: + break; + } + case BAENEDES: + { + switch (st.getCond()) { - switch (st.getCond()) + case 1: { - case 1: + if (hasQuestItems(player, LILITHS_LETTER)) { - if (hasQuestItems(player, LILITHS_LETTER)) - { - htmltext = "30369-01.html"; - } - break; - } - case 2: - { - if (hasQuestItems(player, THEONS_DIARY)) - { - htmltext = "30369-04.html"; - } - break; + htmltext = "30369-01.html"; } + break; + } + case 2: + { + if (hasQuestItems(player, THEONS_DIARY)) + { + htmltext = "30369-04.html"; + } + break; } - break; } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java index 919473f5c5..80ed0f1c15 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java @@ -97,34 +97,32 @@ public class Q00157_RecoverSmuggledGoods 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 ? "30005-02.htm" : "30005-01.htm"; + break; + } + case State.STARTED: + { + if (st.isCond(2) && (getQuestItemsCount(player, ADAMANTITE_ORE) >= 20)) { - htmltext = player.getLevel() >= MIN_LVL ? "30005-02.htm" : "30005-01.htm"; - break; + giveItems(player, BUCKLER, 1); + st.exitQuest(false, true); + htmltext = "30005-06.html"; } - case State.STARTED: + else { - if (st.isCond(2) && (getQuestItemsCount(player, ADAMANTITE_ORE) >= 20)) - { - giveItems(player, BUCKLER, 1); - st.exitQuest(false, true); - htmltext = "30005-06.html"; - } - else - { - htmltext = "30005-05.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "30005-05.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java index 12a6f0790e..56fe3667a8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java @@ -90,12 +90,8 @@ public class Q00158_SeedOfEvil 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java index 13ed73a07f..fcac326021 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java @@ -107,65 +107,63 @@ public class Q00159_ProtectTheWaterSource 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.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LVL ? "30154-03.htm" : "30154-02.htm") : "30154-01.htm"; + break; + } + case State.STARTED: + { + switch (st.getCond()) { - htmltext = (player.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LVL ? "30154-03.htm" : "30154-02.htm") : "30154-01.htm"; - break; - } - case State.STARTED: - { - switch (st.getCond()) + case 1: { - case 1: + if (hasQuestItems(player, HYACINTH_CHARM) && !hasQuestItems(player, PLAGUE_DUST)) { - if (hasQuestItems(player, HYACINTH_CHARM) && !hasQuestItems(player, PLAGUE_DUST)) - { - htmltext = "30154-05.html"; - } - break; - } - case 2: - { - if (hasQuestItems(player, HYACINTH_CHARM, PLAGUE_DUST)) - { - takeItems(player, HYACINTH_CHARM, -1); - takeItems(player, PLAGUE_DUST, -1); - giveItems(player, HYACINTH_CHARM2, 1); - st.setCond(3, true); - htmltext = "30154-06.html"; - } - break; - } - case 3: - { - if (hasQuestItems(player, HYACINTH_CHARM2)) - { - htmltext = "30154-07.html"; - } - break; - } - case 4: - { - if (hasQuestItems(player, HYACINTH_CHARM2) && (getQuestItemsCount(player, PLAGUE_DUST) >= 5)) - { - giveAdena(player, 18250, true); - st.exitQuest(false, true); - htmltext = "30154-08.html"; - } - break; + htmltext = "30154-05.html"; } + break; + } + case 2: + { + if (hasQuestItems(player, HYACINTH_CHARM, PLAGUE_DUST)) + { + takeItems(player, HYACINTH_CHARM, -1); + takeItems(player, PLAGUE_DUST, -1); + giveItems(player, HYACINTH_CHARM2, 1); + st.setCond(3, true); + htmltext = "30154-06.html"; + } + break; + } + case 3: + { + if (hasQuestItems(player, HYACINTH_CHARM2)) + { + htmltext = "30154-07.html"; + } + break; + } + case 4: + { + if (hasQuestItems(player, HYACINTH_CHARM2) && (getQuestItemsCount(player, PLAGUE_DUST) >= 5)) + { + giveAdena(player, 18250, true); + st.exitQuest(false, true); + htmltext = "30154-08.html"; + } + break; } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java index d14d81e201..40999023ac 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java @@ -73,6 +73,7 @@ public final class Q00160_NerupasRequest extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); + switch (qs.getState()) { case State.COMPLETED: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java index 2205850254..77dd1d0544 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java @@ -75,12 +75,8 @@ public class Q00161_FruitOfTheMotherTree 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java index 5385f0eece..1719ed36b2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java @@ -143,36 +143,34 @@ public class Q00162_CurseOfTheUndergroundFortress 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.getRace() != Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30147-02.htm" : "30147-01.htm" : "30147-00.htm"; + break; + } + case State.STARTED: + { + if ((getQuestItemsCount(player, BONE_FRAGMENT) + getQuestItemsCount(player, ELF_SKULL)) >= REQUIRED_COUNT) { - htmltext = (player.getRace() != Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30147-02.htm" : "30147-01.htm" : "30147-00.htm"; - break; + giveItems(player, BONE_SHIELD, 1); + addExpAndSp(player, 22652, 1004); + giveAdena(player, 24000, true); + st.exitQuest(false, true); + htmltext = "30147-06.html"; } - case State.STARTED: + else { - if ((getQuestItemsCount(player, BONE_FRAGMENT) + getQuestItemsCount(player, ELF_SKULL)) >= REQUIRED_COUNT) - { - giveItems(player, BONE_SHIELD, 1); - addExpAndSp(player, 22652, 1004); - giveAdena(player, 24000, true); - st.exitQuest(false, true); - htmltext = "30147-06.html"; - } - else - { - htmltext = "30147-05.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "30147-05.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java index aaeb977fc5..bfbaa18305 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java @@ -144,35 +144,33 @@ public class Q00163_LegacyOfThePoet 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.getRace() != Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30220-02.htm" : "30220-01.htm" : "30220-00.htm"; + break; + } + case State.STARTED: + { + if (hasQuestItems(player, RUMIELS_1ST_POEM, RUMIELS_2ND_POEM, RUMIELS_3RD_POEM, RUMIELS_4TH_POEM)) { - htmltext = (player.getRace() != Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30220-02.htm" : "30220-01.htm" : "30220-00.htm"; - break; + addExpAndSp(player, 21643, 943); + giveAdena(player, 13890, true); + st.exitQuest(false, true); + htmltext = "30220-07.html"; } - case State.STARTED: + else { - if (hasQuestItems(player, RUMIELS_1ST_POEM, RUMIELS_2ND_POEM, RUMIELS_3RD_POEM, RUMIELS_4TH_POEM)) - { - addExpAndSp(player, 21643, 943); - giveAdena(player, 13890, true); - st.exitQuest(false, true); - htmltext = "30220-07.html"; - } - else - { - htmltext = "30220-06.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "30220-06.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java index 7ca7691750..15e9589349 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java @@ -80,35 +80,33 @@ public class Q00164_BloodFiend 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.getRace() != Race.DARK_ELF) ? player.getLevel() >= MIN_LVL ? "30149-03.htm" : "30149-02.htm" : "30149-00.htm"; + break; + } + case State.STARTED: + { + if (st.isCond(2) && hasQuestItems(player, KIRUNAK_SKULL)) { - htmltext = (player.getRace() != Race.DARK_ELF) ? player.getLevel() >= MIN_LVL ? "30149-03.htm" : "30149-02.htm" : "30149-00.htm"; - break; + giveAdena(player, 42130, true); + addExpAndSp(player, 35637, 1854); + st.exitQuest(false, true); + htmltext = "30149-06.html"; } - case State.STARTED: + else { - if (st.isCond(2) && hasQuestItems(player, KIRUNAK_SKULL)) - { - giveAdena(player, 42130, true); - addExpAndSp(player, 35637, 1854); - st.exitQuest(false, true); - htmltext = "30149-06.html"; - } - else - { - htmltext = "30149-05.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "30149-05.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java index 781094365c..d3d159d311 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java @@ -96,35 +96,33 @@ public class Q00165_ShilensHunt 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.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30348-02.htm" : "30348-01.htm" : "30348-00.htm"; + break; + } + case State.STARTED: + { + if (st.isCond(2) && (getQuestItemsCount(player, DARK_BEZOAR) >= REQUIRED_COUNT)) { - htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30348-02.htm" : "30348-01.htm" : "30348-00.htm"; - break; + giveItems(player, LESSER_HEALING_POTION, 5); + addExpAndSp(player, 1000, 0); + st.exitQuest(false, true); + htmltext = "30348-05.html"; } - case State.STARTED: + else { - if (st.isCond(2) && (getQuestItemsCount(player, DARK_BEZOAR) >= REQUIRED_COUNT)) - { - giveItems(player, LESSER_HEALING_POTION, 5); - addExpAndSp(player, 1000, 0); - st.exitQuest(false, true); - htmltext = "30348-05.html"; - } - else - { - htmltext = "30348-04.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "30348-04.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java index ddfc48369a..ab47e83891 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java @@ -79,66 +79,64 @@ public class Q00166_MassOfDarkness extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (npc.getId()) { - switch (npc.getId()) + case UNDRIAS: { - case UNDRIAS: + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: - { - htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30130-02.htm" : "30130-01.htm" : "30130-00.htm"; - break; - } - case State.STARTED: - { - if (st.isCond(2) && hasQuestItems(player, UNDRIAS_LETTER, CEREMONIAL_DAGGER, DREVIANT_WINE, GARMIELS_SCRIPTURE)) - { - showOnScreenMsg(player, NpcStringId.DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE, 2, 5000); // TODO: Newbie Guide - addExpAndSp(player, 5672, 466); - giveAdena(player, 2966, true); - st.exitQuest(false, true); - htmltext = "30130-05.html"; - } - else - { - htmltext = "30130-04.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; - } + htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30130-02.htm" : "30130-01.htm" : "30130-00.htm"; + break; } - break; - } - case IRIA: - case DORANKUS: - case TRUDY: - { - if (st.isStarted()) + case State.STARTED: { - final int npcId = npc.getId(); - final int itemId = NPCs.get(npcId); - if (st.isCond(1) && !hasQuestItems(player, itemId)) + if (st.isCond(2) && hasQuestItems(player, UNDRIAS_LETTER, CEREMONIAL_DAGGER, DREVIANT_WINE, GARMIELS_SCRIPTURE)) { - giveItems(player, itemId, 1); - if (hasQuestItems(player, CEREMONIAL_DAGGER, DREVIANT_WINE, GARMIELS_SCRIPTURE)) - { - st.setCond(2, true); - } - htmltext = npcId + "-01.html"; + showOnScreenMsg(player, NpcStringId.DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_GUIDE, 2, 5000); // TODO: Newbie Guide + addExpAndSp(player, 5672, 466); + giveAdena(player, 2966, true); + st.exitQuest(false, true); + htmltext = "30130-05.html"; } else { - htmltext = npcId + "-02.html"; + htmltext = "30130-04.html"; } break; } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; + } + } + break; + } + case IRIA: + case DORANKUS: + case TRUDY: + { + if (st.isStarted()) + { + final int npcId = npc.getId(); + final int itemId = NPCs.get(npcId); + if (st.isCond(1) && !hasQuestItems(player, itemId)) + { + giveItems(player, itemId, 1); + if (hasQuestItems(player, CEREMONIAL_DAGGER, DREVIANT_WINE, GARMIELS_SCRIPTURE)) + { + st.setCond(2, true); + } + htmltext = npcId + "-01.html"; + } + else + { + htmltext = npcId + "-02.html"; + } + break; } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java index 8f8f730817..c12e126bff 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java @@ -109,55 +109,53 @@ public class Q00167_DwarvenKinship extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (npc.getId()) { - switch (npc.getId()) + case CARLON: { - case CARLON: + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: - { - htmltext = (player.getLevel() >= MIN_LVL) ? "30350-02.htm" : "30350-01.htm"; - break; - } - case State.STARTED: - { - if (st.isCond(1) && hasQuestItems(player, CARLONS_LETTER)) - { - htmltext = "30350-04.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; - } + htmltext = (player.getLevel() >= MIN_LVL) ? "30350-02.htm" : "30350-01.htm"; + break; + } + case State.STARTED: + { + if (st.isCond(1) && hasQuestItems(player, CARLONS_LETTER)) + { + htmltext = "30350-04.html"; + } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } - break; } - case HAPROCK: + break; + } + case HAPROCK: + { + if (st.isCond(1) && hasQuestItems(player, CARLONS_LETTER)) { - if (st.isCond(1) && hasQuestItems(player, CARLONS_LETTER)) - { - htmltext = "30255-01.html"; - } - else if (st.isCond(2) && hasQuestItems(player, NORMANS_LETTER)) - { - htmltext = "30255-05.html"; - } - break; + htmltext = "30255-01.html"; } - case NORMAN: + else if (st.isCond(2) && hasQuestItems(player, NORMANS_LETTER)) { - if (st.isCond(2) && hasQuestItems(player, NORMANS_LETTER)) - { - htmltext = "30210-01.html"; - } - break; + htmltext = "30255-05.html"; } + break; + } + case NORMAN: + { + if (st.isCond(2) && hasQuestItems(player, NORMANS_LETTER)) + { + htmltext = "30210-01.html"; + } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java index 605337b895..c16ea4a186 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java @@ -78,106 +78,104 @@ public class Q00168_DeliverSupplies extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (npc.getId()) { - switch (npc.getId()) + case JENNA: { - case JENNA: + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: + htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30349-02.htm" : "30349-01.htm" : "30349-00.htm"; + break; + } + case State.STARTED: + { + switch (st.getCond()) { - htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30349-02.htm" : "30349-01.htm" : "30349-00.htm"; - break; - } - case State.STARTED: - { - switch (st.getCond()) + case 1: { - case 1: + if (hasQuestItems(player, JENNAS_LETTER)) { - if (hasQuestItems(player, JENNAS_LETTER)) - { - htmltext = "30349-04.html"; - } - break; - } - case 2: - { - if (hasQuestItems(player, SENTRY_BLADE1, SENTRY_BLADE2, SENTRY_BLADE3)) - { - takeItems(player, SENTRY_BLADE1, -1); - st.setCond(3, true); - htmltext = "30349-05.html"; - } - break; - } - case 3: - { - if (hasAtLeastOneQuestItem(player, SENTRY_BLADE2, SENTRY_BLADE3)) - { - htmltext = "30349-07.html"; - } - break; - } - case 4: - { - if (getQuestItemsCount(player, OLD_BRONZE_SWORD) >= 2) - { - giveAdena(player, 820, true); - st.exitQuest(false, true); - htmltext = "30349-07.html"; - } - break; + htmltext = "30349-04.html"; } + break; + } + case 2: + { + if (hasQuestItems(player, SENTRY_BLADE1, SENTRY_BLADE2, SENTRY_BLADE3)) + { + takeItems(player, SENTRY_BLADE1, -1); + st.setCond(3, true); + htmltext = "30349-05.html"; + } + break; + } + case 3: + { + if (hasAtLeastOneQuestItem(player, SENTRY_BLADE2, SENTRY_BLADE3)) + { + htmltext = "30349-07.html"; + } + break; + } + case 4: + { + if (getQuestItemsCount(player, OLD_BRONZE_SWORD) >= 2) + { + giveAdena(player, 820, true); + st.exitQuest(false, true); + htmltext = "30349-07.html"; + } + break; } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } - break; } - case HARANT: + break; + } + case HARANT: + { + if (st.isCond(1) && hasQuestItems(player, JENNAS_LETTER)) { - if (st.isCond(1) && hasQuestItems(player, JENNAS_LETTER)) - { - takeItems(player, JENNAS_LETTER, -1); - giveItems(player, SENTRY_BLADE1, 1); - giveItems(player, SENTRY_BLADE2, 1); - giveItems(player, SENTRY_BLADE3, 1); - st.setCond(2, true); - htmltext = "30360-01.html"; - } - else if (st.isCond(2)) - { - htmltext = "30360-02.html"; - } - break; + takeItems(player, JENNAS_LETTER, -1); + giveItems(player, SENTRY_BLADE1, 1); + giveItems(player, SENTRY_BLADE2, 1); + giveItems(player, SENTRY_BLADE3, 1); + st.setCond(2, true); + htmltext = "30360-01.html"; } - case ROSELYN: - case KRISTIN: + else if (st.isCond(2)) { - if (st.isCond(3) && hasQuestItems(player, SENTRIES.get(npc.getId()))) - { - takeItems(player, SENTRIES.get(npc.getId()), -1); - giveItems(player, OLD_BRONZE_SWORD, 1); - if (getQuestItemsCount(player, OLD_BRONZE_SWORD) >= 2) - { - st.setCond(4, true); - } - htmltext = npc.getId() + "-01.html"; - } - else if (!hasQuestItems(player, SENTRIES.get(npc.getId())) && hasQuestItems(player, OLD_BRONZE_SWORD)) - { - htmltext = npc.getId() + "-02.html"; - } - break; + htmltext = "30360-02.html"; } + break; + } + case ROSELYN: + case KRISTIN: + { + if (st.isCond(3) && hasQuestItems(player, SENTRIES.get(npc.getId()))) + { + takeItems(player, SENTRIES.get(npc.getId()), -1); + giveItems(player, OLD_BRONZE_SWORD, 1); + if (getQuestItemsCount(player, OLD_BRONZE_SWORD) >= 2) + { + st.setCond(4, true); + } + htmltext = npc.getId() + "-01.html"; + } + else if (!hasQuestItems(player, SENTRIES.get(npc.getId())) && hasQuestItems(player, OLD_BRONZE_SWORD)) + { + htmltext = npc.getId() + "-02.html"; + } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java index c3cec9566c..5fa35bf8b7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java @@ -110,36 +110,34 @@ public class Q00169_OffspringOfNightmares 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.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30145-02.htm" : "30145-01.htm" : "30145-00.htm"; + break; + } + case State.STARTED: + { + if (hasQuestItems(player, CRACKED_SKULL) && !hasQuestItems(player, PERFECT_SKULL)) { - htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30145-02.htm" : "30145-01.htm" : "30145-00.htm"; - break; + htmltext = "30145-05.html"; } - case State.STARTED: + else if (st.isCond(2) && hasQuestItems(player, PERFECT_SKULL)) { - if (hasQuestItems(player, CRACKED_SKULL) && !hasQuestItems(player, PERFECT_SKULL)) - { - htmltext = "30145-05.html"; - } - else if (st.isCond(2) && hasQuestItems(player, PERFECT_SKULL)) - { - htmltext = "30145-06.html"; - } - else if (!hasQuestItems(player, CRACKED_SKULL, PERFECT_SKULL)) - { - htmltext = "30145-04.html"; - } - break; + htmltext = "30145-06.html"; } - case State.COMPLETED: + else if (!hasQuestItems(player, CRACKED_SKULL, PERFECT_SKULL)) { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "30145-04.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java index dd32eeeab9..ff9e2dfd3e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java @@ -87,12 +87,8 @@ public class Q00170_DangerousSeduction 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java index 82cd585379..04047867f2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00172_NewHorizons/Q00172_NewHorizons.java @@ -77,35 +77,41 @@ public class Q00172_NewHorizons 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); switch (npc.getId()) { case ZENYA: + { switch (st.getState()) { case State.CREATED: + { htmltext = (player.getRace() == Race.KAMAEL) ? (player.getLevel() >= MIN_LEVEL) ? "32140-01.htm" : "32140-02.htm" : "32140-03.htm"; break; + } case State.STARTED: + { htmltext = "32140-05.html"; break; + } case State.COMPLETED: + { htmltext = getAlreadyCompletedMsg(player); break; + } } break; + } case RAGARA: + { if (st.isStarted()) { htmltext = "32163-01.html"; } break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java index ade4242f3f..51c4c0dd5a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00173_ToTheIsleOfSouls/Q00173_ToTheIsleOfSouls.java @@ -86,12 +86,8 @@ public class Q00173_ToTheIsleOfSouls 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java index 558128e40c..f91defe896 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00174_SupplyCheck/Q00174_SupplyCheck.java @@ -78,12 +78,8 @@ public class Q00174_SupplyCheck 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java index 2b586637ac..c92ed67898 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00176_StepsForHonor/Q00176_StepsForHonor.java @@ -58,12 +58,8 @@ public class Q00176_StepsForHonor 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java index 865f9bfec0..dcf52ed303 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00179_IntoTheLargeCavern/Q00179_IntoTheLargeCavern.java @@ -80,12 +80,8 @@ public class Q00179_IntoTheLargeCavern 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() == KEKROPUS) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java index 1bc6832403..9acb2ddc44 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00182_NewRecruits/Q00182_NewRecruits.java @@ -77,12 +77,8 @@ public class Q00182_NewRecruits 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); final int npcId = npc.getId(); if (npcId == KEKROPUS) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java index 7af8da4487..17b51aca62 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00234_FatesWhisper/Q00234_FatesWhisper.java @@ -189,10 +189,7 @@ public final class Q00234_FatesWhisper extends Quest { final QuestState qs = getQuestState(player, true); final String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + switch (npc.getId()) { case ZENKIN: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java index 9431d7b201..4231df13c0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00237_WindsOfChange/Q00237_WindsOfChange.java @@ -171,12 +171,8 @@ public class Q00237_WindsOfChange 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java index e75de9a66f..3ec0f42707 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00238_SuccessFailureOfBusiness/Q00238_SuccessFailureOfBusiness.java @@ -143,12 +143,8 @@ public class Q00238_SuccessFailureOfBusiness 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java index f04e00dee3..52d8df19e4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00239_WontYouJoinUs/Q00239_WontYouJoinUs.java @@ -143,12 +143,8 @@ public class Q00239_WontYouJoinUs 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java index 4eb42c16c7..a34ef1eb03 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java @@ -105,12 +105,8 @@ public class Q00240_ImTheOnlyOneYouCanTrust 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java index fff5a3f7a7..dbcdf15fd8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java @@ -261,16 +261,12 @@ public class Q00241_PossessorOfAPreciousSoul1 extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - if (st == null) - { - return getNoQuestMsg(player); - } + String htmltext = getNoQuestMsg(player); if (st.isStarted() && !player.isSubClassActive()) { return "no_sub.html"; } - String htmltext = getNoQuestMsg(player); switch (npc.getId()) { case TALIEN: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java index ead6414211..a937fc7c64 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java @@ -161,12 +161,8 @@ public class Q00242_PossessorOfAPreciousSoul2 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 (st.isStarted() && !player.isSubClassActive()) { return "no_sub.html"; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java index 7e4faaa626..e32795082f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java @@ -251,12 +251,8 @@ public class Q00246_PossessorOfAPreciousSoul3 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 (st.isStarted() && !player.isSubClassActive()) { return "no_sub.html"; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java index 7b4767eb0c..e6b26fadac 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/Q00247_PossessorOfAPreciousSoul4.java @@ -97,12 +97,8 @@ public class Q00247_PossessorOfAPreciousSoul4 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 (st.isStarted() && !player.isSubClassActive()) { return "no_sub.html"; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java index 2ae0f2a2d7..17f51e5e26 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00249_PoisonedPlainsOfTheLizardmen/Q00249_PoisonedPlainsOfTheLizardmen.java @@ -69,12 +69,8 @@ public class Q00249_PoisonedPlainsOfTheLizardmen 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() == MOUEN) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java index bbf3fd4ba3..53f69b11b3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00250_WatchWhatYouEat/Q00250_WatchWhatYouEat.java @@ -136,12 +136,8 @@ public class Q00250_WatchWhatYouEat 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() == SALLY) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java index ae1cd05e8e..a484dacb22 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java @@ -115,12 +115,8 @@ public class Q00251_NoSecrets 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java index bce85a5573..40cf5c5a7d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java @@ -189,12 +189,8 @@ public class Q00254_LegendaryTales 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java index 3091df1a18..a3426e8ba4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java @@ -149,10 +149,6 @@ public final class Q00257_TheGuardIsBusy extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java index bc4eb95760..48c0963cca 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java @@ -101,10 +101,6 @@ public final class Q00258_BringWolfPelts extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java index 2d6017d645..7e7e96ee26 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java @@ -139,10 +139,6 @@ public final class Q00259_RequestFromTheFarmOwner extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java index ffd4ce5bc5..c7f8ac68c7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java @@ -113,10 +113,6 @@ public final class Q00260_OrcHunting extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java index 0c4e97164d..cc6cd308ae 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java @@ -89,10 +89,6 @@ public final class Q00261_CollectorsDream extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java index aa83c60896..dd83263980 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java @@ -99,12 +99,8 @@ public final class Q00262_TradeWithTheIvoryTower 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java index b74c78acab..7b67ada3f5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java @@ -107,12 +107,8 @@ public final class Q00263_OrcSubjugation 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java index ea01bf7c15..34d0df7ccd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java @@ -108,10 +108,6 @@ public final class Q00264_KeenClaws extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java index 985ea6b661..7d678f0405 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java @@ -108,10 +108,6 @@ public final class Q00265_BondsOfSlavery extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java index c0fef515df..5557a88bd9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java @@ -109,10 +109,7 @@ public final class Q00266_PleasOfPixies extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } + switch (st.getState()) { case State.CREATED: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java index 35fab3646f..446bfa01b3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java @@ -98,34 +98,32 @@ public final class Q00267_WrathOfVerdure 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.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LVL) ? "31853-03.htm" : "31853-02.htm" : "31853-01.htm"; + break; + } + case State.STARTED: + { + if (hasQuestItems(player, GOBLIN_CLUB)) { - htmltext = (player.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LVL) ? "31853-03.htm" : "31853-02.htm" : "31853-01.htm"; - break; + final long count = getQuestItemsCount(player, GOBLIN_CLUB); + rewardItems(player, SILVERY_LEAF, count); + if (count >= 10) + { + giveAdena(player, 600, true); + } + takeItems(player, GOBLIN_CLUB, -1); + htmltext = "31853-06.html"; } - case State.STARTED: + else { - if (hasQuestItems(player, GOBLIN_CLUB)) - { - final long count = getQuestItemsCount(player, GOBLIN_CLUB); - rewardItems(player, SILVERY_LEAF, count); - if (count >= 10) - { - giveAdena(player, 600, true); - } - takeItems(player, GOBLIN_CLUB, -1); - htmltext = "31853-06.html"; - } - else - { - htmltext = "31853-05.html"; - } - break; + htmltext = "31853-05.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java index 71975df342..bc2bd6237f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00268_TracesOfEvil/Q00268_TracesOfEvil.java @@ -88,38 +88,36 @@ public final class Q00268_TracesOfEvil 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) ? "30559-02.htm" : "30559-01.htm"; + break; + } + case State.STARTED: + { + switch (st.getCond()) { - htmltext = (player.getLevel() >= MIN_LVL) ? "30559-02.htm" : "30559-01.htm"; - break; - } - case State.STARTED: - { - switch (st.getCond()) + case 1: { - case 1: - { - htmltext = (!hasQuestItems(player, CONTAMINATED_KASHA_SPIDER_VENOM)) ? "30559-04.html" : "30559-05.html"; - break; - } - case 2: - { - if (getQuestItemsCount(player, CONTAMINATED_KASHA_SPIDER_VENOM) >= 30) - { - giveAdena(player, 2474, true); - addExpAndSp(player, 8738, 409); - st.exitQuest(true, true); - htmltext = "30559-06.html"; - } - break; - } + htmltext = (!hasQuestItems(player, CONTAMINATED_KASHA_SPIDER_VENOM)) ? "30559-04.html" : "30559-05.html"; + break; + } + case 2: + { + if (getQuestItemsCount(player, CONTAMINATED_KASHA_SPIDER_VENOM) >= 30) + { + giveAdena(player, 2474, true); + addExpAndSp(player, 8738, 409); + st.exitQuest(true, true); + htmltext = "30559-06.html"; + } + break; } - break; } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java index f58aba2a9a..6335153f0e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java index e5e0e702e9..690e858a24 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java @@ -89,47 +89,45 @@ public final class Q00271_ProofOfValor extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; - if (st != null) + String htmltext = getNoQuestMsg(player); + + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: + htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? (hasAtLeastOneQuestItem(player, NECKLACE_OF_VALOR, NECKLACE_OF_COURAGE)) ? "30577-07.htm" : "30577-03.htm" : "30577-02.htm" : "30577-01.htm"; + break; + } + case State.STARTED: + { + switch (st.getCond()) { - htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? (hasAtLeastOneQuestItem(player, NECKLACE_OF_VALOR, NECKLACE_OF_COURAGE)) ? "30577-07.htm" : "30577-03.htm" : "30577-02.htm" : "30577-01.htm"; - break; - } - case State.STARTED: - { - switch (st.getCond()) + case 1: { - case 1: - { - htmltext = "30577-05.html"; - break; - } - case 2: - { - if (getQuestItemsCount(player, KASHA_WOLF_FANG) >= 50) - { - if (getRandom(100) <= 13) - { - rewardItems(player, NECKLACE_OF_VALOR, 1); - rewardItems(player, HEALING_POTION, 10); - } - else - { - rewardItems(player, NECKLACE_OF_COURAGE, 1); - } - takeItems(player, KASHA_WOLF_FANG, -1); - st.exitQuest(true, true); - htmltext = "30577-06.html"; - } - break; - } + htmltext = "30577-05.html"; + break; + } + case 2: + { + if (getQuestItemsCount(player, KASHA_WOLF_FANG) >= 50) + { + if (getRandom(100) <= 13) + { + rewardItems(player, NECKLACE_OF_VALOR, 1); + rewardItems(player, HEALING_POTION, 10); + } + else + { + rewardItems(player, NECKLACE_OF_COURAGE, 1); + } + takeItems(player, KASHA_WOLF_FANG, -1); + st.exitQuest(true, true); + htmltext = "30577-06.html"; + } + break; } - break; } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java index 0041d28d05..a220bae5bd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java @@ -87,35 +87,33 @@ public final class Q00272_WrathOfAncestors extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; - if (st != null) + String htmltext = getNoQuestMsg(player); + + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: + htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? "30572-03.htm" : "30572-02.htm" : "30572-01.htm"; + break; + } + case State.STARTED: + { + switch (st.getCond()) { - htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? "30572-03.htm" : "30572-02.htm" : "30572-01.htm"; - break; - } - case State.STARTED: - { - switch (st.getCond()) + case 1: { - case 1: - { - htmltext = "30572-05.html"; - break; - } - case 2: - { - giveAdena(player, 1500, true); - st.exitQuest(true, true); - htmltext = "30572-06.html"; - break; - } + htmltext = "30572-05.html"; + break; + } + case 2: + { + giveAdena(player, 1500, true); + st.exitQuest(true, true); + htmltext = "30572-06.html"; + break; } - break; } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java index 857eae14bf..3d94a0fa90 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java @@ -114,33 +114,31 @@ public final class Q00273_InvadersOfTheHolyLand extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; - if (st != null) + String htmltext = getNoQuestMsg(player); + + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: + htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? "30566-03.htm" : "30566-02.htm" : "30566-01.htm"; + break; + } + case State.STARTED: + { + if (hasAtLeastOneQuestItem(player, BLACK_SOULSTONE, RED_SOULSTONE)) { - htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? "30566-03.htm" : "30566-02.htm" : "30566-01.htm"; - break; + final long black = getQuestItemsCount(player, BLACK_SOULSTONE); + final long red = getQuestItemsCount(player, RED_SOULSTONE); + giveAdena(player, (red * 10) + (black * 3) + ((red > 0) ? (((red + black) >= 10) ? 1800 : 0) : ((black >= 10) ? 1500 : 0)), true); + takeItems(player, -1, BLACK_SOULSTONE, RED_SOULSTONE); + Q00281_HeadForTheHills.giveNewbieReward(player); + htmltext = (red > 0) ? "30566-07.html" : "30566-06.html"; } - case State.STARTED: + else { - if (hasAtLeastOneQuestItem(player, BLACK_SOULSTONE, RED_SOULSTONE)) - { - final long black = getQuestItemsCount(player, BLACK_SOULSTONE); - final long red = getQuestItemsCount(player, RED_SOULSTONE); - giveAdena(player, (red * 10) + (black * 3) + ((red > 0) ? (((red + black) >= 10) ? 1800 : 0) : ((black >= 10) ? 1500 : 0)), true); - takeItems(player, -1, BLACK_SOULSTONE, RED_SOULSTONE); - Q00281_HeadForTheHills.giveNewbieReward(player); - htmltext = (red > 0) ? "30566-07.html" : "30566-06.html"; - } - else - { - htmltext = "30566-05.html"; - } - break; + htmltext = "30566-05.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java index 9ae957b334..b020db0c11 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java @@ -95,10 +95,6 @@ public final class Q00274_SkirmishWithTheWerewolves extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java index 6efbee9089..3d7227d696 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java @@ -127,10 +127,6 @@ public final class Q00275_DarkWingedSpies extends Quest { final QuestState st = getQuestState(talker, true); String htmltext = getNoQuestMsg(talker); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java index 52f978b7da..e6526c3850 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java @@ -131,10 +131,6 @@ public final class Q00276_TotemOfTheHestui extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java index 4dc1d3f8c2..af2b094a1e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java @@ -87,12 +87,8 @@ public class Q00277_GatekeepersOffering 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java index c2f2e1fdbe..f73a1a567a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00278_HomeSecurity/Q00278_HomeSecurity.java @@ -170,12 +170,8 @@ public class Q00278_HomeSecurity 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 (qs.isCreated()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java index ffbedc8791..8411501c3f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00279_TargetOfOpportunity/Q00279_TargetOfOpportunity.java @@ -120,12 +120,8 @@ public final class Q00279_TargetOfOpportunity extends Quest @Override public final 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 (st.getState() == State.CREATED) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java index ce4ac79b9d..6ffa5a154d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00280_TheFoodChain/Q00280_TheFoodChain.java @@ -174,10 +174,6 @@ public final class Q00280_TheFoodChain extends Quest { final QuestState st = getQuestState(talker, true); String htmltext = getNoQuestMsg(talker); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java index cad0ef9f01..c9c213ab29 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00281_HeadForTheHills/Q00281_HeadForTheHills.java @@ -170,10 +170,6 @@ public final class Q00281_HeadForTheHills extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java index 1494e2b3b8..5de046c8f8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00283_TheFewTheProudTheBrave/Q00283_TheFewTheProudTheBrave.java @@ -115,10 +115,6 @@ public final class Q00283_TheFewTheProudTheBrave extends Quest { final QuestState st = getQuestState(talker, true); String htmltext = getNoQuestMsg(talker); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java index 0dbf1799ce..078cfa0ed0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00287_FiguringItOut/Q00287_FiguringItOut.java @@ -177,23 +177,22 @@ public class Q00287_FiguringItOut extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); final QuestState prev = player.getQuestState(Q00250_WatchWhatYouEat.class.getSimpleName()); - if (st == null) - { - return htmltext; - } - switch (st.getState()) { case State.CREATED: + { htmltext = ((player.getLevel() >= MIN_LEVEL) && (prev != null) && prev.isCompleted()) ? "32742-01.htm" : "32742-14.htm"; break; + } case State.STARTED: + { htmltext = (getQuestItemsCount(player, VIAL_OF_TANTA_BLOOD) < 100) ? "32742-04.html" : "32742-05.html"; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java index 0196256764..eb5611ebc8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java @@ -187,10 +187,6 @@ public class Q00288_HandleWithCare extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java index 9c7a8ba75b..18383f4c49 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java @@ -234,12 +234,8 @@ public class Q00289_NoMoreSoupForYou 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() == STAN) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java index 86afc9c9ac..948f6b9321 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java @@ -196,10 +196,6 @@ public class Q00290_ThreatRemoval extends Quest { QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java index 4e7200c47f..0b7ddbc2b0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java @@ -131,10 +131,6 @@ public final class Q00293_TheHiddenVeins extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java index a016d713f9..0f50b87bed 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java @@ -87,12 +87,8 @@ public class Q00297_GatekeepersFavor 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java index b9c8272724..588c04af89 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java @@ -142,12 +142,8 @@ public final class Q00300_HuntingLetoLizardman 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java index 7eef98f6dd..2e0806d803 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java @@ -77,12 +77,8 @@ public final class Q00303_CollectArrowheads 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java index 5a3ef8f12b..bb4f86a1f9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java @@ -123,12 +123,8 @@ public final class Q00306_CrystalOfFireAndIce 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java index 3705d37532..e180d627ae 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00307_ControlDeviceOfTheGiants/Q00307_ControlDeviceOfTheGiants.java @@ -182,12 +182,8 @@ public class Q00307_ControlDeviceOfTheGiants 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java index b73a14945d..0af63fbce3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java @@ -235,12 +235,8 @@ public class Q00308_ReedFieldMaintenance extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance talker) { - String htmltext = getNoQuestMsg(talker); final QuestState st = getQuestState(talker, true); - if (st == null) - { - return htmltext; - } + String htmltext = getNoQuestMsg(talker); final QuestState q309 = talker.getQuestState(Q00309_ForAGoodCause.class.getSimpleName()); if ((q309 != null) && q309.isStarted()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java index 8adf65c40b..f313c20ddd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java @@ -238,12 +238,8 @@ public class Q00309_ForAGoodCause extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance talker) { - String htmltext = getNoQuestMsg(talker); final QuestState st = getQuestState(talker, true); - if (st == null) - { - return htmltext; - } + String htmltext = getNoQuestMsg(talker); final QuestState q308 = talker.getQuestState(Q00308_ReedFieldMaintenance.class.getSimpleName()); if ((q308 != null) && q308.isStarted()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java index 3205080d34..ae733f7120 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00310_OnlyWhatRemains/Q00310_OnlyWhatRemains.java @@ -134,13 +134,8 @@ public class Q00310_OnlyWhatRemains 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java index 2c5b65dba1..bf4a1d4b3d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00311_ExpulsionOfEvilSpirits/Q00311_ExpulsionOfEvilSpirits.java @@ -156,10 +156,6 @@ public final class Q00311_ExpulsionOfEvilSpirits extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } if (qs.isCreated()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java index eb0935bf54..70d1560528 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00312_TakeAdvantageOfTheCrisis/Q00312_TakeAdvantageOfTheCrisis.java @@ -113,21 +113,21 @@ public class Q00312_TakeAdvantageOfTheCrisis 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); switch (st.getState()) { case State.CREATED: + { htmltext = (player.getLevel() >= MIN_LEVEL) ? "30535-01.htm" : "30535-00.htm"; break; + } case State.STARTED: + { htmltext = (hasQuestItems(player, MINERAL_FRAGMENT)) ? "30535-08.html" : "30535-07.html"; break; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java index 225442a4d1..0dce7f7bf5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java @@ -94,12 +94,8 @@ public final class Q00313_CollectSpores 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java index df10281f68..9d8c028c9d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java @@ -133,10 +133,6 @@ public final class Q00316_DestroyPlagueCarriers extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } if (qs.isCreated()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java index ce3baba0a5..b0fe0ea50b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java @@ -109,10 +109,6 @@ public final class Q00317_CatchTheWind extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } if (qs.isCreated()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java index 1e562c7105..a8b468cdf3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java @@ -104,12 +104,8 @@ public class Q00319_ScentOfDeath extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - if (st == null) - { - return getNoQuestMsg(player); - } - String htmltext = getNoQuestMsg(player); + switch (st.getState()) { case State.CREATED: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java index 7d9e6c5499..f23b03d98a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java @@ -79,12 +79,8 @@ public final class Q00320_BonesTellTheFuture 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java index 5883bb6740..c50d699feb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java @@ -79,29 +79,27 @@ public class Q00324_SweetestVenom 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 ? "30351-02.html" : "30351-03.htm"; + break; + } + case State.STARTED: + { + if (st.isCond(2)) { - htmltext = player.getLevel() < MIN_LVL ? "30351-02.html" : "30351-03.htm"; - break; + giveAdena(player, ADENA_COUNT, true); + st.exitQuest(true, true); + htmltext = "30351-06.html"; } - case State.STARTED: + else { - if (st.isCond(2)) - { - giveAdena(player, ADENA_COUNT, true); - st.exitQuest(true, true); - htmltext = "30351-06.html"; - } - else - { - htmltext = "30351-05.html"; - } - break; + htmltext = "30351-05.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java index e266a1ddd1..80d6cc6a6c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java @@ -217,12 +217,8 @@ public final class Q00325_GrimCollector 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java index 13310d0b20..b6a7448894 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java @@ -115,37 +115,35 @@ public final class Q00326_VanquishRemnants extends Quest { final QuestState st = getQuestState(player, true); String htmltext = null; - if (st != null) + + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: + htmltext = (player.getLevel() >= MIN_LVL) ? "30435-02.htm" : "30435-01.htm"; + break; + } + case State.STARTED: + { + final long red_badges = getQuestItemsCount(player, RED_CROSS_BADGE); + final long blue_badges = getQuestItemsCount(player, BLUE_CROSS_BADGE); + final long black_badges = getQuestItemsCount(player, BLACK_CROSS_BADGE); + final long sum = red_badges + blue_badges + black_badges; + if (sum > 0) { - htmltext = (player.getLevel() >= MIN_LVL) ? "30435-02.htm" : "30435-01.htm"; - break; + if ((sum >= 100) && !hasQuestItems(player, BLACK_LION_MARK)) + { + giveItems(player, BLACK_LION_MARK, 1); + } + giveAdena(player, ((red_badges * 46) + (blue_badges * 52) + (black_badges * 58) + ((sum >= 10) ? 4320 : 0)), true); + takeItems(player, -1, RED_CROSS_BADGE, BLUE_CROSS_BADGE, BLACK_CROSS_BADGE); + htmltext = (sum >= 100) ? (hasQuestItems(player, BLACK_LION_MARK)) ? "30435-09.html" : "30435-06.html" : "30435-05.html"; } - case State.STARTED: + else { - final long red_badges = getQuestItemsCount(player, RED_CROSS_BADGE); - final long blue_badges = getQuestItemsCount(player, BLUE_CROSS_BADGE); - final long black_badges = getQuestItemsCount(player, BLACK_CROSS_BADGE); - final long sum = red_badges + blue_badges + black_badges; - if (sum > 0) - { - if ((sum >= 100) && !hasQuestItems(player, BLACK_LION_MARK)) - { - giveItems(player, BLACK_LION_MARK, 1); - } - giveAdena(player, ((red_badges * 46) + (blue_badges * 52) + (black_badges * 58) + ((sum >= 10) ? 4320 : 0)), true); - takeItems(player, -1, RED_CROSS_BADGE, BLUE_CROSS_BADGE, BLACK_CROSS_BADGE); - htmltext = (sum >= 100) ? (hasQuestItems(player, BLACK_LION_MARK)) ? "30435-09.html" : "30435-06.html" : "30435-05.html"; - } - else - { - htmltext = "30435-04.html"; - } - break; + htmltext = "30435-04.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java index 16434ffe3d..7cd54a885f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java @@ -100,32 +100,30 @@ public class Q00328_SenseForBusiness 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 ? "30436-01.htm" : "30436-02.htm"; + break; + } + case State.STARTED: + { + final long carcass = getQuestItemsCount(player, MONSTER_EYE_CARCASS); + final long lens = getQuestItemsCount(player, MONSTER_EYE_LENS); + final long gizzards = getQuestItemsCount(player, BASILISK_GIZZARD); + if ((carcass + lens + gizzards) > 0) { - htmltext = player.getLevel() < MIN_LVL ? "30436-01.htm" : "30436-02.htm"; - break; + giveAdena(player, ((carcass * MONSTER_EYE_CARCASS_ADENA) + (lens * MONSTER_EYE_LENS_ADENA) + (gizzards * BASILISK_GIZZARD_ADENA) + ((carcass + lens + gizzards) >= BONUS_COUNT ? BONUS : 0)), true); + takeItems(player, -1, MONSTER_EYE_CARCASS, MONSTER_EYE_LENS, BASILISK_GIZZARD); + htmltext = "30436-05.html"; } - case State.STARTED: + else { - final long carcass = getQuestItemsCount(player, MONSTER_EYE_CARCASS); - final long lens = getQuestItemsCount(player, MONSTER_EYE_LENS); - final long gizzards = getQuestItemsCount(player, BASILISK_GIZZARD); - if ((carcass + lens + gizzards) > 0) - { - giveAdena(player, ((carcass * MONSTER_EYE_CARCASS_ADENA) + (lens * MONSTER_EYE_LENS_ADENA) + (gizzards * BASILISK_GIZZARD_ADENA) + ((carcass + lens + gizzards) >= BONUS_COUNT ? BONUS : 0)), true); - takeItems(player, -1, MONSTER_EYE_CARCASS, MONSTER_EYE_LENS, BASILISK_GIZZARD); - htmltext = "30436-05.html"; - } - else - { - htmltext = "30436-04.html"; - } - break; + htmltext = "30436-04.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java index 0728d22b7f..c4ad40d506 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java @@ -117,12 +117,8 @@ public final class Q00329_CuriosityOfADwarf 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java index 09a2cf0f9c..254429855d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java @@ -99,32 +99,30 @@ public class Q00331_ArrowOfVengeance 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 ? "30125-01.htm" : "30125-02.htm"; + break; + } + case State.STARTED: + { + final long harpyFeathers = getQuestItemsCount(player, HARPY_FEATHER); + final long medusaVenoms = getQuestItemsCount(player, MEDUSA_VENOM); + final long wyrmsTeeth = getQuestItemsCount(player, WYRMS_TOOTH); + if ((harpyFeathers + medusaVenoms + wyrmsTeeth) > 0) { - htmltext = player.getLevel() < MIN_LVL ? "30125-01.htm" : "30125-02.htm"; - break; + giveAdena(player, ((harpyFeathers * HARPY_FEATHER_ADENA) + (medusaVenoms * MEDUSA_VENOM_ADENA) + (wyrmsTeeth * WYRMS_TOOTH_ADENA) + ((harpyFeathers + medusaVenoms + wyrmsTeeth) >= BONUS_COUNT ? BONUS : 0)), true); + takeItems(player, -1, HARPY_FEATHER, MEDUSA_VENOM, WYRMS_TOOTH); + htmltext = "30125-05.html"; } - case State.STARTED: + else { - final long harpyFeathers = getQuestItemsCount(player, HARPY_FEATHER); - final long medusaVenoms = getQuestItemsCount(player, MEDUSA_VENOM); - final long wyrmsTeeth = getQuestItemsCount(player, WYRMS_TOOTH); - if ((harpyFeathers + medusaVenoms + wyrmsTeeth) > 0) - { - giveAdena(player, ((harpyFeathers * HARPY_FEATHER_ADENA) + (medusaVenoms * MEDUSA_VENOM_ADENA) + (wyrmsTeeth * WYRMS_TOOTH_ADENA) + ((harpyFeathers + medusaVenoms + wyrmsTeeth) >= BONUS_COUNT ? BONUS : 0)), true); - takeItems(player, -1, HARPY_FEATHER, MEDUSA_VENOM, WYRMS_TOOTH); - htmltext = "30125-05.html"; - } - else - { - htmltext = "30125-04.html"; - } - break; + htmltext = "30125-04.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java index c9b5c57c00..f45406e100 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00334_TheWishingPotion/Q00334_TheWishingPotion.java @@ -122,200 +122,198 @@ public final class Q00334_TheWishingPotion extends Quest { final QuestState qs = getQuestState(player, true); final String htmltext = getNoQuestMsg(player); - if (qs != null) + + switch (npc.getId()) { - switch (npc.getId()) + case TORAI: { - case TORAI: + if (hasQuestItems(player, Q_FOBBIDEN_LOVE_SCROLL)) { - if (hasQuestItems(player, Q_FOBBIDEN_LOVE_SCROLL)) - { - giveAdena(player, 500000, true); - takeItems(player, Q_FOBBIDEN_LOVE_SCROLL, 1); - playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); - return "30557-01.html"; - } - break; + giveAdena(player, 500000, true); + takeItems(player, Q_FOBBIDEN_LOVE_SCROLL, 1); + playSound(player, QuestSound.ITEMSOUND_QUEST_MIDDLE); + return "30557-01.html"; } - case ALCHEMIST_MATILD: + break; + } + case ALCHEMIST_MATILD: + { + if (qs.isCreated()) { - if (qs.isCreated()) + if (player.getLevel() < 30) { - if (player.getLevel() < 30) - { - return "30738-01.htm"; - } - return "30738-02.html"; + return "30738-01.htm"; } - if (!hasQuestItems(player, Q_SECRET_BOOK_OF_POTION) && hasQuestItems(player, Q_ALCHEMY_TEXT)) - { - return "30738-05.html"; - } - if (hasQuestItems(player, Q_SECRET_BOOK_OF_POTION) && hasQuestItems(player, Q_ALCHEMY_TEXT)) - { - return "30738-06.html"; - } - if (hasQuestItems(player, Q_POTION_RECIPE_1, Q_POTION_RECIPE_2) && (!hasQuestItems(player, Q_AMBER_SCALE) || (hasQuestItems(player, Q_WIND_SOULSTONE) && !hasQuestItems(player, Q_GLASS_EYE)) || (!hasQuestItems(player, Q_HORROR_ECTOPLASM) || !hasQuestItems(player, Q_SILENOS_HORN) || !hasQuestItems(player, Q_ANT_SOLDIER_APHID) || !hasQuestItems(player, Q_TYRANTS_CHITIN) || !hasQuestItems(player, Q_BUGBEAR_BLOOD)))) - { - return "30738-08.html"; - } - if (hasQuestItems(player, Q_POTION_RECIPE_1, Q_POTION_RECIPE_2, Q_AMBER_SCALE, Q_WIND_SOULSTONE, Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD)) - { - return "30738-09.html"; - } - if (hasQuestItems(player, Q_MATILDS_ORB) && !hasQuestItems(player, Q_POTION_RECIPE_1) && !hasQuestItems(player, Q_POTION_RECIPE_2) && (!hasQuestItems(player, Q_AMBER_SCALE) || (hasQuestItems(player, Q_WIND_SOULSTONE) && !hasQuestItems(player, Q_GLASS_EYE)) || !hasQuestItems(player, Q_HORROR_ECTOPLASM) || !hasQuestItems(player, Q_SILENOS_HORN) || !hasQuestItems(player, Q_ANT_SOLDIER_APHID) || !hasQuestItems(player, Q_TYRANTS_CHITIN) || !hasQuestItems(player, Q_BUGBEAR_BLOOD))) - { - return "30738-12.html"; - } - break; + return "30738-02.html"; } - case FAIRY_RUPINA: + if (!hasQuestItems(player, Q_SECRET_BOOK_OF_POTION) && hasQuestItems(player, Q_ALCHEMY_TEXT)) { - if (qs.getInt(FLAG) == 1) + return "30738-05.html"; + } + if (hasQuestItems(player, Q_SECRET_BOOK_OF_POTION) && hasQuestItems(player, Q_ALCHEMY_TEXT)) + { + return "30738-06.html"; + } + if (hasQuestItems(player, Q_POTION_RECIPE_1, Q_POTION_RECIPE_2) && (!hasQuestItems(player, Q_AMBER_SCALE) || (hasQuestItems(player, Q_WIND_SOULSTONE) && !hasQuestItems(player, Q_GLASS_EYE)) || (!hasQuestItems(player, Q_HORROR_ECTOPLASM) || !hasQuestItems(player, Q_SILENOS_HORN) || !hasQuestItems(player, Q_ANT_SOLDIER_APHID) || !hasQuestItems(player, Q_TYRANTS_CHITIN) || !hasQuestItems(player, Q_BUGBEAR_BLOOD)))) + { + return "30738-08.html"; + } + if (hasQuestItems(player, Q_POTION_RECIPE_1, Q_POTION_RECIPE_2, Q_AMBER_SCALE, Q_WIND_SOULSTONE, Q_WIND_SOULSTONE, Q_GLASS_EYE, Q_GLASS_EYE, Q_HORROR_ECTOPLASM, Q_SILENOS_HORN, Q_ANT_SOLDIER_APHID, Q_TYRANTS_CHITIN, Q_BUGBEAR_BLOOD)) + { + return "30738-09.html"; + } + if (hasQuestItems(player, Q_MATILDS_ORB) && !hasQuestItems(player, Q_POTION_RECIPE_1) && !hasQuestItems(player, Q_POTION_RECIPE_2) && (!hasQuestItems(player, Q_AMBER_SCALE) || (hasQuestItems(player, Q_WIND_SOULSTONE) && !hasQuestItems(player, Q_GLASS_EYE)) || !hasQuestItems(player, Q_HORROR_ECTOPLASM) || !hasQuestItems(player, Q_SILENOS_HORN) || !hasQuestItems(player, Q_ANT_SOLDIER_APHID) || !hasQuestItems(player, Q_TYRANTS_CHITIN) || !hasQuestItems(player, Q_BUGBEAR_BLOOD))) + { + return "30738-12.html"; + } + break; + } + case FAIRY_RUPINA: + { + if (qs.getInt(FLAG) == 1) + { + String html = null; + if ((getRandom(4) < 4)) { - String html = null; - if ((getRandom(4) < 4)) - { - giveItems(player, NECKLACE_OF_GRACE, 1); - qs.set(FLAG, 0); - html = "30742-01.html"; - } - else - { - switch (getRandom(4)) - { - case 0: - { - giveItems(player, DEMONS_TUNIC_FABRIC, 1); - break; - } - case 1: - { - giveItems(player, DEMONS_HOSE_PATTERN, 1); - break; - } - case 2: - { - giveItems(player, DEMONS_BOOTS_FABRIC, 1); - break; - } - case 3: - { - giveItems(player, DEMONS_GLOVES_FABRIC, 1); - } - } - html = "30742-02.html"; - } + giveItems(player, NECKLACE_OF_GRACE, 1); qs.set(FLAG, 0); - npc.deleteMe(); - return html; + html = "30742-01.html"; } - break; - } - case WISDOM_CHEST: - { - if (qs.getInt(FLAG) == 4) + else { - final int random = getRandom(100); - String html = null; - if (random < 10) + switch (getRandom(4)) { - giveItems(player, Q_FOBBIDEN_LOVE_SCROLL, 1); - html = "30743-02.html"; - } - else if ((random >= 10) && (random < 50)) - { - switch (getRandom(4)) + case 0: { - case 0: - { - giveItems(player, DEMONS_TUNIC_FABRIC, 1); - break; - } - case 1: - { - giveItems(player, DEMONS_HOSE_PATTERN, 1); - break; - } - case 2: - { - giveItems(player, DEMONS_BOOTS_FABRIC, 1); - break; - } - case 3: - { - giveItems(player, DEMONS_GLOVES_FABRIC, 1); - break; - } + giveItems(player, DEMONS_TUNIC_FABRIC, 1); + break; } - html = "30743-03.html"; - } - else if ((random >= 50) && (random < 100)) - { - switch (getRandom(2)) + case 1: { - case 0: - { - giveItems(player, Q_MUSICNOTE_LOVE, 1); - break; - } - case 1: - { - giveItems(player, Q_MUSICNOTE_BATTLE, 1); - break; - } + giveItems(player, DEMONS_HOSE_PATTERN, 1); + break; } - html = "30743-04.html"; - } - else if ((random >= 85) && (random < 95)) - { - switch (getRandom(4)) + case 2: { - case 0: - { - giveItems(player, DEMONS_TUNIC, 1); - break; - } - case 1: - { - giveItems(player, DEMONS_HOSE, 1); - break; - } - case 2: - { - giveItems(player, DEMONS_BOOTS, 1); - break; - } - case 3: - { - giveItems(player, DEMONS_GLOVES, 1); - break; - } + giveItems(player, DEMONS_BOOTS_FABRIC, 1); + break; } - html = "30743-05.html"; - } - else if (random >= 95) - { - switch (getRandom(2)) + case 3: { - case 0: - { - giveItems(player, Q_GOLD_CIRCLET, 1); - break; - } - case 1: - { - giveItems(player, Q_SILVER_CIRCLET, 1); - } + giveItems(player, DEMONS_GLOVES_FABRIC, 1); } - html = "30743-06.htm"; } - qs.set(FLAG, 0); - npc.deleteMe(); - return html; + html = "30742-02.html"; } - break; + qs.set(FLAG, 0); + npc.deleteMe(); + return html; } + break; + } + case WISDOM_CHEST: + { + if (qs.getInt(FLAG) == 4) + { + final int random = getRandom(100); + String html = null; + if (random < 10) + { + giveItems(player, Q_FOBBIDEN_LOVE_SCROLL, 1); + html = "30743-02.html"; + } + else if ((random >= 10) && (random < 50)) + { + switch (getRandom(4)) + { + case 0: + { + giveItems(player, DEMONS_TUNIC_FABRIC, 1); + break; + } + case 1: + { + giveItems(player, DEMONS_HOSE_PATTERN, 1); + break; + } + case 2: + { + giveItems(player, DEMONS_BOOTS_FABRIC, 1); + break; + } + case 3: + { + giveItems(player, DEMONS_GLOVES_FABRIC, 1); + break; + } + } + html = "30743-03.html"; + } + else if ((random >= 50) && (random < 100)) + { + switch (getRandom(2)) + { + case 0: + { + giveItems(player, Q_MUSICNOTE_LOVE, 1); + break; + } + case 1: + { + giveItems(player, Q_MUSICNOTE_BATTLE, 1); + break; + } + } + html = "30743-04.html"; + } + else if ((random >= 85) && (random < 95)) + { + switch (getRandom(4)) + { + case 0: + { + giveItems(player, DEMONS_TUNIC, 1); + break; + } + case 1: + { + giveItems(player, DEMONS_HOSE, 1); + break; + } + case 2: + { + giveItems(player, DEMONS_BOOTS, 1); + break; + } + case 3: + { + giveItems(player, DEMONS_GLOVES, 1); + break; + } + } + html = "30743-05.html"; + } + else if (random >= 95) + { + switch (getRandom(2)) + { + case 0: + { + giveItems(player, Q_GOLD_CIRCLET, 1); + break; + } + case 1: + { + giveItems(player, Q_SILVER_CIRCLET, 1); + } + } + html = "30743-06.htm"; + } + qs.set(FLAG, 0); + npc.deleteMe(); + return html; + } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java index 663d0e2372..0b4110be77 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00336_CoinsOfMagic/Q00336_CoinsOfMagic.java @@ -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: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java index 360fd1895c..6cf1093432 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00338_AlligatorHunter/Q00338_AlligatorHunter.java @@ -110,12 +110,8 @@ public class Q00338_AlligatorHunter 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java index 63521adb16..eb795538f5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java @@ -89,29 +89,27 @@ public class Q00341_HuntingForWildBeasts extends Quest { final QuestState st = getQuestState(player, false); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: + htmltext = player.getLevel() >= MIN_LVL ? "30078-01.html" : "30078-02.htm"; + break; + } + case State.STARTED: + { + if (st.isCond(2) && (getQuestItemsCount(player, BEAR_SKIN) >= REQUIRED_COUNT)) { - htmltext = player.getLevel() >= MIN_LVL ? "30078-01.html" : "30078-02.htm"; - break; + giveAdena(player, ADENA_COUNT, true); + st.exitQuest(true, true); + htmltext = "30078-05.html"; } - case State.STARTED: + else { - if (st.isCond(2) && (getQuestItemsCount(player, BEAR_SKIN) >= REQUIRED_COUNT)) - { - giveAdena(player, ADENA_COUNT, true); - st.exitQuest(true, true); - htmltext = "30078-05.html"; - } - else - { - htmltext = "30078-06.html"; - } - break; + htmltext = "30078-06.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index 0b6d450eb5..8327212db6 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -217,12 +217,8 @@ public class Q00350_EnhanceYourWeapon 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 (st.getState() == State.CREATED) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java index 0254614934..5874f15b1f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java @@ -159,10 +159,6 @@ public final class Q00354_ConquestOfAlligatorIsland extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } if (st.isCreated()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java index 99294a4056..eef5da9b03 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java @@ -129,10 +129,6 @@ public final class Q00360_PlunderTheirSupplies extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java index eff9e7add4..9053cd3588 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00365_DevilsLegacy/Q00365_DevilsLegacy.java @@ -212,10 +212,6 @@ public final class Q00365_DevilsLegacy extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java index e1be69361e..1b20a33343 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00368_TrespassingIntoTheHolyGround/Q00368_TrespassingIntoTheHolyGround.java @@ -120,10 +120,6 @@ public final class Q00368_TrespassingIntoTheHolyGround extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } if (st.isCreated()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java index f2ec9277df..63cee314cc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00376_ExplorationOfTheGiantsCavePart1/Q00376_ExplorationOfTheGiantsCavePart1.java @@ -113,10 +113,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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java index 49e317b1d6..c7b469c537 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00377_ExplorationOfTheGiantsCavePart2/Q00377_ExplorationOfTheGiantsCavePart2.java @@ -125,10 +125,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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java index e8b88c2448..cad7782846 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00384_WarehouseKeepersPastime/Q00384_WarehouseKeepersPastime.java @@ -101,34 +101,32 @@ public final class Q00384_WarehouseKeepersPastime extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if ((qs != null)) + + switch (npc.getId()) { - switch (npc.getId()) - { - case CLIFF: - if (qs.isCreated()) + case CLIFF: + if (qs.isCreated()) + { + if (player.getLevel() >= 40) { - if (player.getLevel() >= 40) - { - return "30182-01.htm"; - } - return "30182-04.html"; + return "30182-01.htm"; } + return "30182-04.html"; + } + if (getQuestItemsCount(player, Q_IRONGATE_MEDAL) < 10) + { + return "30182-06.html"; + } + return "30182-07.html"; + case WAREHOUSE_CHIEF_BAXT: + if (qs.getMemoState() > 0) + { if (getQuestItemsCount(player, Q_IRONGATE_MEDAL) < 10) { - return "30182-06.html"; + return "30685-06.html"; } - return "30182-07.html"; - case WAREHOUSE_CHIEF_BAXT: - if (qs.getMemoState() > 0) - { - if (getQuestItemsCount(player, Q_IRONGATE_MEDAL) < 10) - { - return "30685-06.html"; - } - return "30685-07.html"; - } - } + return "30685-07.html"; + } } return htmltext; } diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java index 0047e660ac..d53a83eb89 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java @@ -113,7 +113,7 @@ 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java index 953845a5a1..5745699793 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00423_TakeYourBestShot/Q00423_TakeYourBestShot.java @@ -109,10 +109,6 @@ public class Q00423_TakeYourBestShot extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java index ecbae53281..31c1ce65ef 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00431_WeddingMarch/Q00431_WeddingMarch.java @@ -104,13 +104,8 @@ public class Q00431_WeddingMarch 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java index 2e50718a9b..8e50341b49 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00432_BirthdayPartySong/Q00432_BirthdayPartySong.java @@ -108,13 +108,8 @@ public class Q00432_BirthdayPartySong 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java index 456fba3dcf..1aaf71f506 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00450_GraveRobberRescue/Q00450_GraveRobberRescue.java @@ -97,13 +97,8 @@ public class Q00450_GraveRobberRescue 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 (npc.getId() == KANEMIKA) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java index 32006e349a..66a0544326 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00451_LuciensAltar/Q00451_LuciensAltar.java @@ -83,13 +83,8 @@ public class Q00451_LuciensAltar 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); final int npcId = npc.getId(); if (npcId == DAICHIR) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java index 2c36f524e4..2fbb9b0c11 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00452_FindingtheLostSoldiers/Q00452_FindingtheLostSoldiers.java @@ -90,12 +90,8 @@ public class Q00452_FindingtheLostSoldiers 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 (npc.getId() == JAKAN) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java index 07472be3fa..684be01139 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java @@ -264,13 +264,9 @@ public class Q00453_NotStrongEnoughAlone extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); final QuestState prev = player.getQuestState(Q10282_ToTheSeedOfAnnihilation.class.getSimpleName()); - if (qs == null) - { - return htmltext; - } + String htmltext = getNoQuestMsg(player); switch (qs.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java index 3f20378e4b..d899618008 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java @@ -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: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java index 851924c172..a0bcf0a89b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java @@ -185,11 +185,6 @@ public final class Q00456_DontKnowDontCare extends Quest final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } - if (Util.contains(SEPARATED_SOUL, npc.getId())) { switch (qs.getState()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java index 885d89aaf1..76fc2f182d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java index e1095e295e..1c15d49e89 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00458_PerfectForm/Q00458_PerfectForm.java @@ -286,12 +286,8 @@ public class Q00458_PerfectForm 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java index c9741631d0..1cbee1ce87 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00461_RumbleInTheBase/Q00461_RumbleInTheBase.java @@ -132,12 +132,8 @@ public class Q00461_RumbleInTheBase 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); final QuestState prev = player.getQuestState(Q00252_ItSmellsDelicious.class.getSimpleName()); switch (st.getState()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java index 10147f454e..a510622d49 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00463_IMustBeaGenius/Q00463_IMustBeaGenius.java @@ -210,12 +210,8 @@ public class Q00463_IMustBeaGenius 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java index 56b154a74f..de92e8f77e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00464_Oath/Q00464_Oath.java @@ -186,8 +186,8 @@ public class Q00464_Oath extends Quest @Override public String onItemTalk(L2ItemInstance item, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); boolean startQuest = false; switch (qs.getState()) @@ -248,10 +248,10 @@ public class Q00464_Oath 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) && qs.isStarted()) + if (qs.isStarted()) { final int npcId = npc.getId(); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java index 1cce5d3c86..ee12026250 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00504_CompetitionForTheBanditStronghold/Q00504_CompetitionForTheBanditStronghold.java @@ -105,13 +105,9 @@ public final class Q00504_CompetitionForTheBanditStronghold extends Quest public final String onTalk(L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, true); - if (qs == null) - { - return getNoQuestMsg(player); - } - final L2Clan clan = player.getClan(); - String htmltext = null; + String htmltext = getNoQuestMsg(player); + if (!BANDIT_STRONGHOLD.isWaitingBattle()) { htmltext = getHtm(player.getHtmlPrefix(), "35437-09.html"); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java index 871563658c..92f7413641 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java @@ -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: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java index 18471f8890..579533a78b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java @@ -153,14 +153,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: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java index 7aada1a036..2d3e4216bd 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java @@ -111,14 +111,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: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java index 218fc85065..84405b08e1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java @@ -407,9 +407,10 @@ public final class Q00511_AwlUnderFoot extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = Quest.getNoQuestMsg(player); final QuestState st = getQuestState(player, true); final String ret = checkFortCondition(player, npc, false); + String htmltext = getNoQuestMsg(player); + if (ret != null) { return ret; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java index 36b020652f..5a566997c8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00551_OlympiadStarter/Q00551_OlympiadStarter.java @@ -205,12 +205,8 @@ public class Q00551_OlympiadStarter 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 ((player.getLevel() < 75) || !player.isNoble()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java index dd6dfe3314..4efb9f6ec1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00552_OlympiadVeteran/Q00552_OlympiadVeteran.java @@ -181,12 +181,8 @@ public class Q00552_OlympiadVeteran 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 ((player.getLevel() < 75) || !player.isNoble()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java index 4d6f2f8bd6..919122a90a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00553_OlympiadUndefeated/Q00553_OlympiadUndefeated.java @@ -153,12 +153,8 @@ public class Q00553_OlympiadUndefeated 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java index 5bd711c6c7..c912019556 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00601_WatchingEyes/Q00601_WatchingEyes.java @@ -140,13 +140,8 @@ public class Q00601_WatchingEyes 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java index 348f3064b9..2a169615e3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00602_ShadowOfLight/Q00602_ShadowOfLight.java @@ -147,13 +147,8 @@ public class Q00602_ShadowOfLight 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java index 5dfb2b2232..44a9eb4e34 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00605_AllianceWithKetraOrcs/Q00605_AllianceWithKetraOrcs.java @@ -280,12 +280,8 @@ public class Q00605_AllianceWithKetraOrcs 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java index 3ab5ed66cc..46876f3e4a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00606_BattleAgainstVarkaSilenos/Q00606_BattleAgainstVarkaSilenos.java @@ -120,12 +120,8 @@ public class Q00606_BattleAgainstVarkaSilenos 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java index 97dc53e6ef..d5efdf04ac 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00607_ProveYourCourageKetra/Q00607_ProveYourCourageKetra.java @@ -104,12 +104,8 @@ public class Q00607_ProveYourCourageKetra 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java index 1a04b806df..49e2955616 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00608_SlayTheEnemyCommanderKetra/Q00608_SlayTheEnemyCommanderKetra.java @@ -104,12 +104,8 @@ public class Q00608_SlayTheEnemyCommanderKetra 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java index c4b738a5b1..a37022f679 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00609_MagicalPowerOfWaterPart1/Q00609_MagicalPowerOfWaterPart1.java @@ -153,12 +153,8 @@ public class Q00609_MagicalPowerOfWaterPart1 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java index cca15c1905..b516389c70 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00610_MagicalPowerOfWaterPart2/Q00610_MagicalPowerOfWaterPart2.java @@ -156,12 +156,8 @@ public class Q00610_MagicalPowerOfWaterPart2 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java index 3d7ee79048..4d14ecd9ea 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00611_AllianceWithVarkaSilenos/Q00611_AllianceWithVarkaSilenos.java @@ -280,12 +280,8 @@ public class Q00611_AllianceWithVarkaSilenos 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java index 8a45373abc..fdc1b56302 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00612_BattleAgainstKetraOrcs/Q00612_BattleAgainstKetraOrcs.java @@ -120,12 +120,8 @@ public class Q00612_BattleAgainstKetraOrcs 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java index 56632b874b..feb103c97d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00613_ProveYourCourageVarka/Q00613_ProveYourCourageVarka.java @@ -104,12 +104,8 @@ public class Q00613_ProveYourCourageVarka 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java index 695a2741d0..6eb7413716 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00614_SlayTheEnemyCommanderVarka/Q00614_SlayTheEnemyCommanderVarka.java @@ -104,12 +104,8 @@ public class Q00614_SlayTheEnemyCommanderVarka 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java index 34e2f3ec5c..7a4e9a076c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00615_MagicalPowerOfFirePart1/Q00615_MagicalPowerOfFirePart1.java @@ -153,12 +153,8 @@ public class Q00615_MagicalPowerOfFirePart1 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java index 65cb4a2f7b..67854f2423 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00616_MagicalPowerOfFirePart2/Q00616_MagicalPowerOfFirePart2.java @@ -156,12 +156,8 @@ public class Q00616_MagicalPowerOfFirePart2 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java index e8cfdec36f..ba5768d6a5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java @@ -186,12 +186,8 @@ public class Q00617_GatherTheFlames 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java index 1848ab173b..30f3f52bd7 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java @@ -149,12 +149,9 @@ public class Q00618_IntoTheFlame 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 (npc.getId()) { case KLEIN: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java index 96f3ce632d..5e08dd3233 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java @@ -306,10 +306,6 @@ public final class Q00619_RelicsOfTheOldEmpire extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } if (st.isCreated()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java index 0430c59fe5..e985b094eb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java @@ -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; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java index a236d23b28..6fd5ac1851 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00626_ADarkTwilight/Q00626_ADarkTwilight.java @@ -153,12 +153,9 @@ public class Q00626_ADarkTwilight 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()) { case State.CREATED: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java index 2c99822bd9..5c75accd32 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00627_HeartInSearchOfPower/Q00627_HeartInSearchOfPower.java @@ -204,12 +204,9 @@ public class Q00627_HeartInSearchOfPower 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()) { case State.CREATED: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java index 4608b46ff0..597a3b479e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00628_HuntGoldenRam/Q00628_HuntGoldenRam.java @@ -155,10 +155,6 @@ public final class Q00628_HuntGoldenRam extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java index 8313681c47..60c1bb8c40 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00629_CleanUpTheSwampOfScreams/Q00629_CleanUpTheSwampOfScreams.java @@ -137,10 +137,6 @@ public final class Q00629_CleanUpTheSwampOfScreams extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } if (qs.isCreated()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java index d54be5ea57..07ab554698 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00631_DeliciousTopChoiceMeat/Q00631_DeliciousTopChoiceMeat.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java index 796b128516..77bf1cf1bf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00632_NecromancersRequest/Q00632_NecromancersRequest.java @@ -167,10 +167,6 @@ public final class Q00632_NecromancersRequest extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } if (qs.isCreated()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java index 43495c5806..efa479d407 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00633_InTheForgottenVillage/Q00633_InTheForgottenVillage.java @@ -176,10 +176,6 @@ public final class Q00633_InTheForgottenVillage extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } if (qs.isCreated()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java index f3afd7fa64..a7faaeb058 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00636_TruthBeyond/Q00636_TruthBeyond.java @@ -85,10 +85,6 @@ public final class Q00636_TruthBeyond extends Quest public final String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - if (st == null) - { - return getNoQuestMsg(player); - } if (npc.getId() == ELIYAH) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java index a9b1623c7f..628643654d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00637_ThroughOnceMore/Q00637_ThroughOnceMore.java @@ -113,10 +113,6 @@ public final class Q00637_ThroughOnceMore extends Quest public final String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - if (st == null) - { - return getNoQuestMsg(player); - } final byte id = st.getState(); if (id == State.CREATED) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java index 4fd6f4fa08..f6c5a5e9ee 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00638_SeekersOfTheHolyGrail/Q00638_SeekersOfTheHolyGrail.java @@ -233,10 +233,6 @@ public final class Q00638_SeekersOfTheHolyGrail extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } if (qs.isCreated()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java index 00b46b00e8..d0dfd0a95b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00639_GuardiansOfTheHolyGrail/Q00639_GuardiansOfTheHolyGrail.java @@ -42,10 +42,7 @@ public final class Q00639_GuardiansOfTheHolyGrail extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - if (st != null) - { - st.exitQuest(true); - } + st.exitQuest(true); return "31350-01.html"; } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java index 9dcfa6f7ae..2bc192434a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java index d0f453b383..9b678a8925 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java index 85b52f5c9f..c38d1f28d9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java @@ -134,10 +134,6 @@ public final class Q00644_GraveRobberAnnihilation extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java index a8825e823e..d7305a2872 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java @@ -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: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00646_SignsOfRevolt/Q00646_SignsOfRevolt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00646_SignsOfRevolt/Q00646_SignsOfRevolt.java index e04f69aa9d..584ce2deb0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00646_SignsOfRevolt/Q00646_SignsOfRevolt.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00646_SignsOfRevolt/Q00646_SignsOfRevolt.java @@ -44,10 +44,7 @@ public class Q00646_SignsOfRevolt extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - if (st != null) - { - st.exitQuest(true); - } + st.exitQuest(true); return (player.getLevel() >= MIN_LEVEL) ? "32016-01.html" : "32016-02.html"; } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java index 8a32c33742..9b45019627 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java @@ -141,12 +141,8 @@ public class Q00647_InfluxOfMachines 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java index f068d83f55..4d86e4db07 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java @@ -102,10 +102,6 @@ public final class Q00649_ALooterAndARailroadMan extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java index 19f73222ac..49100a96a3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java index 17e3510cac..14ac3eb592 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java @@ -74,12 +74,8 @@ public class Q00651_RunawayYouth 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java index 779fd0dbe5..3f433b2077 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00652_AnAgedExAdventurer/Q00652_AnAgedExAdventurer.java @@ -74,12 +74,8 @@ public class Q00652_AnAgedExAdventurer 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java index ebd7e43067..876ceadbaf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00653_WildMaiden/Q00653_WildMaiden.java @@ -74,12 +74,8 @@ public class Q00653_WildMaiden 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java index 9a5f927d99..400791afb4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00659_IdRatherBeCollectingFairyBreath/Q00659_IdRatherBeCollectingFairyBreath.java @@ -121,10 +121,6 @@ public final class Q00659_IdRatherBeCollectingFairyBreath extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } if (st.isCreated()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java index 05f632f45f..3e4cb023e4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00660_AidingTheFloranVillage/Q00660_AidingTheFloranVillage.java @@ -295,10 +295,6 @@ public final class Q00660_AidingTheFloranVillage extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } if (qs.isCreated()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java index e901d0a5f5..ca9502895d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java @@ -559,10 +559,6 @@ public final class Q00662_AGameOfCards extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java index 541bc7ed5c..b50113816f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00663_SeductiveWhispers/Q00663_SeductiveWhispers.java @@ -217,12 +217,8 @@ public class Q00663_SeductiveWhispers extends Quest public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { final QuestState qs = getQuestState(player, false); - if (qs == null) - { - return null; - } + String htmltext = getNoQuestMsg(player); - String htmltext = null; switch (event) { case "30846-01a.htm": diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java index f02b96c7b6..8054787ace 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java @@ -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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java index 2a7030dae0..e40c535b4e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00690_JudesRequest/Q00690_JudesRequest.java @@ -156,13 +156,8 @@ public class Q00690_JudesRequest 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java index 55a86faaf7..ed13f62529 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java @@ -146,12 +146,8 @@ public final class Q00691_MatrasSuspiciousRequest extends Quest @Override public final 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java index c9e3891f5e..1ec66a82c1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java @@ -200,12 +200,8 @@ public final class Q00692_HowtoOpposeEvil extends Quest @Override public final 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 (st.isCreated()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java index 49a66e21a6..f329da5647 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00694_BreakThroughTheHallOfSuffering/Q00694_BreakThroughTheHallOfSuffering.java @@ -67,12 +67,8 @@ public final class Q00694_BreakThroughTheHallOfSuffering extends Quest @Override public final 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java index 40909cb978..914f7cf1e4 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00695_DefendTheHallOfSuffering/Q00695_DefendTheHallOfSuffering.java @@ -68,12 +68,8 @@ public final class Q00695_DefendTheHallOfSuffering extends Quest @Override public final 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00696_ConquerTheHallOfErosion/Q00696_ConquerTheHallOfErosion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00696_ConquerTheHallOfErosion/Q00696_ConquerTheHallOfErosion.java index 4d3834e230..e9e21fe9a1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00696_ConquerTheHallOfErosion/Q00696_ConquerTheHallOfErosion.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00696_ConquerTheHallOfErosion/Q00696_ConquerTheHallOfErosion.java @@ -55,12 +55,8 @@ public final class Q00696_ConquerTheHallOfErosion 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java index 83a950d343..7965117af8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00697_DefendTheHallOfErosion/Q00697_DefendTheHallOfErosion.java @@ -57,12 +57,8 @@ public class Q00697_DefendTheHallOfErosion extends Quest @Override public final 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java index 0a01ce61f5..c70fcd99d5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00698_BlockTheLordsEscape/Q00698_BlockTheLordsEscape.java @@ -57,12 +57,8 @@ public class Q00698_BlockTheLordsEscape extends Quest @Override public final 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java index b8128896b3..0d1ab46874 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00699_GuardianOfTheSkies/Q00699_GuardianOfTheSkies.java @@ -141,31 +141,29 @@ public class Q00699_GuardianOfTheSkies extends Quest { QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: + st = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName()); + htmltext = ((st == null) || (!st.isCompleted()) || (player.getLevel() < MIN_LVL)) ? "32557-02.htm" : "32557-01.htm"; + break; + } + case State.STARTED: + { + final long feathers = getQuestItemsCount(player, VULTURES_GOLDEN_FEATHER); + if (feathers > 0) { - st = player.getQuestState(Q10273_GoodDayToFly.class.getSimpleName()); - htmltext = ((st == null) || (!st.isCompleted()) || (player.getLevel() < MIN_LVL)) ? "32557-02.htm" : "32557-01.htm"; - break; + giveAdena(player, ((feathers * VULTURES_GOLDEN_FEATHER_ADENA) + (feathers > BONUS_COUNT ? BONUS : 0)), true); + takeItems(player, VULTURES_GOLDEN_FEATHER, -1); + htmltext = (feathers > BONUS_COUNT) ? "32557-07.html" : "32557-06.html"; } - case State.STARTED: + else { - final long feathers = getQuestItemsCount(player, VULTURES_GOLDEN_FEATHER); - if (feathers > 0) - { - giveAdena(player, ((feathers * VULTURES_GOLDEN_FEATHER_ADENA) + (feathers > BONUS_COUNT ? BONUS : 0)), true); - takeItems(player, VULTURES_GOLDEN_FEATHER, -1); - htmltext = (feathers > BONUS_COUNT) ? "32557-07.html" : "32557-06.html"; - } - else - { - htmltext = "32557-05.html"; - } - break; + htmltext = "32557-05.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java index af3db5ec02..135b6bebc3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00700_CursedLife/Q00700_CursedLife.java @@ -114,33 +114,31 @@ public class Q00700_CursedLife 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 = "32560-01.htm"; + break; + } + case State.STARTED: + { + final long bones = getQuestItemsCount(player, SWALLOWED_BONES); + final long ribs = getQuestItemsCount(player, SWALLOWED_STERNUM); + final long skulls = getQuestItemsCount(player, SWALLOWED_SKULL); + final long sum = bones + ribs + skulls; + if (sum > 0) { - htmltext = "32560-01.htm"; - break; + giveAdena(player, ((bones * SWALLOWED_BONES_ADENA) + (ribs * SWALLOWED_STERNUM_ADENA) + (skulls * SWALLOWED_SKULL_ADENA) + (sum >= 10 ? BONUS : 0)), true); + takeItems(player, -1, SWALLOWED_BONES, SWALLOWED_STERNUM, SWALLOWED_SKULL); + htmltext = sum < 10 ? "32560-07.html" : "32560-08.html"; } - case State.STARTED: + else { - final long bones = getQuestItemsCount(player, SWALLOWED_BONES); - final long ribs = getQuestItemsCount(player, SWALLOWED_STERNUM); - final long skulls = getQuestItemsCount(player, SWALLOWED_SKULL); - final long sum = bones + ribs + skulls; - if (sum > 0) - { - giveAdena(player, ((bones * SWALLOWED_BONES_ADENA) + (ribs * SWALLOWED_STERNUM_ADENA) + (skulls * SWALLOWED_SKULL_ADENA) + (sum >= 10 ? BONUS : 0)), true); - takeItems(player, -1, SWALLOWED_BONES, SWALLOWED_STERNUM, SWALLOWED_SKULL); - htmltext = sum < 10 ? "32560-07.html" : "32560-08.html"; - } - else - { - htmltext = "32560-06.html"; - } - break; + htmltext = "32560-06.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java index f335534a02..0d9393161c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00701_ProofOfExistence/Q00701_ProofOfExistence.java @@ -137,12 +137,8 @@ public class Q00701_ProofOfExistence 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); switch (st.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java index 9c7da3f287..8cce8398c1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00702_ATrapForRevenge/Q00702_ATrapForRevenge.java @@ -361,12 +361,8 @@ public class Q00702_ATrapForRevenge 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() == PLENOS) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java index 7965dc5e02..f008754fe1 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00708_PathToBecomingALordGludio/Q00708_PathToBecomingALordGludio.java @@ -154,13 +154,8 @@ public class Q00708_PathToBecomingALordGludio 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); final Castle castle = CastleManager.getInstance().getCastleById(GludioCastle); if (castle.getOwner() == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java index 0a3d2c80b2..ff041693f3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java @@ -150,13 +150,8 @@ public class Q00709_PathToBecomingALordDion 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); final Castle castle = CastleManager.getInstance().getCastleById(DionCastle); if (castle.getOwner() == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00710_PathToBecomingALordGiran/Q00710_PathToBecomingALordGiran.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00710_PathToBecomingALordGiran/Q00710_PathToBecomingALordGiran.java index f87fdaafab..6db3fa4e26 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00710_PathToBecomingALordGiran/Q00710_PathToBecomingALordGiran.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00710_PathToBecomingALordGiran/Q00710_PathToBecomingALordGiran.java @@ -113,13 +113,8 @@ public class Q00710_PathToBecomingALordGiran 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); final Castle castle = CastleManager.getInstance().getCastleById(GiranCastle); if (castle.getOwner() == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00711_PathToBecomingALordInnadril/Q00711_PathToBecomingALordInnadril.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00711_PathToBecomingALordInnadril/Q00711_PathToBecomingALordInnadril.java index 0b8bd33e92..ed6e18c70c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00711_PathToBecomingALordInnadril/Q00711_PathToBecomingALordInnadril.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00711_PathToBecomingALordInnadril/Q00711_PathToBecomingALordInnadril.java @@ -120,13 +120,8 @@ public class Q00711_PathToBecomingALordInnadril 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); final Castle castle = CastleManager.getInstance().getCastleById(InnadrilCastle); if (castle.getOwner() == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00712_PathToBecomingALordOren/Q00712_PathToBecomingALordOren.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00712_PathToBecomingALordOren/Q00712_PathToBecomingALordOren.java index daf651fe6c..96d861fd33 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00712_PathToBecomingALordOren/Q00712_PathToBecomingALordOren.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00712_PathToBecomingALordOren/Q00712_PathToBecomingALordOren.java @@ -129,13 +129,8 @@ public class Q00712_PathToBecomingALordOren 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); final Castle castle = CastleManager.getInstance().getCastleById(OrenCastle); if (castle.getOwner() == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00713_PathToBecomingALordAden/Q00713_PathToBecomingALordAden.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00713_PathToBecomingALordAden/Q00713_PathToBecomingALordAden.java index 26c02cb876..e09863b06f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00713_PathToBecomingALordAden/Q00713_PathToBecomingALordAden.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00713_PathToBecomingALordAden/Q00713_PathToBecomingALordAden.java @@ -88,13 +88,8 @@ public class Q00713_PathToBecomingALordAden 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); final Castle castle = CastleManager.getInstance().getCastleById(AdenCastle); if (castle.getOwner() == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00714_PathToBecomingALordSchuttgart/Q00714_PathToBecomingALordSchuttgart.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00714_PathToBecomingALordSchuttgart/Q00714_PathToBecomingALordSchuttgart.java index f5acbe58c2..03e376580d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00714_PathToBecomingALordSchuttgart/Q00714_PathToBecomingALordSchuttgart.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00714_PathToBecomingALordSchuttgart/Q00714_PathToBecomingALordSchuttgart.java @@ -105,13 +105,8 @@ public class Q00714_PathToBecomingALordSchuttgart 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); final Castle castle = CastleManager.getInstance().getCastleById(ShuttgartCastle); if (castle.getOwner() == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00715_PathToBecomingALordGoddard/Q00715_PathToBecomingALordGoddard.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00715_PathToBecomingALordGoddard/Q00715_PathToBecomingALordGoddard.java index f41c05e8b2..69abd7ed3d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00715_PathToBecomingALordGoddard/Q00715_PathToBecomingALordGoddard.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00715_PathToBecomingALordGoddard/Q00715_PathToBecomingALordGoddard.java @@ -89,13 +89,8 @@ public class Q00715_PathToBecomingALordGoddard 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); final Castle castle = CastleManager.getInstance().getCastleById(GoddardCastle); if (castle.getOwner() == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00716_PathToBecomingALordRune/Q00716_PathToBecomingALordRune.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00716_PathToBecomingALordRune/Q00716_PathToBecomingALordRune.java index dfbb59e660..744bfd6e35 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00716_PathToBecomingALordRune/Q00716_PathToBecomingALordRune.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00716_PathToBecomingALordRune/Q00716_PathToBecomingALordRune.java @@ -117,13 +117,8 @@ public class Q00716_PathToBecomingALordRune 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); final Castle castle = CastleManager.getInstance().getCastleById(RuneCastle); if (castle.getOwner() == null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java index 68dd8052ba..20b86ef6ae 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00726_LightWithinTheDarkness/Q00726_LightWithinTheDarkness.java @@ -158,15 +158,10 @@ public class Q00726_LightWithinTheDarkness extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = ""; final QuestState qs = getQuestState(player, true); - if (qs == null) - { - return getNoQuestMsg(player); - } - final QuestState qs2 = player.getQuestState(Q00727_HopeWithinTheDarkness.class.getSimpleName()); final String ret = checkFortCondition(player, npc, false); + String htmltext = getNoQuestMsg(player); if (ret != null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java index a8e3c442bb..e84e7cdc77 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java @@ -151,12 +151,8 @@ public class Q00901_HowLavasaurusesAreMade 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java index 8342175117..5d9ade1491 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java @@ -168,10 +168,6 @@ public final class Q00902_ReclaimOurEra extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java index ad68f53f1f..ce95f8e5bf 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java @@ -123,12 +123,8 @@ public class Q00903_TheCallOfAntharas 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: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java index cbab94fc21..905273e941 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java @@ -161,12 +161,8 @@ public final class Q00905_RefinedDragonBlood 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: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java index 616b1b47ad..6687d047fc 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java @@ -104,12 +104,8 @@ public class Q00906_TheCallOfValakas 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: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java index 770ab879a4..07478dd437 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00907_DragonTrophyValakas/Q00907_DragonTrophyValakas.java @@ -101,12 +101,8 @@ public class Q00907_DragonTrophyValakas 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: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java index 581f1f3e59..54ccef995d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00998_FallenAngelSelect/Q00998_FallenAngelSelect.java @@ -88,10 +88,10 @@ public class Q00998_FallenAngelSelect extends Quest { final QuestState st = getQuestState(player, true); final QuestState qs = player.getQuestState(Q00141_ShadowFoxPart3.class.getSimpleName()); - if ((st == null) || !st.isStarted()) + if (!st.isStarted()) { return getNoQuestMsg(player); } - return ((player.getLevel() >= MIN_LEVEL) && (qs != null) && qs.isCompleted()) ? "30894-01.html" : "30894-00.html"; + return ((player.getLevel() >= MIN_LEVEL) && qs.isCompleted()) ? "30894-01.html" : "30894-00.html"; } } \ No newline at end of file diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java index dbd2954e16..43830dd7f8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10267_JourneyToGracia/Q10267_JourneyToGracia.java @@ -74,12 +74,8 @@ public class Q10267_JourneyToGracia 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java index d14732635e..4f37072db3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10268_ToTheSeedOfInfinity/Q10268_ToTheSeedOfInfinity.java @@ -63,12 +63,8 @@ public class Q10268_ToTheSeedOfInfinity 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java index 3c3fd3e27b..e117d4d31d 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10269_ToTheSeedOfDestruction/Q10269_ToTheSeedOfDestruction.java @@ -63,12 +63,8 @@ public class Q10269_ToTheSeedOfDestruction 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java index 2b66c28b59..12b8a817c5 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10271_TheEnvelopingDarkness/Q10271_TheEnvelopingDarkness.java @@ -78,10 +78,6 @@ public class Q10271_TheEnvelopingDarkness extends Quest { String htmltext = getNoQuestMsg(player); QuestState st = getQuestState(player, true); - if (st == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java index 76de38557a..0ee7661c54 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10272_LightFragment/Q10272_LightFragment.java @@ -176,10 +176,6 @@ public class Q10272_LightFragment extends Quest { String htmltext = getNoQuestMsg(player); QuestState st = getQuestState(player, true); - if (st == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java index 41423e5bd1..2884a27a1f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10273_GoodDayToFly/Q10273_GoodDayToFly.java @@ -131,12 +131,8 @@ public class Q10273_GoodDayToFly 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); final int transform = qs.getInt("transform"); switch (qs.getState()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java index aa1e48b9ff..b0235e4c05 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10274_CollectingInTheAir/Q10274_CollectingInTheAir.java @@ -127,10 +127,6 @@ public class Q10274_CollectingInTheAir extends Quest { String htmltext = getNoQuestMsg(player); QuestState qs = getQuestState(player, true); - if (qs == null) - { - return htmltext; - } switch (qs.getState()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java index ade226ed91..9815705d64 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10275_ContainingTheAttributePower/Q10275_ContainingTheAttributePower.java @@ -196,12 +196,8 @@ public class Q10275_ContainingTheAttributePower 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java index d0f2dc4adb..2b535d79b3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10276_MutatedKaneusGludio/Q10276_MutatedKaneusGludio.java @@ -110,12 +110,8 @@ public class Q10276_MutatedKaneusGludio 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java index 0813428e16..7dab180a23 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10277_MutatedKaneusDion/Q10277_MutatedKaneusDion.java @@ -110,12 +110,8 @@ public class Q10277_MutatedKaneusDion 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java index 6f26ddde63..f66937efb2 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10278_MutatedKaneusHeine/Q10278_MutatedKaneusHeine.java @@ -110,12 +110,8 @@ public class Q10278_MutatedKaneusHeine 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java index 6810cc6f3e..f9947b90ff 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10279_MutatedKaneusOren/Q10279_MutatedKaneusOren.java @@ -110,12 +110,8 @@ public class Q10279_MutatedKaneusOren 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java index 8bf6e7a8da..26816e6427 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10280_MutatedKaneusSchuttgart/Q10280_MutatedKaneusSchuttgart.java @@ -110,12 +110,8 @@ public class Q10280_MutatedKaneusSchuttgart 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java index c8dc8adda8..e6f8ffb520 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10281_MutatedKaneusRune/Q10281_MutatedKaneusRune.java @@ -108,12 +108,8 @@ public class Q10281_MutatedKaneusRune 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); switch (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java index b9858a13e8..93a487ea9a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10282_ToTheSeedOfAnnihilation/Q10282_ToTheSeedOfAnnihilation.java @@ -74,12 +74,8 @@ public class Q10282_ToTheSeedOfAnnihilation 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); final int npcId = npc.getId(); switch (qs.getState()) diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java index d1948b52b2..ae05e6f744 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10288_SecretMission/Q10288_SecretMission.java @@ -120,12 +120,8 @@ public class Q10288_SecretMission 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 (npc.getId()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java index 29f6b3b5e6..b92eec1376 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10289_FadeToBlack/Q10289_FadeToBlack.java @@ -239,10 +239,6 @@ public class Q10289_FadeToBlack extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } if (qs.isCreated()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java index 005fc7a8b3..6a90624d88 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10291_FireDragonDestroyer/Q10291_FireDragonDestroyer.java @@ -108,13 +108,8 @@ public class Q10291_FireDragonDestroyer 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()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java index ea4bacc8f3..b60165a7bb 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java @@ -94,12 +94,8 @@ public class Q10502_FreyaEmbroideredSoulCloak 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: diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java index 3cbf77c514..15f7e6906a 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java @@ -113,13 +113,9 @@ public class TerritoryWarSuperClass extends Quest private void handleKillTheQuest(L2PcInstance player) { - QuestState st = getQuestState(player, false); + QuestState st = getQuestState(player, true); int kill = 1; int max = 10; - if (st == null) - { - st = newQuestState(player); - } if (!st.isCompleted()) { if (!st.isStarted()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/AbstractSagaQuest.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/AbstractSagaQuest.java index 1c94554594..e6d3317b48 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/AbstractSagaQuest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/AbstractSagaQuest.java @@ -749,8 +749,8 @@ public abstract class AbstractSagaQuest extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); if (st != null) { int npcId = npc.getId(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java index 81d5ed56c2..92a9f3b0e2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00002_WhatWomenWant/Q00002_WhatWomenWant.java @@ -94,8 +94,8 @@ public class Q00002_WhatWomenWant extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); switch (npc.getId()) { case ARUJIEN: diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java index 7a4ccc118f..9d67f20c07 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java @@ -110,8 +110,8 @@ public class Q00003_WillTheSealBeBroken extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); switch (st.getState()) { case State.CREATED: diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java index 5c8d4673f2..edf29c7c14 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java @@ -85,8 +85,8 @@ public class Q00004_LongLiveThePaagrioLord extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); switch (npc.getId()) { case NAKUSIN: diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java index 8ec3fe0a04..b83dcea2f8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00005_MinersFavor/Q00005_MinersFavor.java @@ -93,8 +93,8 @@ public class Q00005_MinersFavor extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); switch (npc.getId()) { case BOLTER: diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java index 7b918aef8a..df3dc4b791 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00101_SwordOfSolidarity/Q00101_SwordOfSolidarity.java @@ -163,135 +163,133 @@ public class Q00101_SwordOfSolidarity extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (npc.getId()) { - switch (npc.getId()) + case ROIEN: { - case ROIEN: + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: - { - htmltext = (player.getRace() == Race.HUMAN) ? (player.getLevel() >= MIN_LVL) ? "30008-02.htm" : "30008-08.htm" : "30008-01.htm"; - break; - } - case State.STARTED: - { - switch (st.getCond()) - { - case 1: - { - if (hasQuestItems(player, ROIENS_LETTER)) - { - htmltext = "30008-05.html"; - } - break; - } - case 2: - { - if (hasAtLeastOneQuestItem(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP)) - { - htmltext = "30008-11.html"; - } - else if (hasQuestItems(player, DIRECTIONS_TO_RUINS)) - { - htmltext = "30008-10.html"; - } - break; - } - case 3: - { - if (hasQuestItems(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP)) - { - htmltext = "30008-12.html"; - } - break; - } - case 4: - { - if (hasQuestItems(player, ALTRANS_NOTE)) - { - takeItems(player, ALTRANS_NOTE, -1); - giveItems(player, BROKEN_SWORD_HANDLE, 1); - st.setCond(5, true); - htmltext = "30008-06.html"; - } - break; - } - case 5: - { - if (hasQuestItems(player, BROKEN_SWORD_HANDLE)) - { - htmltext = "30008-07.html"; - } - break; - } - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; - } + htmltext = (player.getRace() == Race.HUMAN) ? (player.getLevel() >= MIN_LVL) ? "30008-02.htm" : "30008-08.htm" : "30008-01.htm"; + break; + } + case State.STARTED: + { + switch (st.getCond()) + { + case 1: + { + if (hasQuestItems(player, ROIENS_LETTER)) + { + htmltext = "30008-05.html"; + } + break; + } + case 2: + { + if (hasAtLeastOneQuestItem(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP)) + { + htmltext = "30008-11.html"; + } + else if (hasQuestItems(player, DIRECTIONS_TO_RUINS)) + { + htmltext = "30008-10.html"; + } + break; + } + case 3: + { + if (hasQuestItems(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP)) + { + htmltext = "30008-12.html"; + } + break; + } + case 4: + { + if (hasQuestItems(player, ALTRANS_NOTE)) + { + takeItems(player, ALTRANS_NOTE, -1); + giveItems(player, BROKEN_SWORD_HANDLE, 1); + st.setCond(5, true); + htmltext = "30008-06.html"; + } + break; + } + case 5: + { + if (hasQuestItems(player, BROKEN_SWORD_HANDLE)) + { + htmltext = "30008-07.html"; + } + break; + } + } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } - break; } - case ALTRAN: + break; + } + case ALTRAN: + { + switch (st.getCond()) { - switch (st.getCond()) + case 1: { - case 1: + if (hasQuestItems(player, ROIENS_LETTER)) { - if (hasQuestItems(player, ROIENS_LETTER)) - { - htmltext = "30283-01.html"; - } - break; - } - case 2: - { - if (hasAtLeastOneQuestItem(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP)) - { - htmltext = "30283-08.html"; - } - else if (hasQuestItems(player, DIRECTIONS_TO_RUINS)) - { - htmltext = "30283-03.html"; - } - break; - } - case 3: - { - if (hasQuestItems(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP)) - { - takeItems(player, -1, DIRECTIONS_TO_RUINS, BROKEN_BLADE_TOP, BROKEN_BLADE_BOTTOM); - giveItems(player, ALTRANS_NOTE, 1); - st.setCond(4, true); - htmltext = "30283-04.html"; - } - break; - } - case 4: - { - if (hasQuestItems(player, ALTRANS_NOTE)) - { - htmltext = "30283-05.html"; - } - break; - } - case 5: - { - if (hasQuestItems(player, BROKEN_SWORD_HANDLE)) - { - htmltext = "30283-06.html"; - } - break; + htmltext = "30283-01.html"; } + break; + } + case 2: + { + if (hasAtLeastOneQuestItem(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP)) + { + htmltext = "30283-08.html"; + } + else if (hasQuestItems(player, DIRECTIONS_TO_RUINS)) + { + htmltext = "30283-03.html"; + } + break; + } + case 3: + { + if (hasQuestItems(player, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP)) + { + takeItems(player, -1, DIRECTIONS_TO_RUINS, BROKEN_BLADE_TOP, BROKEN_BLADE_BOTTOM); + giveItems(player, ALTRANS_NOTE, 1); + st.setCond(4, true); + htmltext = "30283-04.html"; + } + break; + } + case 4: + { + if (hasQuestItems(player, ALTRANS_NOTE)) + { + htmltext = "30283-05.html"; + } + break; + } + case 5: + { + if (hasQuestItems(player, BROKEN_SWORD_HANDLE)) + { + htmltext = "30283-06.html"; + } + break; } - break; } + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java index 814ac5f39a..6ced9b3500 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00102_SeaOfSporesFever/Q00102_SeaOfSporesFever.java @@ -121,170 +121,168 @@ public class Q00102_SeaOfSporesFever extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (npc.getId()) { - switch (npc.getId()) + case ALBERIUS: { - case ALBERIUS: + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: - { - htmltext = player.getRace() == Race.ELF ? player.getLevel() >= MIN_LVL ? "30284-07.htm" : "30284-08.htm" : "30284-00.htm"; - break; - } - case State.STARTED: - { - switch (st.getCond()) - { - case 1: - { - if (hasQuestItems(player, ALBERIUS_LETTER)) - { - htmltext = "30284-03.html"; - } - break; - } - case 2: - { - if (hasQuestItems(player, EVERGREEN_AMULET)) - { - htmltext = "30284-09.html"; - } - break; - } - case 4: - { - if (hasQuestItems(player, COBENDELLS_MEDICINE1)) - { - takeItems(player, COBENDELLS_MEDICINE1, 1); - giveItems(player, ALBERIUS_LIST, 1); - st.setCond(5); - htmltext = "30284-04.html"; - } - break; - } - case 5: - { - if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) - { - htmltext = "30284-05.html"; - } - break; - } - case 6: - { - if (!hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) - { - giveItems(player, LESSER_HEALING_POTION, 100); - giveItems(player, ECHO_CRYSTAL_THEME_OF_BATTLE, 10); - giveItems(player, ECHO_CRYSTAL_THEME_OF_LOVE, 10); - giveItems(player, ECHO_CRYSTAL_THEME_OF_SOLITUDE, 10); - giveItems(player, ECHO_CRYSTAL_THEME_OF_FEAST, 10); - giveItems(player, ECHO_CRYSTAL_THEME_OF_CELEBRATION, 10); - if (player.isMageClass()) - { - giveItems(player, STAFF_OF_SENTINEL, 1); - giveItems(player, SPIRITSHOT_NO_GRADE, 500); - } - else - { - giveItems(player, SWORD_OF_SENTINEL, 1); - giveItems(player, SOULSHOT_NO_GRADE, 500); - } - addExpAndSp(player, 30202, 1339); - giveAdena(player, 6331, true); - st.exitQuest(false, true); - htmltext = "30284-06.html"; - } - break; - } - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; - } + htmltext = player.getRace() == Race.ELF ? player.getLevel() >= MIN_LVL ? "30284-07.htm" : "30284-08.htm" : "30284-00.htm"; + break; + } + case State.STARTED: + { + switch (st.getCond()) + { + case 1: + { + if (hasQuestItems(player, ALBERIUS_LETTER)) + { + htmltext = "30284-03.html"; + } + break; + } + case 2: + { + if (hasQuestItems(player, EVERGREEN_AMULET)) + { + htmltext = "30284-09.html"; + } + break; + } + case 4: + { + if (hasQuestItems(player, COBENDELLS_MEDICINE1)) + { + takeItems(player, COBENDELLS_MEDICINE1, 1); + giveItems(player, ALBERIUS_LIST, 1); + st.setCond(5); + htmltext = "30284-04.html"; + } + break; + } + case 5: + { + if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) + { + htmltext = "30284-05.html"; + } + break; + } + case 6: + { + if (!hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) + { + giveItems(player, LESSER_HEALING_POTION, 100); + giveItems(player, ECHO_CRYSTAL_THEME_OF_BATTLE, 10); + giveItems(player, ECHO_CRYSTAL_THEME_OF_LOVE, 10); + giveItems(player, ECHO_CRYSTAL_THEME_OF_SOLITUDE, 10); + giveItems(player, ECHO_CRYSTAL_THEME_OF_FEAST, 10); + giveItems(player, ECHO_CRYSTAL_THEME_OF_CELEBRATION, 10); + if (player.isMageClass()) + { + giveItems(player, STAFF_OF_SENTINEL, 1); + giveItems(player, SPIRITSHOT_NO_GRADE, 500); + } + else + { + giveItems(player, SWORD_OF_SENTINEL, 1); + giveItems(player, SOULSHOT_NO_GRADE, 500); + } + addExpAndSp(player, 30202, 1339); + giveAdena(player, 6331, true); + st.exitQuest(false, true); + htmltext = "30284-06.html"; + } + break; + } + } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } - break; } - case COBENDELL: + break; + } + case COBENDELL: + { + switch (st.getCond()) { - switch (st.getCond()) + case 1: { - case 1: + if (hasQuestItems(player, ALBERIUS_LETTER)) { - if (hasQuestItems(player, ALBERIUS_LETTER)) - { - takeItems(player, ALBERIUS_LETTER, 1); - giveItems(player, EVERGREEN_AMULET, 1); - st.setCond(2, true); - htmltext = "30156-03.html"; - } - break; - } - case 2: - { - if (hasQuestItems(player, EVERGREEN_AMULET) && (getQuestItemsCount(player, DRYADS_TEAR) < 10)) - { - htmltext = "30156-04.html"; - } - break; - } - case 3: - { - if (getQuestItemsCount(player, DRYADS_TEAR) >= 10) - { - takeItems(player, EVERGREEN_AMULET, -1); - takeItems(player, DRYADS_TEAR, -1); - giveItems(player, COBENDELLS_MEDICINE1, 1); - giveItems(player, COBENDELLS_MEDICINE2, 1); - giveItems(player, COBENDELLS_MEDICINE3, 1); - giveItems(player, COBENDELLS_MEDICINE4, 1); - giveItems(player, COBENDELLS_MEDICINE5, 1); - st.setCond(4, true); - htmltext = "30156-05.html"; - } - break; - } - case 4: - { - if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) - { - htmltext = "30156-06.html"; - } - break; - } - case 5: - { - if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) - { - htmltext = "30156-07.html"; - } - break; + takeItems(player, ALBERIUS_LETTER, 1); + giveItems(player, EVERGREEN_AMULET, 1); + st.setCond(2, true); + htmltext = "30156-03.html"; } + break; + } + case 2: + { + if (hasQuestItems(player, EVERGREEN_AMULET) && (getQuestItemsCount(player, DRYADS_TEAR) < 10)) + { + htmltext = "30156-04.html"; + } + break; + } + case 3: + { + if (getQuestItemsCount(player, DRYADS_TEAR) >= 10) + { + takeItems(player, EVERGREEN_AMULET, -1); + takeItems(player, DRYADS_TEAR, -1); + giveItems(player, COBENDELLS_MEDICINE1, 1); + giveItems(player, COBENDELLS_MEDICINE2, 1); + giveItems(player, COBENDELLS_MEDICINE3, 1); + giveItems(player, COBENDELLS_MEDICINE4, 1); + giveItems(player, COBENDELLS_MEDICINE5, 1); + st.setCond(4, true); + htmltext = "30156-05.html"; + } + break; + } + case 4: + { + if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) + { + htmltext = "30156-06.html"; + } + break; + } + case 5: + { + if (hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) + { + htmltext = "30156-07.html"; + } + break; } - break; } - case GARTRANDELL: - case RAYEN: - case VELTRESS: - case BERROS: + break; + } + case GARTRANDELL: + case RAYEN: + case VELTRESS: + case BERROS: + { + if (hasQuestItems(player, ALBERIUS_LIST, SENTINELS.get(npc.getId()))) { - if (hasQuestItems(player, ALBERIUS_LIST, SENTINELS.get(npc.getId()))) + takeItems(player, SENTINELS.get(npc.getId()), -1); + if (!hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) { - takeItems(player, SENTINELS.get(npc.getId()), -1); - if (!hasAtLeastOneQuestItem(player, COBENDELLS_MEDICINE1, COBENDELLS_MEDICINE2, COBENDELLS_MEDICINE3, COBENDELLS_MEDICINE4, COBENDELLS_MEDICINE5)) - { - st.setCond(6); - } - htmltext = npc.getId() + "-01.html"; + st.setCond(6); } - break; + htmltext = npc.getId() + "-01.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java index e7e1021fcf..204fa315f8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java @@ -114,65 +114,63 @@ public final class Q00104_SpiritOfMirrors extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (npc.getId()) { - switch (npc.getId()) + case GALLINT: { - case GALLINT: + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: - { - htmltext = (player.getRace() == Race.HUMAN) ? (player.getLevel() >= MIN_LVL) ? "30017-03.htm" : "30017-02.htm" : "30017-01.htm"; - break; - } - case State.STARTED: - { - if (st.isCond(3) && hasQuestItems(player, SPIRITBOUND_WAND1, SPIRITBOUND_WAND2, SPIRITBOUND_WAND3)) - { - // Q00281_HeadForTheHills.giveNewbieReward(player); - for (ItemHolder reward : REWARDS) - { - giveItems(player, reward); - } - addExpAndSp(player, 39750, 3407); - giveAdena(player, 16866, true); - st.exitQuest(false, true); - htmltext = "30017-06.html"; - } - else - { - htmltext = "30017-05.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; - } + htmltext = (player.getRace() == Race.HUMAN) ? (player.getLevel() >= MIN_LVL) ? "30017-03.htm" : "30017-02.htm" : "30017-01.htm"; + break; + } + case State.STARTED: + { + if (st.isCond(3) && hasQuestItems(player, SPIRITBOUND_WAND1, SPIRITBOUND_WAND2, SPIRITBOUND_WAND3)) + { + // Q00281_HeadForTheHills.giveNewbieReward(player); + for (ItemHolder reward : REWARDS) + { + giveItems(player, reward); + } + addExpAndSp(player, 39750, 3407); + giveAdena(player, 16866, true); + st.exitQuest(false, true); + htmltext = "30017-06.html"; + } + else + { + htmltext = "30017-05.html"; + } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } - break; } - case ARNOLD: - case JOHNSTONE: - case KENYOS: + break; + } + case ARNOLD: + case JOHNSTONE: + case KENYOS: + { + if (st.isCond(1)) { - if (st.isCond(1)) + if (!st.isSet(npc.getName())) { - if (!st.isSet(npc.getName())) - { - st.set(npc.getName(), "1"); - } - if (st.isSet("Arnold") && st.isSet("Johnstone") && st.isSet("Kenyos")) - { - st.setCond(2, true); - } + st.set(npc.getName(), "1"); + } + if (st.isSet("Arnold") && st.isSet("Johnstone") && st.isSet("Kenyos")) + { + st.setCond(2, true); } - htmltext = npc.getId() + "-01.html"; - break; } + htmltext = npc.getId() + "-01.html"; + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java index d4301f1cb2..79dd5b0ef8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00105_SkirmishWithOrcs/Q00105_SkirmishWithOrcs.java @@ -154,10 +154,6 @@ public final class Q00105_SkirmishWithOrcs extends Quest { final QuestState st = getQuestState(talker, true); String htmltext = getNoQuestMsg(talker); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java index 5b82ae404e..6a02d9d1e0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00106_ForgottenTruth/Q00106_ForgottenTruth.java @@ -113,10 +113,6 @@ public final class Q00106_ForgottenTruth extends Quest { final QuestState st = getQuestState(talker, true); String htmltext = getNoQuestMsg(talker); - if (st == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java index ee1562c8d0..c669cf17a6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00108_JumbleTumbleDiamondFuss/Q00108_JumbleTumbleDiamondFuss.java @@ -144,10 +144,7 @@ public final class Q00108_JumbleTumbleDiamondFuss extends Quest { final QuestState st = getQuestState(talker, true); String htmltext = getNoQuestMsg(talker); - if (st == null) - { - return htmltext; - } + switch (npc.getId()) { case COLLECTOR_GOUPH: diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java index 0916c89609..b9a3d9ef91 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00127_FishingSpecialistsRequest/Q00127_FishingSpecialistsRequest.java @@ -85,10 +85,7 @@ public class Q00127_FishingSpecialistsRequest extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } + if (qs.isCreated()) { if (npc.getId() == PIERRE) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java index 47620d1bd9..373e6b2cdb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00151_CureForFever/Q00151_CureForFever.java @@ -83,12 +83,8 @@ public class Q00151_CureForFever 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); switch (npc.getId()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java index d1ecb1cd5f..1f015f7d79 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00152_ShardsOfGolem/Q00152_ShardsOfGolem.java @@ -108,104 +108,102 @@ public class Q00152_ShardsOfGolem extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (npc.getId()) { - switch (npc.getId()) + case HARRYS: { - case HARRYS: + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: - { - htmltext = player.getLevel() >= MIN_LVL ? "30035-02.htm" : "30035-01.htm"; - break; - } - case State.STARTED: - { - switch (st.getCond()) - { - case 1: - { - if (hasQuestItems(player, HARRYS_1ST_RECIEPT)) - { - htmltext = "30035-04a.html"; - } - break; - } - case 2: - case 3: - { - if (hasQuestItems(player, HARRYS_2ND_RECIEPT)) - { - htmltext = "30035-04.html"; - } - break; - } - case 4: - { - if (hasQuestItems(player, HARRYS_2ND_RECIEPT, TOOL_BOX)) - { - giveItems(player, WOODEN_BREASTPLATE, 1); - addExpAndSp(player, 5000, 0); - st.exitQuest(false, true); - htmltext = "30035-05.html"; - } - break; - } - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; - } + htmltext = player.getLevel() >= MIN_LVL ? "30035-02.htm" : "30035-01.htm"; + break; + } + case State.STARTED: + { + switch (st.getCond()) + { + case 1: + { + if (hasQuestItems(player, HARRYS_1ST_RECIEPT)) + { + htmltext = "30035-04a.html"; + } + break; + } + case 2: + case 3: + { + if (hasQuestItems(player, HARRYS_2ND_RECIEPT)) + { + htmltext = "30035-04.html"; + } + break; + } + case 4: + { + if (hasQuestItems(player, HARRYS_2ND_RECIEPT, TOOL_BOX)) + { + giveItems(player, WOODEN_BREASTPLATE, 1); + addExpAndSp(player, 5000, 0); + st.exitQuest(false, true); + htmltext = "30035-05.html"; + } + break; + } + } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } - break; } - case ALTRAN: + break; + } + case ALTRAN: + { + switch (st.getCond()) { - switch (st.getCond()) + case 1: { - case 1: + if (hasQuestItems(player, HARRYS_1ST_RECIEPT)) { - if (hasQuestItems(player, HARRYS_1ST_RECIEPT)) - { - htmltext = "30283-01.html"; - } - break; - } - case 2: - { - if (hasQuestItems(player, HARRYS_2ND_RECIEPT) && (getQuestItemsCount(player, GOLEM_SHARD) < 5)) - { - htmltext = "30283-03.html"; - } - break; - } - case 3: - { - if (hasQuestItems(player, HARRYS_2ND_RECIEPT) && (getQuestItemsCount(player, GOLEM_SHARD) >= 5)) - { - takeItems(player, GOLEM_SHARD, -1); - giveItems(player, TOOL_BOX, 1); - st.setCond(4, true); - htmltext = "30283-04.html"; - } - break; - } - case 4: - { - if (hasQuestItems(player, HARRYS_2ND_RECIEPT, TOOL_BOX)) - { - htmltext = "30283-05.html"; - } - break; + htmltext = "30283-01.html"; } + break; + } + case 2: + { + if (hasQuestItems(player, HARRYS_2ND_RECIEPT) && (getQuestItemsCount(player, GOLEM_SHARD) < 5)) + { + htmltext = "30283-03.html"; + } + break; + } + case 3: + { + if (hasQuestItems(player, HARRYS_2ND_RECIEPT) && (getQuestItemsCount(player, GOLEM_SHARD) >= 5)) + { + takeItems(player, GOLEM_SHARD, -1); + giveItems(player, TOOL_BOX, 1); + st.setCond(4, true); + htmltext = "30283-04.html"; + } + break; + } + case 4: + { + if (hasQuestItems(player, HARRYS_2ND_RECIEPT, TOOL_BOX)) + { + htmltext = "30283-05.html"; + } + break; } - break; } + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java index 6624fc6902..5c7a1bedc4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00153_DeliverGoods/Q00153_DeliverGoods.java @@ -76,89 +76,87 @@ public class Q00153_DeliverGoods extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState st = getQuestState(player, true); - if (st != null) + String htmltext = getNoQuestMsg(player); + + if (npc.getId() == ARNOLD_ID) { - if (npc.getId() == ARNOLD_ID) + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: + htmltext = (player.getLevel() >= 2) ? "30041-01.htm" : "30041-00.htm"; + break; + case State.STARTED: + if (st.isCond(1)) + { + htmltext = "30041-03.html"; + } + else if (st.isCond(2)) + { + takeItems(player, DELIVERY_LIST_ID, -1); + takeItems(player, JACKSONS_RECEIPT_ID, -1); + takeItems(player, SILVIAS_RECEIPT_ID, -1); + takeItems(player, RANTS_RECEIPT_ID, -1); + // On retail it gives 2 rings but one at the time. + giveItems(player, RING_OF_KNOWLEDGE_ID, 1); + giveItems(player, RING_OF_KNOWLEDGE_ID, 1); + addExpAndSp(player, XP_REWARD_AMOUNT, 0); + st.exitQuest(false, true); + htmltext = "30041-04.html"; + } + break; + case State.COMPLETED: + htmltext = getAlreadyCompletedMsg(player); + break; + } + } + else + { + if (npc.getId() == JACKSON_ID) + { + if (hasQuestItems(player, HEAVY_WOOD_BOX_ID)) { - case State.CREATED: - htmltext = (player.getLevel() >= 2) ? "30041-01.htm" : "30041-00.htm"; - break; - case State.STARTED: - if (st.isCond(1)) - { - htmltext = "30041-03.html"; - } - else if (st.isCond(2)) - { - takeItems(player, DELIVERY_LIST_ID, -1); - takeItems(player, JACKSONS_RECEIPT_ID, -1); - takeItems(player, SILVIAS_RECEIPT_ID, -1); - takeItems(player, RANTS_RECEIPT_ID, -1); - // On retail it gives 2 rings but one at the time. - giveItems(player, RING_OF_KNOWLEDGE_ID, 1); - giveItems(player, RING_OF_KNOWLEDGE_ID, 1); - addExpAndSp(player, XP_REWARD_AMOUNT, 0); - st.exitQuest(false, true); - htmltext = "30041-04.html"; - } - break; - case State.COMPLETED: - htmltext = getAlreadyCompletedMsg(player); - break; + takeItems(player, HEAVY_WOOD_BOX_ID, -1); + giveItems(player, JACKSONS_RECEIPT_ID, 1); + htmltext = "30002-01.html"; + } + else + { + htmltext = "30002-02.html"; } } - else + else if (npc.getId() == SILVIA_ID) { - if (npc.getId() == JACKSON_ID) + if (hasQuestItems(player, CLOTH_BUNDLE_ID)) { - if (hasQuestItems(player, HEAVY_WOOD_BOX_ID)) - { - takeItems(player, HEAVY_WOOD_BOX_ID, -1); - giveItems(player, JACKSONS_RECEIPT_ID, 1); - htmltext = "30002-01.html"; - } - else - { - htmltext = "30002-02.html"; - } + takeItems(player, CLOTH_BUNDLE_ID, -1); + giveItems(player, SILVIAS_RECEIPT_ID, 1); + giveItems(player, SOULSHOT_NO_GRADE_ID, 3); + htmltext = "30003-01.html"; } - else if (npc.getId() == SILVIA_ID) + else { - if (hasQuestItems(player, CLOTH_BUNDLE_ID)) - { - takeItems(player, CLOTH_BUNDLE_ID, -1); - giveItems(player, SILVIAS_RECEIPT_ID, 1); - giveItems(player, SOULSHOT_NO_GRADE_ID, 3); - htmltext = "30003-01.html"; - } - else - { - htmltext = "30003-02.html"; - } + htmltext = "30003-02.html"; } - else if (npc.getId() == RANT_ID) + } + else if (npc.getId() == RANT_ID) + { + if (hasQuestItems(player, CLAY_POT_ID)) { - if (hasQuestItems(player, CLAY_POT_ID)) - { - takeItems(player, CLAY_POT_ID, -1); - giveItems(player, RANTS_RECEIPT_ID, 1); - htmltext = "30054-01.html"; - } - else - { - htmltext = "30054-02.html"; - } + takeItems(player, CLAY_POT_ID, -1); + giveItems(player, RANTS_RECEIPT_ID, 1); + htmltext = "30054-01.html"; } - - if (st.isCond(1) && hasQuestItems(player, JACKSONS_RECEIPT_ID) && hasQuestItems(player, SILVIAS_RECEIPT_ID) && hasQuestItems(player, RANTS_RECEIPT_ID)) + else { - st.setCond(2, true); + htmltext = "30054-02.html"; } } + + if (st.isCond(1) && hasQuestItems(player, JACKSONS_RECEIPT_ID) && hasQuestItems(player, SILVIAS_RECEIPT_ID) && hasQuestItems(player, RANTS_RECEIPT_ID)) + { + st.setCond(2, true); + } } return htmltext; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java index 6d508da600..84ba57bcdf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00154_SacrificeToTheSea/Q00154_SacrificeToTheSea.java @@ -70,6 +70,7 @@ public final class Q00154_SacrificeToTheSea extends Quest { final QuestState qs = getQuestState(talker, true); String htmltext = getNoQuestMsg(talker); + switch (npc.getId()) { case ROCKSWELL: diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java index 613cc18528..cffb4cb23e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00155_FindSirWindawood/Q00155_FindSirWindawood.java @@ -61,12 +61,8 @@ public class Q00155_FindSirWindawood 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); switch (npc.getId()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java index ccd9266112..e344638bbf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00156_MillenniumLove/Q00156_MillenniumLove.java @@ -106,65 +106,63 @@ public class Q00156_MillenniumLove extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (npc.getId()) { - switch (npc.getId()) + case LILITH: { - case LILITH: + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: - { - htmltext = "30368-01.htm"; - break; - } - case State.STARTED: - { - if (st.isCond(1) && hasQuestItems(player, LILITHS_LETTER)) - { - htmltext = "30368-06.html"; - } - else if (st.isCond(2) && hasQuestItems(player, THEONS_DIARY)) - { - giveItems(player, GREATER_COMP_SOULSHOUT_PACKAGE_NO_GRADE, 1); - addExpAndSp(player, 3000, 0); - st.exitQuest(false, true); - htmltext = "30368-07.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; - } + htmltext = "30368-01.htm"; + break; + } + case State.STARTED: + { + if (st.isCond(1) && hasQuestItems(player, LILITHS_LETTER)) + { + htmltext = "30368-06.html"; + } + else if (st.isCond(2) && hasQuestItems(player, THEONS_DIARY)) + { + giveItems(player, GREATER_COMP_SOULSHOUT_PACKAGE_NO_GRADE, 1); + addExpAndSp(player, 3000, 0); + st.exitQuest(false, true); + htmltext = "30368-07.html"; + } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } - break; } - case BAENEDES: + break; + } + case BAENEDES: + { + switch (st.getCond()) { - switch (st.getCond()) + case 1: { - case 1: + if (hasQuestItems(player, LILITHS_LETTER)) { - if (hasQuestItems(player, LILITHS_LETTER)) - { - htmltext = "30369-01.html"; - } - break; - } - case 2: - { - if (hasQuestItems(player, THEONS_DIARY)) - { - htmltext = "30369-04.html"; - } - break; + htmltext = "30369-01.html"; } + break; + } + case 2: + { + if (hasQuestItems(player, THEONS_DIARY)) + { + htmltext = "30369-04.html"; + } + break; } - break; } + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java index 4218413cff..b30b2d3d72 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00157_RecoverSmuggledGoods/Q00157_RecoverSmuggledGoods.java @@ -97,34 +97,32 @@ public class Q00157_RecoverSmuggledGoods 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 ? "30005-02.htm" : "30005-01.htm"; + break; + } + case State.STARTED: + { + if (st.isCond(2) && (getQuestItemsCount(player, ADAMANTITE_ORE) >= 20)) { - htmltext = player.getLevel() >= MIN_LVL ? "30005-02.htm" : "30005-01.htm"; - break; + giveItems(player, BUCKLER, 1); + st.exitQuest(false, true); + htmltext = "30005-06.html"; } - case State.STARTED: + else { - if (st.isCond(2) && (getQuestItemsCount(player, ADAMANTITE_ORE) >= 20)) - { - giveItems(player, BUCKLER, 1); - st.exitQuest(false, true); - htmltext = "30005-06.html"; - } - else - { - htmltext = "30005-05.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "30005-05.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java index 52b3711e4c..a56291e1ee 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00158_SeedOfEvil/Q00158_SeedOfEvil.java @@ -90,12 +90,8 @@ public class Q00158_SeedOfEvil 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); switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java index 8ae166962c..692b34f435 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java @@ -107,65 +107,63 @@ public class Q00159_ProtectTheWaterSource 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.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LVL ? "30154-03.htm" : "30154-02.htm") : "30154-01.htm"; + break; + } + case State.STARTED: + { + switch (st.getCond()) { - htmltext = (player.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LVL ? "30154-03.htm" : "30154-02.htm") : "30154-01.htm"; - break; - } - case State.STARTED: - { - switch (st.getCond()) + case 1: { - case 1: + if (hasQuestItems(player, HYACINTH_CHARM) && !hasQuestItems(player, PLAGUE_DUST)) { - if (hasQuestItems(player, HYACINTH_CHARM) && !hasQuestItems(player, PLAGUE_DUST)) - { - htmltext = "30154-05.html"; - } - break; - } - case 2: - { - if (hasQuestItems(player, HYACINTH_CHARM, PLAGUE_DUST)) - { - takeItems(player, HYACINTH_CHARM, -1); - takeItems(player, PLAGUE_DUST, -1); - giveItems(player, HYACINTH_CHARM2, 1); - st.setCond(3, true); - htmltext = "30154-06.html"; - } - break; - } - case 3: - { - if (hasQuestItems(player, HYACINTH_CHARM2)) - { - htmltext = "30154-07.html"; - } - break; - } - case 4: - { - if (hasQuestItems(player, HYACINTH_CHARM2) && (getQuestItemsCount(player, PLAGUE_DUST) >= 5)) - { - giveAdena(player, 18250, true); - st.exitQuest(false, true); - htmltext = "30154-08.html"; - } - break; + htmltext = "30154-05.html"; } + break; + } + case 2: + { + if (hasQuestItems(player, HYACINTH_CHARM, PLAGUE_DUST)) + { + takeItems(player, HYACINTH_CHARM, -1); + takeItems(player, PLAGUE_DUST, -1); + giveItems(player, HYACINTH_CHARM2, 1); + st.setCond(3, true); + htmltext = "30154-06.html"; + } + break; + } + case 3: + { + if (hasQuestItems(player, HYACINTH_CHARM2)) + { + htmltext = "30154-07.html"; + } + break; + } + case 4: + { + if (hasQuestItems(player, HYACINTH_CHARM2) && (getQuestItemsCount(player, PLAGUE_DUST) >= 5)) + { + giveAdena(player, 18250, true); + st.exitQuest(false, true); + htmltext = "30154-08.html"; + } + break; } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java index a1738c65af..2077237001 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00160_NerupasRequest/Q00160_NerupasRequest.java @@ -73,6 +73,7 @@ public final class Q00160_NerupasRequest extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); + switch (qs.getState()) { case State.COMPLETED: diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java index a5ac73cb25..9eba656c4a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00161_FruitOfTheMotherTree/Q00161_FruitOfTheMotherTree.java @@ -75,12 +75,8 @@ public class Q00161_FruitOfTheMotherTree 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); switch (npc.getId()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java index a45b30ef86..760820852e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java @@ -143,36 +143,34 @@ public class Q00162_CurseOfTheUndergroundFortress 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.getRace() != Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30147-02.htm" : "30147-01.htm" : "30147-00.htm"; + break; + } + case State.STARTED: + { + if ((getQuestItemsCount(player, BONE_FRAGMENT) + getQuestItemsCount(player, ELF_SKULL)) >= REQUIRED_COUNT) { - htmltext = (player.getRace() != Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30147-02.htm" : "30147-01.htm" : "30147-00.htm"; - break; + giveItems(player, BONE_SHIELD, 1); + addExpAndSp(player, 22652, 1004); + giveAdena(player, 24000, true); + st.exitQuest(false, true); + htmltext = "30147-06.html"; } - case State.STARTED: + else { - if ((getQuestItemsCount(player, BONE_FRAGMENT) + getQuestItemsCount(player, ELF_SKULL)) >= REQUIRED_COUNT) - { - giveItems(player, BONE_SHIELD, 1); - addExpAndSp(player, 22652, 1004); - giveAdena(player, 24000, true); - st.exitQuest(false, true); - htmltext = "30147-06.html"; - } - else - { - htmltext = "30147-05.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "30147-05.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java index ec806c2748..d175199885 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java @@ -144,35 +144,33 @@ public class Q00163_LegacyOfThePoet 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.getRace() != Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30220-02.htm" : "30220-01.htm" : "30220-00.htm"; + break; + } + case State.STARTED: + { + if (hasQuestItems(player, RUMIELS_1ST_POEM, RUMIELS_2ND_POEM, RUMIELS_3RD_POEM, RUMIELS_4TH_POEM)) { - htmltext = (player.getRace() != Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30220-02.htm" : "30220-01.htm" : "30220-00.htm"; - break; + addExpAndSp(player, 21643, 943); + giveAdena(player, 13890, true); + st.exitQuest(false, true); + htmltext = "30220-07.html"; } - case State.STARTED: + else { - if (hasQuestItems(player, RUMIELS_1ST_POEM, RUMIELS_2ND_POEM, RUMIELS_3RD_POEM, RUMIELS_4TH_POEM)) - { - addExpAndSp(player, 21643, 943); - giveAdena(player, 13890, true); - st.exitQuest(false, true); - htmltext = "30220-07.html"; - } - else - { - htmltext = "30220-06.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "30220-06.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java index a147a6b09e..2565ebf43a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00164_BloodFiend/Q00164_BloodFiend.java @@ -80,35 +80,33 @@ public class Q00164_BloodFiend 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.getRace() != Race.DARK_ELF) ? player.getLevel() >= MIN_LVL ? "30149-03.htm" : "30149-02.htm" : "30149-00.htm"; + break; + } + case State.STARTED: + { + if (st.isCond(2) && hasQuestItems(player, KIRUNAK_SKULL)) { - htmltext = (player.getRace() != Race.DARK_ELF) ? player.getLevel() >= MIN_LVL ? "30149-03.htm" : "30149-02.htm" : "30149-00.htm"; - break; + giveAdena(player, 42130, true); + addExpAndSp(player, 35637, 1854); + st.exitQuest(false, true); + htmltext = "30149-06.html"; } - case State.STARTED: + else { - if (st.isCond(2) && hasQuestItems(player, KIRUNAK_SKULL)) - { - giveAdena(player, 42130, true); - addExpAndSp(player, 35637, 1854); - st.exitQuest(false, true); - htmltext = "30149-06.html"; - } - else - { - htmltext = "30149-05.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "30149-05.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java index 3bba998987..14b4b7eeb2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java @@ -96,35 +96,33 @@ public class Q00165_ShilensHunt 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.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30348-02.htm" : "30348-01.htm" : "30348-00.htm"; + break; + } + case State.STARTED: + { + if (st.isCond(2) && (getQuestItemsCount(player, DARK_BEZOAR) >= REQUIRED_COUNT)) { - htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30348-02.htm" : "30348-01.htm" : "30348-00.htm"; - break; + giveItems(player, LESSER_HEALING_POTION, 5); + addExpAndSp(player, 1000, 0); + st.exitQuest(false, true); + htmltext = "30348-05.html"; } - case State.STARTED: + else { - if (st.isCond(2) && (getQuestItemsCount(player, DARK_BEZOAR) >= REQUIRED_COUNT)) - { - giveItems(player, LESSER_HEALING_POTION, 5); - addExpAndSp(player, 1000, 0); - st.exitQuest(false, true); - htmltext = "30348-05.html"; - } - else - { - htmltext = "30348-04.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "30348-04.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java index 0e5dafb9d1..a5eafc41e7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00166_MassOfDarkness/Q00166_MassOfDarkness.java @@ -79,66 +79,64 @@ public class Q00166_MassOfDarkness extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (npc.getId()) { - switch (npc.getId()) + case UNDRIAS: { - case UNDRIAS: + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: - { - htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30130-02.htm" : "30130-01.htm" : "30130-00.htm"; - break; - } - case State.STARTED: - { - if (st.isCond(2) && hasQuestItems(player, UNDRIAS_LETTER, CEREMONIAL_DAGGER, DREVIANT_WINE, GARMIELS_SCRIPTURE)) - { - showOnScreenMsg(player, NpcStringId.DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_HELPER, 2, 5000); // TODO: Newbie Guide - addExpAndSp(player, 5672, 466); - giveAdena(player, 2966, true); - st.exitQuest(false, true); - htmltext = "30130-05.html"; - } - else - { - htmltext = "30130-04.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; - } + htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30130-02.htm" : "30130-01.htm" : "30130-00.htm"; + break; } - break; - } - case IRIA: - case DORANKUS: - case TRUDY: - { - if (st.isStarted()) + case State.STARTED: { - final int npcId = npc.getId(); - final int itemId = NPCs.get(npcId); - if (st.isCond(1) && !hasQuestItems(player, itemId)) + if (st.isCond(2) && hasQuestItems(player, UNDRIAS_LETTER, CEREMONIAL_DAGGER, DREVIANT_WINE, GARMIELS_SCRIPTURE)) { - giveItems(player, itemId, 1); - if (hasQuestItems(player, CEREMONIAL_DAGGER, DREVIANT_WINE, GARMIELS_SCRIPTURE)) - { - st.setCond(2, true); - } - htmltext = npcId + "-01.html"; + showOnScreenMsg(player, NpcStringId.DELIVERY_DUTY_COMPLETE_N_GO_FIND_THE_NEWBIE_HELPER, 2, 5000); // TODO: Newbie Guide + addExpAndSp(player, 5672, 466); + giveAdena(player, 2966, true); + st.exitQuest(false, true); + htmltext = "30130-05.html"; } else { - htmltext = npcId + "-02.html"; + htmltext = "30130-04.html"; } break; } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; + } + } + break; + } + case IRIA: + case DORANKUS: + case TRUDY: + { + if (st.isStarted()) + { + final int npcId = npc.getId(); + final int itemId = NPCs.get(npcId); + if (st.isCond(1) && !hasQuestItems(player, itemId)) + { + giveItems(player, itemId, 1); + if (hasQuestItems(player, CEREMONIAL_DAGGER, DREVIANT_WINE, GARMIELS_SCRIPTURE)) + { + st.setCond(2, true); + } + htmltext = npcId + "-01.html"; + } + else + { + htmltext = npcId + "-02.html"; + } + break; } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java index 429590b673..2225b1177a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00167_DwarvenKinship/Q00167_DwarvenKinship.java @@ -109,55 +109,53 @@ public class Q00167_DwarvenKinship extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (npc.getId()) { - switch (npc.getId()) + case CARLON: { - case CARLON: + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: - { - htmltext = (player.getLevel() >= MIN_LVL) ? "30350-02.htm" : "30350-01.htm"; - break; - } - case State.STARTED: - { - if (st.isCond(1) && hasQuestItems(player, CARLONS_LETTER)) - { - htmltext = "30350-04.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; - } + htmltext = (player.getLevel() >= MIN_LVL) ? "30350-02.htm" : "30350-01.htm"; + break; + } + case State.STARTED: + { + if (st.isCond(1) && hasQuestItems(player, CARLONS_LETTER)) + { + htmltext = "30350-04.html"; + } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } - break; } - case HAPROCK: + break; + } + case HAPROCK: + { + if (st.isCond(1) && hasQuestItems(player, CARLONS_LETTER)) { - if (st.isCond(1) && hasQuestItems(player, CARLONS_LETTER)) - { - htmltext = "30255-01.html"; - } - else if (st.isCond(2) && hasQuestItems(player, NORMANS_LETTER)) - { - htmltext = "30255-05.html"; - } - break; + htmltext = "30255-01.html"; } - case NORMAN: + else if (st.isCond(2) && hasQuestItems(player, NORMANS_LETTER)) { - if (st.isCond(2) && hasQuestItems(player, NORMANS_LETTER)) - { - htmltext = "30210-01.html"; - } - break; + htmltext = "30255-05.html"; } + break; + } + case NORMAN: + { + if (st.isCond(2) && hasQuestItems(player, NORMANS_LETTER)) + { + htmltext = "30210-01.html"; + } + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java index 71f9caa0fd..1807a23b42 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00168_DeliverSupplies/Q00168_DeliverSupplies.java @@ -78,106 +78,104 @@ public class Q00168_DeliverSupplies extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st != null) + + switch (npc.getId()) { - switch (npc.getId()) + case JENNA: { - case JENNA: + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: + htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30349-02.htm" : "30349-01.htm" : "30349-00.htm"; + break; + } + case State.STARTED: + { + switch (st.getCond()) { - htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30349-02.htm" : "30349-01.htm" : "30349-00.htm"; - break; - } - case State.STARTED: - { - switch (st.getCond()) + case 1: { - case 1: + if (hasQuestItems(player, JENNAS_LETTER)) { - if (hasQuestItems(player, JENNAS_LETTER)) - { - htmltext = "30349-04.html"; - } - break; - } - case 2: - { - if (hasQuestItems(player, SENTRY_BLADE1, SENTRY_BLADE2, SENTRY_BLADE3)) - { - takeItems(player, SENTRY_BLADE1, -1); - st.setCond(3, true); - htmltext = "30349-05.html"; - } - break; - } - case 3: - { - if (hasAtLeastOneQuestItem(player, SENTRY_BLADE2, SENTRY_BLADE3)) - { - htmltext = "30349-07.html"; - } - break; - } - case 4: - { - if (getQuestItemsCount(player, OLD_BRONZE_SWORD) >= 2) - { - giveAdena(player, 820, true); - st.exitQuest(false, true); - htmltext = "30349-07.html"; - } - break; + htmltext = "30349-04.html"; } + break; + } + case 2: + { + if (hasQuestItems(player, SENTRY_BLADE1, SENTRY_BLADE2, SENTRY_BLADE3)) + { + takeItems(player, SENTRY_BLADE1, -1); + st.setCond(3, true); + htmltext = "30349-05.html"; + } + break; + } + case 3: + { + if (hasAtLeastOneQuestItem(player, SENTRY_BLADE2, SENTRY_BLADE3)) + { + htmltext = "30349-07.html"; + } + break; + } + case 4: + { + if (getQuestItemsCount(player, OLD_BRONZE_SWORD) >= 2) + { + giveAdena(player, 820, true); + st.exitQuest(false, true); + htmltext = "30349-07.html"; + } + break; } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } - break; } - case HARANT: + break; + } + case HARANT: + { + if (st.isCond(1) && hasQuestItems(player, JENNAS_LETTER)) { - if (st.isCond(1) && hasQuestItems(player, JENNAS_LETTER)) - { - takeItems(player, JENNAS_LETTER, -1); - giveItems(player, SENTRY_BLADE1, 1); - giveItems(player, SENTRY_BLADE2, 1); - giveItems(player, SENTRY_BLADE3, 1); - st.setCond(2, true); - htmltext = "30360-01.html"; - } - else if (st.isCond(2)) - { - htmltext = "30360-02.html"; - } - break; + takeItems(player, JENNAS_LETTER, -1); + giveItems(player, SENTRY_BLADE1, 1); + giveItems(player, SENTRY_BLADE2, 1); + giveItems(player, SENTRY_BLADE3, 1); + st.setCond(2, true); + htmltext = "30360-01.html"; } - case ROSELYN: - case KRISTIN: + else if (st.isCond(2)) { - if (st.isCond(3) && hasQuestItems(player, SENTRIES.get(npc.getId()))) - { - takeItems(player, SENTRIES.get(npc.getId()), -1); - giveItems(player, OLD_BRONZE_SWORD, 1); - if (getQuestItemsCount(player, OLD_BRONZE_SWORD) >= 2) - { - st.setCond(4, true); - } - htmltext = npc.getId() + "-01.html"; - } - else if (!hasQuestItems(player, SENTRIES.get(npc.getId())) && hasQuestItems(player, OLD_BRONZE_SWORD)) - { - htmltext = npc.getId() + "-02.html"; - } - break; + htmltext = "30360-02.html"; } + break; + } + case ROSELYN: + case KRISTIN: + { + if (st.isCond(3) && hasQuestItems(player, SENTRIES.get(npc.getId()))) + { + takeItems(player, SENTRIES.get(npc.getId()), -1); + giveItems(player, OLD_BRONZE_SWORD, 1); + if (getQuestItemsCount(player, OLD_BRONZE_SWORD) >= 2) + { + st.setCond(4, true); + } + htmltext = npc.getId() + "-01.html"; + } + else if (!hasQuestItems(player, SENTRIES.get(npc.getId())) && hasQuestItems(player, OLD_BRONZE_SWORD)) + { + htmltext = npc.getId() + "-02.html"; + } + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java index 53a0c99fcb..6b316b8a44 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java @@ -110,36 +110,34 @@ public class Q00169_OffspringOfNightmares 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.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30145-02.htm" : "30145-01.htm" : "30145-00.htm"; + break; + } + case State.STARTED: + { + if (hasQuestItems(player, CRACKED_SKULL) && !hasQuestItems(player, PERFECT_SKULL)) { - htmltext = (player.getRace() == Race.DARK_ELF) ? (player.getLevel() >= MIN_LVL) ? "30145-02.htm" : "30145-01.htm" : "30145-00.htm"; - break; + htmltext = "30145-05.html"; } - case State.STARTED: + else if (st.isCond(2) && hasQuestItems(player, PERFECT_SKULL)) { - if (hasQuestItems(player, CRACKED_SKULL) && !hasQuestItems(player, PERFECT_SKULL)) - { - htmltext = "30145-05.html"; - } - else if (st.isCond(2) && hasQuestItems(player, PERFECT_SKULL)) - { - htmltext = "30145-06.html"; - } - else if (!hasQuestItems(player, CRACKED_SKULL, PERFECT_SKULL)) - { - htmltext = "30145-04.html"; - } - break; + htmltext = "30145-06.html"; } - case State.COMPLETED: + else if (!hasQuestItems(player, CRACKED_SKULL, PERFECT_SKULL)) { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "30145-04.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java index 9307ca1eb0..63935f3aec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00170_DangerousSeduction/Q00170_DangerousSeduction.java @@ -87,12 +87,8 @@ public class Q00170_DangerousSeduction 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); switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java index 5285b7941d..80a31ad57f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00257_TheGuardIsBusy/Q00257_TheGuardIsBusy.java @@ -147,10 +147,6 @@ public final class Q00257_TheGuardIsBusy extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java index 83df96f2fb..f80793b068 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00258_BringWolfPelts/Q00258_BringWolfPelts.java @@ -101,10 +101,6 @@ public final class Q00258_BringWolfPelts extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java index 947cdc2ea5..efebfe47bc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00259_RequestFromTheFarmOwner/Q00259_RequestFromTheFarmOwner.java @@ -139,10 +139,6 @@ public final class Q00259_RequestFromTheFarmOwner extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java index b9d940dddc..b18bfd6a44 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java @@ -111,10 +111,6 @@ public final class Q00260_OrcHunting extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java index 9433949330..335132485e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00261_CollectorsDream/Q00261_CollectorsDream.java @@ -89,10 +89,6 @@ public final class Q00261_CollectorsDream extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java index 54fa17b728..d1da3151a1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00262_TradeWithTheIvoryTower/Q00262_TradeWithTheIvoryTower.java @@ -98,12 +98,8 @@ public final class Q00262_TradeWithTheIvoryTower 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); switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java index e2a9ff9d11..1419eafabf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java @@ -107,12 +107,8 @@ public final class Q00263_OrcSubjugation 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); switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java index 85a3777781..14f323158b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00264_KeenClaws/Q00264_KeenClaws.java @@ -108,10 +108,6 @@ public final class Q00264_KeenClaws extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java index d1a446380c..d41d738ef5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java @@ -106,10 +106,6 @@ public final class Q00265_BondsOfSlavery extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java index 7367300371..d893fdaf41 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java @@ -109,10 +109,7 @@ public final class Q00266_PleasOfPixies extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } + switch (st.getState()) { case State.CREATED: diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java index bc7f98a1de..8d8d95dbfc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java @@ -98,34 +98,32 @@ public final class Q00267_WrathOfVerdure 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.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LVL) ? "31853-03.htm" : "31853-02.htm" : "31853-01.htm"; + break; + } + case State.STARTED: + { + if (hasQuestItems(player, GOBLIN_CLUB)) { - htmltext = (player.getRace() == Race.ELF) ? (player.getLevel() >= MIN_LVL) ? "31853-03.htm" : "31853-02.htm" : "31853-01.htm"; - break; + final long count = getQuestItemsCount(player, GOBLIN_CLUB); + rewardItems(player, SILVERY_LEAF, count); + if (count >= 10) + { + giveAdena(player, 600, true); + } + takeItems(player, GOBLIN_CLUB, -1); + htmltext = "31853-06.html"; } - case State.STARTED: + else { - if (hasQuestItems(player, GOBLIN_CLUB)) - { - final long count = getQuestItemsCount(player, GOBLIN_CLUB); - rewardItems(player, SILVERY_LEAF, count); - if (count >= 10) - { - giveAdena(player, 600, true); - } - takeItems(player, GOBLIN_CLUB, -1); - htmltext = "31853-06.html"; - } - else - { - htmltext = "31853-05.html"; - } - break; + htmltext = "31853-05.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java index 2c9291f6c5..559d977cb3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java @@ -89,47 +89,45 @@ public final class Q00271_ProofOfValor extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; - if (st != null) + String htmltext = getNoQuestMsg(player); + + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: + htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? (hasAtLeastOneQuestItem(player, NECKLACE_OF_VALOR, NECKLACE_OF_COURAGE)) ? "30577-07.htm" : "30577-03.htm" : "30577-02.htm" : "30577-01.htm"; + break; + } + case State.STARTED: + { + switch (st.getCond()) { - htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? (hasAtLeastOneQuestItem(player, NECKLACE_OF_VALOR, NECKLACE_OF_COURAGE)) ? "30577-07.htm" : "30577-03.htm" : "30577-02.htm" : "30577-01.htm"; - break; - } - case State.STARTED: - { - switch (st.getCond()) + case 1: { - case 1: - { - htmltext = "30577-05.html"; - break; - } - case 2: - { - if (getQuestItemsCount(player, KASHA_WOLF_FANG) >= 50) - { - if (getRandom(100) <= 13) - { - rewardItems(player, NECKLACE_OF_VALOR, 1); - rewardItems(player, HEALING_POTION, 10); - } - else - { - rewardItems(player, NECKLACE_OF_COURAGE, 1); - } - takeItems(player, KASHA_WOLF_FANG, -1); - st.exitQuest(true, true); - htmltext = "30577-06.html"; - } - break; - } + htmltext = "30577-05.html"; + break; + } + case 2: + { + if (getQuestItemsCount(player, KASHA_WOLF_FANG) >= 50) + { + if (getRandom(100) <= 13) + { + rewardItems(player, NECKLACE_OF_VALOR, 1); + rewardItems(player, HEALING_POTION, 10); + } + else + { + rewardItems(player, NECKLACE_OF_COURAGE, 1); + } + takeItems(player, KASHA_WOLF_FANG, -1); + st.exitQuest(true, true); + htmltext = "30577-06.html"; + } + break; } - break; } + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java index 8bc3b632b7..3a03ef7fd6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java @@ -87,35 +87,33 @@ public final class Q00272_WrathOfAncestors extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - String htmltext = null; - if (st != null) + String htmltext = getNoQuestMsg(player); + + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: + htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? "30572-03.htm" : "30572-02.htm" : "30572-01.htm"; + break; + } + case State.STARTED: + { + switch (st.getCond()) { - htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? "30572-03.htm" : "30572-02.htm" : "30572-01.htm"; - break; - } - case State.STARTED: - { - switch (st.getCond()) + case 1: { - case 1: - { - htmltext = "30572-05.html"; - break; - } - case 2: - { - giveAdena(player, 1500, true); - st.exitQuest(true, true); - htmltext = "30572-06.html"; - break; - } + htmltext = "30572-05.html"; + break; + } + case 2: + { + giveAdena(player, 1500, true); + st.exitQuest(true, true); + htmltext = "30572-06.html"; + break; } - break; } + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java index 205af80c86..954860fef6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java @@ -113,32 +113,30 @@ public final class Q00273_InvadersOfTheHolyLand extends Quest { final QuestState st = getQuestState(player, true); String htmltext = null; - if (st != null) + + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: + htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? "30566-03.htm" : "30566-02.htm" : "30566-01.htm"; + break; + } + case State.STARTED: + { + if (hasAtLeastOneQuestItem(player, BLACK_SOULSTONE, RED_SOULSTONE)) { - htmltext = (player.getRace() == Race.ORC) ? (player.getLevel() >= MIN_LVL) ? "30566-03.htm" : "30566-02.htm" : "30566-01.htm"; - break; + final long black = getQuestItemsCount(player, BLACK_SOULSTONE); + final long red = getQuestItemsCount(player, RED_SOULSTONE); + giveAdena(player, (red * 10) + (black * 3) + ((red > 0) ? (((red + black) >= 10) ? 1800 : 0) : ((black >= 10) ? 1500 : 0)), true); + takeItems(player, -1, BLACK_SOULSTONE, RED_SOULSTONE); + // Q00281_HeadForTheHills.giveNewbieReward(player); + htmltext = (red > 0) ? "30566-07.html" : "30566-06.html"; } - case State.STARTED: + else { - if (hasAtLeastOneQuestItem(player, BLACK_SOULSTONE, RED_SOULSTONE)) - { - final long black = getQuestItemsCount(player, BLACK_SOULSTONE); - final long red = getQuestItemsCount(player, RED_SOULSTONE); - giveAdena(player, (red * 10) + (black * 3) + ((red > 0) ? (((red + black) >= 10) ? 1800 : 0) : ((black >= 10) ? 1500 : 0)), true); - takeItems(player, -1, BLACK_SOULSTONE, RED_SOULSTONE); - // Q00281_HeadForTheHills.giveNewbieReward(player); - htmltext = (red > 0) ? "30566-07.html" : "30566-06.html"; - } - else - { - htmltext = "30566-05.html"; - } - break; + htmltext = "30566-05.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java index 0404a88c31..170746e3fd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java @@ -95,10 +95,6 @@ public final class Q00274_SkirmishWithTheWerewolves extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java index 6e9109a4fc..e7d7c8ebb3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00275_DarkWingedSpies/Q00275_DarkWingedSpies.java @@ -127,10 +127,6 @@ public final class Q00275_DarkWingedSpies extends Quest { final QuestState st = getQuestState(talker, true); String htmltext = getNoQuestMsg(talker); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java index 10bc44d787..e277f0bad3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00276_TotemOfTheHestui/Q00276_TotemOfTheHestui.java @@ -131,10 +131,6 @@ public final class Q00276_TotemOfTheHestui extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java index 26159d36ab..772cd22bcd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00277_GatekeepersOffering/Q00277_GatekeepersOffering.java @@ -87,12 +87,8 @@ public class Q00277_GatekeepersOffering 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); switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java index f0309225b0..fd1de8dadc 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java @@ -129,10 +129,6 @@ public final class Q00293_TheHiddenVeins extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (npc.getId()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java index e304123f70..22b7ddf75c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java @@ -87,12 +87,8 @@ public class Q00297_GatekeepersFavor 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); switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java index 24bdfac787..7d4bf4bb4f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00300_HuntingLetoLizardman/Q00300_HuntingLetoLizardman.java @@ -141,12 +141,8 @@ public final class Q00300_HuntingLetoLizardman 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); switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java index 7c2d9b715e..19c56df151 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00303_CollectArrowheads/Q00303_CollectArrowheads.java @@ -77,12 +77,8 @@ public final class Q00303_CollectArrowheads 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); switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java index 172df62e96..83e53572b1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00306_CrystalOfFireAndIce/Q00306_CrystalOfFireAndIce.java @@ -123,12 +123,8 @@ public final class Q00306_CrystalOfFireAndIce 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); switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java index 81dad2663e..58dc534f86 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00313_CollectSpores/Q00313_CollectSpores.java @@ -94,12 +94,8 @@ public final class Q00313_CollectSpores 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); switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java index 5802373437..eeeb29266e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00316_DestroyPlagueCarriers/Q00316_DestroyPlagueCarriers.java @@ -133,10 +133,6 @@ public final class Q00316_DestroyPlagueCarriers extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } if (qs.isCreated()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java index 809496c530..2235e1e152 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00317_CatchTheWind/Q00317_CatchTheWind.java @@ -109,10 +109,6 @@ public final class Q00317_CatchTheWind extends Quest { final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (qs == null) - { - return htmltext; - } if (qs.isCreated()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java index c576b267d3..23944d6b9b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00319_ScentOfDeath/Q00319_ScentOfDeath.java @@ -104,12 +104,8 @@ public class Q00319_ScentOfDeath extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { final QuestState st = getQuestState(player, true); - if (st == null) - { - return getNoQuestMsg(player); - } - String htmltext = getNoQuestMsg(player); + switch (st.getState()) { case State.CREATED: diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java index 241f17f265..f7b7112300 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00320_BonesTellTheFuture/Q00320_BonesTellTheFuture.java @@ -79,12 +79,8 @@ public final class Q00320_BonesTellTheFuture 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); switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java index 5ca87bfda6..a4273d5eff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00324_SweetestVenom/Q00324_SweetestVenom.java @@ -79,29 +79,27 @@ public class Q00324_SweetestVenom 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 ? "30351-02.html" : "30351-03.htm"; + break; + } + case State.STARTED: + { + if (st.isCond(2)) { - htmltext = player.getLevel() < MIN_LVL ? "30351-02.html" : "30351-03.htm"; - break; + giveAdena(player, ADENA_COUNT, true); + st.exitQuest(true, true); + htmltext = "30351-06.html"; } - case State.STARTED: + else { - if (st.isCond(2)) - { - giveAdena(player, ADENA_COUNT, true); - st.exitQuest(true, true); - htmltext = "30351-06.html"; - } - else - { - htmltext = "30351-05.html"; - } - break; + htmltext = "30351-05.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java index 0b2881007a..4e8f721133 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00325_GrimCollector/Q00325_GrimCollector.java @@ -217,12 +217,8 @@ public final class Q00325_GrimCollector 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); switch (npc.getId()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java index b325fafda5..8226086942 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java @@ -115,37 +115,35 @@ public final class Q00326_VanquishRemnants extends Quest { final QuestState st = getQuestState(player, true); String htmltext = null; - if (st != null) + + switch (st.getState()) { - switch (st.getState()) + case State.CREATED: { - case State.CREATED: + htmltext = (player.getLevel() >= MIN_LVL) ? "30435-02.htm" : "30435-01.htm"; + break; + } + case State.STARTED: + { + final long red_badges = getQuestItemsCount(player, RED_CROSS_BADGE); + final long blue_badges = getQuestItemsCount(player, BLUE_CROSS_BADGE); + final long black_badges = getQuestItemsCount(player, BLACK_CROSS_BADGE); + final long sum = red_badges + blue_badges + black_badges; + if (sum > 0) { - htmltext = (player.getLevel() >= MIN_LVL) ? "30435-02.htm" : "30435-01.htm"; - break; + if ((sum >= 100) && !hasQuestItems(player, BLACK_LION_MARK)) + { + giveItems(player, BLACK_LION_MARK, 1); + } + giveAdena(player, ((red_badges * 46) + (blue_badges * 52) + (black_badges * 58) + ((sum >= 10) ? 4320 : 0)), true); + takeItems(player, -1, RED_CROSS_BADGE, BLUE_CROSS_BADGE, BLACK_CROSS_BADGE); + htmltext = (sum >= 100) ? (hasQuestItems(player, BLACK_LION_MARK)) ? "30435-09.html" : "30435-06.html" : "30435-05.html"; } - case State.STARTED: + else { - final long red_badges = getQuestItemsCount(player, RED_CROSS_BADGE); - final long blue_badges = getQuestItemsCount(player, BLUE_CROSS_BADGE); - final long black_badges = getQuestItemsCount(player, BLACK_CROSS_BADGE); - final long sum = red_badges + blue_badges + black_badges; - if (sum > 0) - { - if ((sum >= 100) && !hasQuestItems(player, BLACK_LION_MARK)) - { - giveItems(player, BLACK_LION_MARK, 1); - } - giveAdena(player, ((red_badges * 46) + (blue_badges * 52) + (black_badges * 58) + ((sum >= 10) ? 4320 : 0)), true); - takeItems(player, -1, RED_CROSS_BADGE, BLUE_CROSS_BADGE, BLACK_CROSS_BADGE); - htmltext = (sum >= 100) ? (hasQuestItems(player, BLACK_LION_MARK)) ? "30435-09.html" : "30435-06.html" : "30435-05.html"; - } - else - { - htmltext = "30435-04.html"; - } - break; + htmltext = "30435-04.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java index ec1aeb9b31..2bb0e25fe8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java @@ -100,32 +100,30 @@ public class Q00328_SenseForBusiness 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 ? "30436-01.htm" : "30436-02.htm"; + break; + } + case State.STARTED: + { + final long carcass = getQuestItemsCount(player, MONSTER_EYE_CARCASS); + final long lens = getQuestItemsCount(player, MONSTER_EYE_LENS); + final long gizzards = getQuestItemsCount(player, BASILISK_GIZZARD); + if ((carcass + lens + gizzards) > 0) { - htmltext = player.getLevel() < MIN_LVL ? "30436-01.htm" : "30436-02.htm"; - break; + giveAdena(player, ((carcass * MONSTER_EYE_CARCASS_ADENA) + (lens * MONSTER_EYE_LENS_ADENA) + (gizzards * BASILISK_GIZZARD_ADENA) + ((carcass + lens + gizzards) >= BONUS_COUNT ? BONUS : 0)), true); + takeItems(player, -1, MONSTER_EYE_CARCASS, MONSTER_EYE_LENS, BASILISK_GIZZARD); + htmltext = "30436-05.html"; } - case State.STARTED: + else { - final long carcass = getQuestItemsCount(player, MONSTER_EYE_CARCASS); - final long lens = getQuestItemsCount(player, MONSTER_EYE_LENS); - final long gizzards = getQuestItemsCount(player, BASILISK_GIZZARD); - if ((carcass + lens + gizzards) > 0) - { - giveAdena(player, ((carcass * MONSTER_EYE_CARCASS_ADENA) + (lens * MONSTER_EYE_LENS_ADENA) + (gizzards * BASILISK_GIZZARD_ADENA) + ((carcass + lens + gizzards) >= BONUS_COUNT ? BONUS : 0)), true); - takeItems(player, -1, MONSTER_EYE_CARCASS, MONSTER_EYE_LENS, BASILISK_GIZZARD); - htmltext = "30436-05.html"; - } - else - { - htmltext = "30436-04.html"; - } - break; + htmltext = "30436-04.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java index 11208147f5..0706a71e9a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java @@ -117,12 +117,8 @@ public final class Q00329_CuriosityOfADwarf 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); switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java index f9124dfc0d..c15113f089 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java @@ -99,32 +99,30 @@ public class Q00331_ArrowOfVengeance 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 ? "30125-01.htm" : "30125-02.htm"; + break; + } + case State.STARTED: + { + final long harpyFeathers = getQuestItemsCount(player, HARPY_FEATHER); + final long medusaVenoms = getQuestItemsCount(player, MEDUSA_VENOM); + final long wyrmsTeeth = getQuestItemsCount(player, WYRMS_TOOTH); + if ((harpyFeathers + medusaVenoms + wyrmsTeeth) > 0) { - htmltext = player.getLevel() < MIN_LVL ? "30125-01.htm" : "30125-02.htm"; - break; + giveAdena(player, ((harpyFeathers * HARPY_FEATHER_ADENA) + (medusaVenoms * MEDUSA_VENOM_ADENA) + (wyrmsTeeth * WYRMS_TOOTH_ADENA) + ((harpyFeathers + medusaVenoms + wyrmsTeeth) >= BONUS_COUNT ? BONUS : 0)), true); + takeItems(player, -1, HARPY_FEATHER, MEDUSA_VENOM, WYRMS_TOOTH); + htmltext = "30125-05.html"; } - case State.STARTED: + else { - final long harpyFeathers = getQuestItemsCount(player, HARPY_FEATHER); - final long medusaVenoms = getQuestItemsCount(player, MEDUSA_VENOM); - final long wyrmsTeeth = getQuestItemsCount(player, WYRMS_TOOTH); - if ((harpyFeathers + medusaVenoms + wyrmsTeeth) > 0) - { - giveAdena(player, ((harpyFeathers * HARPY_FEATHER_ADENA) + (medusaVenoms * MEDUSA_VENOM_ADENA) + (wyrmsTeeth * WYRMS_TOOTH_ADENA) + ((harpyFeathers + medusaVenoms + wyrmsTeeth) >= BONUS_COUNT ? BONUS : 0)), true); - takeItems(player, -1, HARPY_FEATHER, MEDUSA_VENOM, WYRMS_TOOTH); - htmltext = "30125-05.html"; - } - else - { - htmltext = "30125-04.html"; - } - break; + htmltext = "30125-04.html"; } + break; } } return htmltext; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java index e16361ad1c..b11de62e51 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java @@ -159,10 +159,6 @@ public final class Q00354_ConquestOfAlligatorIsland extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } if (st.isCreated()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java index df2c311192..f204efa994 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java @@ -129,10 +129,6 @@ public final class Q00360_PlunderTheirSupplies extends Quest { final QuestState st = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - if (st == null) - { - return htmltext; - } switch (st.getState()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java index 29f4941b8b..fd126b1975 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00374_WhisperOfDreamsPart1/Q00374_WhisperOfDreamsPart1.java @@ -184,8 +184,8 @@ public class Q00374_WhisperOfDreamsPart1 extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); + String htmltext = getNoQuestMsg(player); switch (npc.getId()) { case VANUTU: diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java index 0f937d7e2b..ee9fd6e08f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00375_WhisperOfDreamsPart2/Q00375_WhisperOfDreamsPart2.java @@ -138,12 +138,8 @@ public class Q00375_WhisperOfDreamsPart2 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()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java index 1f6d5fc2d8..39189d452e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java @@ -595,10 +595,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()) {