diff options
| author | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-02 04:42:34 +0000 |
|---|---|---|
| committer | shennetsind <shennetsind@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-02 04:42:34 +0000 |
| commit | 0c9374f1f6f3d82cfa93a3c305ce5328363d0c28 (patch) | |
| tree | f80b1faa9847e68f7faba07d475600d397e18a4a | |
| parent | 07de6e307e4aae0beee1f6397ecbd37fd3295e04 (diff) | |
| download | hercules-0c9374f1f6f3d82cfa93a3c305ce5328363d0c28.tar.gz hercules-0c9374f1f6f3d82cfa93a3c305ce5328363d0c28.tar.bz2 hercules-0c9374f1f6f3d82cfa93a3c305ce5328363d0c28.tar.xz hercules-0c9374f1f6f3d82cfa93a3c305ce5328363d0c28.zip | |
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://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16041 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | src/map/clif.c | 5 | ||||
| -rw-r--r-- | 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 e0524711e..35cc6e21e 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 fb613f8a0..e00d0101e 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; } |