From 3896e1959b94733fb1d22044e024d686e69df074 Mon Sep 17 00:00:00 2001 From: shennetsind Date: Wed, 2 May 2012 04:42:34 +0000 Subject: [PATCH] Fixed bugreport:5484 Cursed Circle caster can no longer move while in the effect (but if he casts any skill it cancels his state and his targets' one). Cursed Circle caster is no longer to attack nearby units either, Also fixed a bug in manhole that allowed trapped character to attack nearby units. git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16041 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/clif.c | 5 ++++- src/map/unit.c | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/map/clif.c b/src/map/clif.c index e0524711ee..35cc6e21e6 100644 --- a/src/map/clif.c +++ b/src/map/clif.c @@ -9650,7 +9650,10 @@ void clif_parse_ActionRequest_sub(struct map_session_data *sd, int action_type, if (sd->sc.count && (sd->sc.data[SC_TRICKDEAD] || sd->sc.data[SC_AUTOCOUNTER] || - sd->sc.data[SC_BLADESTOP])) + sd->sc.data[SC_BLADESTOP] || + sd->sc.data[SC__MANHOLE] || + sd->sc.data[SC_CURSEDCIRCLE_ATKER] || + sd->sc.data[SC_CURSEDCIRCLE_TARGET] )) return; pc_stop_walking(sd, 1); diff --git a/src/map/unit.c b/src/map/unit.c index fb613f8a03..e00d0101e4 100644 --- a/src/map/unit.c +++ b/src/map/unit.c @@ -921,7 +921,8 @@ int unit_can_move(struct block_list *bl) || sc->data[SC__MANHOLE] || sc->data[SC_VACUUM_EXTREME] || (sc->data[SC_FEAR] && sc->data[SC_FEAR]->val2 > 0) - || sc->data[SC_CURSEDCIRCLE_TARGET] + || sc->data[SC_CURSEDCIRCLE_ATKER] + || sc->data[SC_CURSEDCIRCLE_TARGET] )) return 0; }