summaryrefslogtreecommitdiff
path: root/src/map/unit.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/unit.c')
-rw-r--r--src/map/unit.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/map/unit.c b/src/map/unit.c
index 13959e5cd..8e34eca45 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -668,11 +668,11 @@ int unit_can_move(struct block_list *bl)
|| sc->data[SC_BLADESTOP].timer !=-1
|| sc->data[SC_BLADESTOP_WAIT].timer !=-1
|| sc->data[SC_SPIDERWEB].timer !=-1
- || (sc->data[SC_DANCING].timer !=-1 && (
- (sc->data[SC_DANCING].val4 && sc->data[SC_LONGING].timer == -1) ||
- sc->data[SC_DANCING].val1 == CG_HERMODE //cannot move while Hermod is active.
+ || (sc->data[SC_DANCING].timer !=-1 && sc->data[SC_DANCING].val4 && (
+ sc->data[SC_LONGING].timer == -1 ||
+ (sc->data[SC_DANCING].val1&0xFFFF) == CG_MOONLIT ||
+ (sc->data[SC_DANCING].val1&0xFFFF) == CG_HERMODE
))
- || sc->data[SC_MOONLIT].timer != -1
|| (sc->data[SC_GOSPEL].timer !=-1 && sc->data[SC_GOSPEL].val4 == BCT_SELF) // cannot move while gospel is in effect
|| sc->data[SC_STOP].timer != -1
|| sc->data[SC_CLOSECONFINE].timer != -1