diff options
author | HoraK-FDF <horak-fdf@web.de> | 2022-11-11 18:25:19 +0000 |
---|---|---|
committer | HoraK-FDF <horak-fdf@web.de> | 2022-11-11 18:25:19 +0000 |
commit | f6256f240c2fabe5d26efa7e88e69c2de19a6786 (patch) | |
tree | e832fa79f8fe9a78085e0b14b35f2bac5afe3006 /world/map/npc/magic/event-summon-managuardian.txt | |
parent | 9ad304f22b698d69e7d41cc4cdfe53bf16d5d552 (diff) | |
parent | c62e768cc51f9607b85642c78d32cbcbc519f880 (diff) | |
download | serverdata-magic.tar.gz serverdata-magic.tar.bz2 serverdata-magic.tar.xz serverdata-magic.zip |
Merge branch 'master' into 'magic'magic
# Conflicts:
# world/map/db/const.txt
# world/map/npc/magic/event-summon-managuardian.txt
Diffstat (limited to 'world/map/npc/magic/event-summon-managuardian.txt')
-rw-r--r-- | world/map/npc/magic/event-summon-managuardian.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/world/map/npc/magic/event-summon-managuardian.txt b/world/map/npc/magic/event-summon-managuardian.txt index 9a92b16a..2581ab16 100644 --- a/world/map/npc/magic/event-summon-managuardian.txt +++ b/world/map/npc/magic/event-summon-managuardian.txt @@ -11,7 +11,7 @@ OnCast: if (countitem("TinyManaElixir") < 1) end; if (!$DOOMSDAY_SUMMON) end; // if (@ddcooldown > gettimetick(2)) goto L_Cooldown; - if (sc_check (SC_COOLDOWN_MG)) goto L_Cooldown; + if (sc_check(SC_COOLDOWN_MG)) goto L_Cooldown; if (getmap() == "033-1") goto L_SpecialRules6; goto L_Pay; |