From 85d06cbdee4f4150373ea4a300101fe37cfd1c95 Mon Sep 17 00:00:00 2001
From: Adry_85 <Adrya85@hotmail.it>
Date: Thu, 23 Jan 2014 23:12:21 +0000
Subject: [PATCH] BETA: Continuing with [10146]. Reported by: jurchiks
---
.../Q00193_SevenSignsDyingMessage.java | 8 +++-----
.../Q00197_SevenSignsTheSacredBookOfSeal.java | 8 +++-----
.../Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java | 8 +++-----
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
index 844d657e74..6488dc6d06 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java
@@ -219,8 +219,8 @@ public final class Q00193_SevenSignsDyingMessage extends Quest
return null;
}
- final QuestState st = getQuestState(player, false);
- if (npc.isInsideRadius(player, 1500, true, false))
+ final QuestState st = getQuestState(partyMember, false);
+ if (npc.isInsideRadius(partyMember, 1500, true, false))
{
st.giveItems(SCULPTURE_OF_DOUBT, 1);
st.playSound(QuestSound.ITEMSOUND_QUEST_FINISH);
@@ -230,9 +230,7 @@ public final class Q00193_SevenSignsDyingMessage extends Quest
isBusy = false;
cancelQuestTimers("despawn");
cancelQuestTimers("heal");
- NpcSay ns = new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), NpcStringId.S1_YOU_MAY_HAVE_WON_THIS_TIME_BUT_NEXT_TIME_I_WILL_SURELY_CAPTURE_YOU);
- ns.addStringParameter(player.getName());
- npc.broadcastPacket(ns);
+ npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), NpcStringId.S1_YOU_MAY_HAVE_WON_THIS_TIME_BUT_NEXT_TIME_I_WILL_SURELY_CAPTURE_YOU).addStringParameter(partyMember.getName()));
return super.onKill(npc, player, isSummon);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
index 8b633cca50..134e7fb604 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java
@@ -231,8 +231,8 @@ public final class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
return null;
}
- final QuestState st = getQuestState(player, false);
- if (npc.isInsideRadius(player, 1500, true, false))
+ final QuestState st = getQuestState(partyMember, false);
+ if (npc.isInsideRadius(partyMember, 1500, true, false))
{
st.giveItems(SCULPTURE_OF_DOUBT, 1);
st.playSound(QuestSound.ITEMSOUND_QUEST_FINISH);
@@ -241,9 +241,7 @@ public final class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
isBusy = false;
cancelQuestTimers("despawn");
- NpcSay ns = new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), NpcStringId.S1_YOU_MAY_HAVE_WON_THIS_TIME_BUT_NEXT_TIME_I_WILL_SURELY_CAPTURE_YOU);
- ns.addStringParameter(player.getName());
- npc.broadcastPacket(ns);
+ npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), NpcStringId.S1_YOU_MAY_HAVE_WON_THIS_TIME_BUT_NEXT_TIME_I_WILL_SURELY_CAPTURE_YOU).addStringParameter(partyMember.getName()));
return super.onKill(npc, player, isSummon);
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
index 5a65059257..398de81c9f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java
@@ -181,7 +181,7 @@ public final class Q00198_SevenSignsEmbryo extends Quest
}
final QuestState st = getQuestState(partyMember, false);
- if (npc.isInsideRadius(player, 1500, true, false))
+ if (npc.isInsideRadius(partyMember, 1500, true, false))
{
st.giveItems(SCULPTURE_OF_DOUBT, 1);
st.setCond(2, true);
@@ -190,11 +190,9 @@ public final class Q00198_SevenSignsEmbryo extends Quest
isBusy = false;
cancelQuestTimers("despawn");
cancelQuestTimers("heal");
- NpcSay ns = new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), NpcStringId.S1_YOU_MAY_HAVE_WON_THIS_TIME_BUT_NEXT_TIME_I_WILL_SURELY_CAPTURE_YOU);
- ns.addStringParameter(player.getName());
- npc.broadcastPacket(ns);
+ npc.broadcastPacket(new NpcSay(npc.getObjectId(), Say2.NPC_ALL, npc.getId(), NpcStringId.S1_YOU_MAY_HAVE_WON_THIS_TIME_BUT_NEXT_TIME_I_WILL_SURELY_CAPTURE_YOU).addStringParameter(partyMember.getName()));
npc.deleteMe();
- player.showQuestMovie(14);
+ partyMember.showQuestMovie(14);
return super.onKill(npc, player, isSummon);
}
--
GitLab