浏览代码

Fixed bugreport:6095 Spider Web has been removed from the SCS condition system as its data cannot be cached (requires real-time check)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16331 54d463be-8e91-2dee-dedb-b68131a5f0ec
shennetsind 13 年之前
父节点
当前提交
69c6a14772
共有 2 个文件被更改,包括 2 次插入4 次删除
  1. 1 3
      src/map/status.c
  2. 1 1
      src/map/unit.c

+ 1 - 3
src/map/status.c

@@ -948,7 +948,6 @@ void initChangeTables(void) {
 	StatusChangeStateTable[SC_TRICKDEAD]           |= SCS_NOMOVE;
 	StatusChangeStateTable[SC_BLADESTOP]           |= SCS_NOMOVE;
 	StatusChangeStateTable[SC_BLADESTOP_WAIT]      |= SCS_NOMOVE;
-	StatusChangeStateTable[SC_SPIDERWEB]           |= SCS_NOMOVE|SCS_NOMOVECOND;
 	StatusChangeStateTable[SC_DANCING]             |= SCS_NOMOVE|SCS_NOMOVECOND;
 	StatusChangeStateTable[SC_GOSPEL]              |= SCS_NOMOVE|SCS_NOMOVECOND;
 	StatusChangeStateTable[SC_BASILICA]            |= SCS_NOMOVE|SCS_NOMOVECOND;
@@ -3363,8 +3362,7 @@ void status_calc_state( struct block_list *bl, struct status_change *sc, enum sc
 		if( !(flag&SCS_NOMOVECOND) ) {
 			sc->cant.move += ( start ? 1 : -1 );
 		} else if(
-				  (sc->data[SC_SPIDERWEB] && sc->data[SC_SPIDERWEB]->val1)
-				  || (sc->data[SC_DANCING] && sc->data[SC_DANCING]->val4 && (
+					 (sc->data[SC_DANCING] && sc->data[SC_DANCING]->val4 && (
 																			 !sc->data[SC_LONGING] ||
 																			 (sc->data[SC_DANCING]->val1&0xFFFF) == CG_MOONLIT ||
 																			 (sc->data[SC_DANCING]->val1&0xFFFF) == CG_HERMODE

+ 1 - 1
src/map/unit.c

@@ -916,7 +916,7 @@ int unit_can_move(struct block_list *bl)
 		return 0; //Can't move
 	
 	if (sc) {
-		if( sc->cant.move || (sc->data[SC_FEAR] && sc->data[SC_FEAR]->val2 > 0) )
+		if( sc->cant.move || (sc->data[SC_FEAR] && sc->data[SC_FEAR]->val2 > 0) || (sc->data[SC_SPIDERWEB] && sc->data[SC_SPIDERWEB]->val1) )
 			return 0;
 		
 		if (sc->opt1 > 0 && sc->opt1 != OPT1_STONEWAIT && sc->opt1 != OPT1_BURNING && (sc->opt1 != OPT1_CRYSTALIZE && bl->type != BL_MOB))