diff options
| author | shennetsind <ind@henn.et> | 2014-09-21 15:22:48 -0300 |
|---|---|---|
| committer | shennetsind <ind@henn.et> | 2014-09-21 15:22:48 -0300 |
| commit | 145ab7c8aaa8dd9761fb1368c8d6b2f8365271f9 (patch) | |
| tree | b743a4d405556a31fcf4dd3c21a68f35ceb55270 /src/map | |
| parent | 8703337d4a08798613eeedf8730631ede2399df6 (diff) | |
| parent | 0773ec5e92dc7b44cc6f32f134d77d950c20d521 (diff) | |
| download | hercules-145ab7c8aaa8dd9761fb1368c8d6b2f8365271f9.tar.gz hercules-145ab7c8aaa8dd9761fb1368c8d6b2f8365271f9.tar.bz2 hercules-145ab7c8aaa8dd9761fb1368c8d6b2f8365271f9.tar.xz hercules-145ab7c8aaa8dd9761fb1368c8d6b2f8365271f9.zip | |
Merge branch 'master' of github.com:HerculesWS/Hercules
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/clif.c | 1 | ||||
| -rw-r--r-- | src/map/unit.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c index 6838a8021..f6ab3f444 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -3432,7 +3432,6 @@ void clif_arrowequip(struct map_session_data *sd,int val) nullpo_retv(sd); - pc_stop_attack(sd); // [Valaris] #if PACKETVER >= 20121128 clif->status_change(&sd->bl, SI_CLIENT_ONLY_EQUIP_ARROW, 1, INVALID_TIMER, 0, 0, 0); #endif 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] |