summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/020-5/bracco.txt4
-rw-r--r--npc/functions/aurora.txt2
2 files changed, 4 insertions, 2 deletions
diff --git a/npc/020-5/bracco.txt b/npc/020-5/bracco.txt
index b725f3dde..881b842ca 100644
--- a/npc/020-5/bracco.txt
+++ b/npc/020-5/bracco.txt
@@ -138,6 +138,7 @@
delitem .@id, .@total; // Delete first, no refunds
+ freeloop(true);
for (.@index=0; .@index < @inventorylist_count; .@index++) {
.@x=@inventorylist_id[.@index];
if (.@x == getarg(0) && Zeny >= .@price) {
@@ -147,9 +148,10 @@
mesc l("@@ melt down your @@...", .name$, getitemlink(.@x)), 2;
// Really melt it down
- NewMeltdown(.@x);
+ NewMeltdown(getarg(0));
}
}
+ freeloop(false);
@indexisbroken=true;
return;
}
diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt
index 42977e2f8..3204767a6 100644
--- a/npc/functions/aurora.txt
+++ b/npc/functions/aurora.txt
@@ -723,7 +723,7 @@ function script FYE_Submit {
// Stops any Aurora Event
function script FYStopEvent {
- setarray .@av$, "Kamelot", "Regnum", "Expo", "Fishing", "Candor", "Mining", "Tower", "Raid", "Olympics";
+ setarray .@av$, "Kamelot", "Regnum", "Expo", "Fishing", "Candor", "Mining", "Tower", "Raid", "Olympics", "Celestia", "Rebirth", "Gemini";
if (array_find(.@av$, $EVENT$) >= 0) {
sClear();
$EVENT$="";