瀏覽代碼

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
shennetsind 13 年之前
父節點
當前提交
3896e1959b
共有 2 個文件被更改,包括 6 次插入2 次删除
  1. 4 1
      src/map/clif.c
  2. 2 1
      src/map/unit.c

+ 4 - 1
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);

+ 2 - 1
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;
 	}