Fixes for quests 501, 604, 610, 616 and 625.

Contributed by ihearcolors.
This commit is contained in:
MobiusDevelopment 2020-04-29 23:23:34 +00:00
parent c8a31356a0
commit d6c62b24af
5 changed files with 14 additions and 19 deletions

View File

@ -558,6 +558,10 @@ public class Q501_ProofOfClanAlliance extends Quest
{
final Clan clan = player.getClan();
final PlayerInstance leader = clan.getLeader().getPlayerInstance();
if (leader == null)
{
return null;
}
return leader.getQuestState(getName());
}
}

View File

@ -282,11 +282,9 @@ public class Q604_DaimonTheWhiteEyed_Part2 extends Quest
if ((raid != null) && (raid.getRaidStatus() == RaidBossStatus.ALIVE))
{
// set temporarily spawn location (to provide correct behavior of RaidBossInstance.checkAndReturnToSpawn())
raid.getSpawn().setLoc(185900, -44000, -3160, Rnd.get(65536));
// raid.getSpawn().setLoc(185900, -44000, -3160, Rnd.get(65536));
// teleport raid from secret place
raid.teleToLocation(185900, -44000, -3160);
raid.setHeading(100);
addSpawn(DAIMON_THE_WHITE_EYED, 185900, -44000, -3160, 100, false, 0);
raid.broadcastNpcSay("Who called me?");
// set raid status

View File

@ -18,7 +18,6 @@ package quests.Q610_MagicalPowerOfWater_Part2;
import java.util.logging.Level;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.enums.RaidBossStatus;
import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
@ -262,12 +261,10 @@ public class Q610_MagicalPowerOfWater_Part2 extends Quest
if ((raid != null) && (raid.getRaidStatus() == RaidBossStatus.ALIVE))
{
// set temporarily spawn location (to provide correct behavior of RaidBossInstance.checkAndReturnToSpawn())
raid.getSpawn().setLoc(104771, -36993, -1149, Rnd.get(65536));
// raid.getSpawn().setLoc(104771, -36993, -1149, Rnd.get(65536));
// teleport raid from secret place
raid.teleToLocation(104771, -36993, -1149);
raid.setHeading(100);
raid.broadcastNpcSay("The water charm then is the storm and the tsunami strength! Opposes with it only has the blind alley!");
addSpawn(SOUL_OF_WATER_ASHUTAR, 104771, -36993, -1149, 100, false, 0);
raid.broadcastNpcSay("You didnt come into this world. You came out of it, like a wave from the ocean. You are not a stranger here.");
// set raid status
_status = IDLE_INTERVAL;

View File

@ -18,7 +18,6 @@ package quests.Q616_MagicalPowerOfFire_Part2;
import java.util.logging.Level;
import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.enums.RaidBossStatus;
import org.l2jmobius.gameserver.instancemanager.RaidBossSpawnManager;
import org.l2jmobius.gameserver.model.actor.instance.NpcInstance;
@ -273,11 +272,10 @@ public class Q616_MagicalPowerOfFire_Part2 extends Quest
if ((raid != null) && (raid.getRaidStatus() == RaidBossStatus.ALIVE))
{
// set temporarily spawn location (to provide correct behavior of RaidBossInstance.checkAndReturnToSpawn())
raid.getSpawn().setLoc(142624, -82285, -6491, Rnd.get(65536));
// raid.getSpawn().setLoc(142624, -82285, -6491, Rnd.get(65536));
// teleport raid from secret place
raid.teleToLocation(142624, -82285, -6491);
raid.setHeading(100);
addSpawn(SOUL_OF_FIRE_NASTRON, 142624, -82285, -6491, 100, false, 0);
raid.broadcastNpcSay("The fire you kindle for your enemy often burns yourself more than them.");
// set raid status
_status = IDLE_INTERVAL;

View File

@ -276,11 +276,9 @@ public class Q625_TheFinestIngredients_Part2 extends Quest
if ((raid != null) && (raid.getRaidStatus() == RaidBossStatus.ALIVE))
{
// set temporarily spawn location (to provide correct behavior of RaidBossInstance.checkAndReturnToSpawn())
raid.getSpawn().setLoc(157117, -121939, -2397, Rnd.get(65536));
// raid.getSpawn().setLoc(157117, -121939, -2397, Rnd.get(65536));
// teleport raid from secret place
raid.teleToLocation(157117, -121939, -2397);
raid.setHeading(100);
addSpawn(ICICLE_EMPEROR_BUMBALUMP, 157117, -121939, -2397, 100, false, 0);
raid.broadcastNpcSay("I smell something delicious...");
// set raid status