From 0773ec5e92dc7b44cc6f32f134d77d950c20d521 Mon Sep 17 00:00:00 2001
From: Michieru <Michieru@users.noreply.github.com>
Date: Sun, 21 Sep 2014 13:16:20 +0200
Subject: Using Hovering should off-set the effect of Magnetic Field (bug:8022)

---
 src/map/unit.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

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]
-- 
cgit v1.2.3-60-g2f50