summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesusaves <cpntb1@ymail.com>2025-06-26 21:40:49 -0300
committerJesusaves <cpntb1@ymail.com>2025-06-26 21:40:49 -0300
commit869f71a8b41f20586e35c2199f290982ff6a2a6d (patch)
treea4a12eede2f3875e8f307260a816242cce895239
parenta7941e72dce36cc2678ead5d9c7fba9a8ce9c211 (diff)
downloadserverdata-869f71a8b41f20586e35c2199f290982ff6a2a6d.tar.gz
serverdata-869f71a8b41f20586e35c2199f290982ff6a2a6d.tar.bz2
serverdata-869f71a8b41f20586e35c2199f290982ff6a2a6d.tar.xz
serverdata-869f71a8b41f20586e35c2199f290982ff6a2a6d.zip
Race Condition (FYE_Normalize)
-rw-r--r--npc/003-1/shop.txt6
-rw-r--r--npc/functions/aurora.txt5
2 files changed, 6 insertions, 5 deletions
diff --git a/npc/003-1/shop.txt b/npc/003-1/shop.txt
index 9b9948fe3..ab0d49ae3 100644
--- a/npc/003-1/shop.txt
+++ b/npc/003-1/shop.txt
@@ -29,6 +29,12 @@ OnInit:
.sex = G_OTHER;
.distance = 3;
+
+ // Re-open Tulimshar Bazaar if necessary
+ if ($BAZAAR_TIMER % BAZAARFREQ == 0) {
+ sleep(SHOPWAIT + 350);
+ callfunc "BazaarToggle", ($BAZAAR_TIMER % BAZAARFREQ == 0);
+ }
end;
OnClock0621:
diff --git a/npc/functions/aurora.txt b/npc/functions/aurora.txt
index 8d6f15fe6..c1eb61f53 100644
--- a/npc/functions/aurora.txt
+++ b/npc/functions/aurora.txt
@@ -851,11 +851,6 @@ function script FYE_Normalize {
setmapflag($REGNUM_BLESSMAP$, mf_bexp, 300);
setmapflag($REGNUM_BLESSMAP$, mf_jexp, 300);
}
- // Re-open Tulimshar Bazaar if necessary
- if ($BAZAAR_TIMER % BAZAARFREQ == 0) {
- sleep(SHOPWAIT + 300);
- callfunc "BazaarToggle", true;
- }
return;
}