summaryrefslogtreecommitdiff
path: root/npc/quests
diff options
context:
space:
mode:
authorGepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-20 23:18:07 +0000
committerGepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec>2011-03-20 23:18:07 +0000
commit664aa469ab0796b2d49f29bd44e95a39503c604b (patch)
treebea22f87a2387e119f1a9fff7ccb5d14e8226869 /npc/quests
parent9c74dec923356ac60b59a76e02518cc67a766ae3 (diff)
downloadhercules-664aa469ab0796b2d49f29bd44e95a39503c604b.tar.gz
hercules-664aa469ab0796b2d49f29bd44e95a39503c604b.tar.bz2
hercules-664aa469ab0796b2d49f29bd44e95a39503c604b.tar.xz
hercules-664aa469ab0796b2d49f29bd44e95a39503c604b.zip
* Fixed and commented out old Anthell entrance warps (bugreport:3589).
- Moved entrance to cmd_fild08 to match mapcache updates. * Fixed an issue in Resurrection of Satan Morroc (Continental Guard Quest) when player dying/logging out during conversation could prevent summoning of Satan Morroc until server reboot (bugreport:3437). git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14753 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'npc/quests')
-rw-r--r--npc/quests/quests_morocc.txt10
1 files changed, 7 insertions, 3 deletions
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt
index f6ad5bf73..ccd1a54e0 100644
--- a/npc/quests/quests_morocc.txt
+++ b/npc/quests/quests_morocc.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 2.8
+//= 2.9
//===== Compatible With: =====================================
//= eAthena 7.15 +
//===== Description: =========================================
@@ -41,6 +41,8 @@
//= finished it to return to the previous map.
//= 2.7 Corrected weight checks, they only check for inventory slots. [L0ne_W0lf]
//= 2.8 Disabled Assassin bar pub NPCs, as they are included in the 13.1 quests file. [L0ne_W0lf]
+//= 2.9 Fixed player dying/logging out during conversation could prevent
+//= summoning of Satan Morroc until server reboot. [Gepard]
//============================================================
// Stop Post Quest
@@ -1899,7 +1901,6 @@ OnDisable:
moc_fild21,178,239,0 script Group of Evil#edq 844,1,1,{
if (((rebirth_moc_edq == 4) || (rebirth_moc_edq == 7)) && ($@re_moc == 1)) {
- set $@re_moc,2;
mes "Awed by the time-space gap where darkness is given life, you instinctively step back.";
next;
mes "You can feel the power of the darkness rise from the gap where light and darkness are mingled.";
@@ -1907,7 +1908,10 @@ moc_fild21,178,239,0 script Group of Evil#edq 844,1,1,{
mes "[" + strcharinfo(0) + "]";
mes "Wah...!";
close2;
- donpcevent "Satan Summon#edq::OnEnable";
+ if($@re_moc == 1) {
+ set $@re_moc,2;
+ donpcevent "Satan Summon#edq::OnEnable";
+ }
end;
}
else {