summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichieru <Michieru@users.noreply.github.com>2014-09-21 13:16:20 +0200
committerMichieru <Michieru@users.noreply.github.com>2014-09-21 13:16:20 +0200
commit0773ec5e92dc7b44cc6f32f134d77d950c20d521 (patch)
tree615bcd02d7906d3d7ed7430c9e8c1d0df5a436ed /src
parent0f13e7e1ddc6b3e864ff74de4de97919bf02c1a8 (diff)
downloadhercules-0773ec5e92dc7b44cc6f32f134d77d950c20d521.tar.gz
hercules-0773ec5e92dc7b44cc6f32f134d77d950c20d521.tar.bz2
hercules-0773ec5e92dc7b44cc6f32f134d77d950c20d521.tar.xz
hercules-0773ec5e92dc7b44cc6f32f134d77d950c20d521.zip
Using Hovering should off-set the effect of Magnetic Field (bug:8022)
Diffstat (limited to 'src')
-rw-r--r--src/map/unit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/map/unit.c b/src/map/unit.c
index 1f81e0d2f..36eed87fe 100644
--- a/src/map/unit.c
+++ b/src/map/unit.c
@@ -930,7 +930,7 @@ int unit_can_move(struct block_list *bl) {
|| sc->data[SC_ELECTRICSHOCKER]
|| sc->data[SC_WUGBITE]
|| sc->data[SC_THORNS_TRAP]
- || sc->data[SC_MAGNETICFIELD]
+ || ( sc->data[SC_MAGNETICFIELD] && !sc->data[SC_HOVERING] )
|| sc->data[SC__MANHOLE]
|| sc->data[SC_CURSEDCIRCLE_ATKER]
|| sc->data[SC_CURSEDCIRCLE_TARGET]