Jelajahi Sumber

Fixed a not-so-well implemented basilica fix that was reverted in 12869.

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@12872 54d463be-8e91-2dee-dedb-b68131a5f0ec
sketchyphoenix 17 tahun lalu
induk
melakukan
a3f49e9826
1 mengubah file dengan 9 tambahan dan 2 penghapusan
  1. 9 2
      src/map/unit.c

+ 9 - 2
src/map/unit.c

@@ -218,13 +218,19 @@ static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr data)
 	else
 		i = status_get_speed(bl);
 
+	if (map_getcell(bl->m,x,y,CELL_CHKBASILICA)) {
+		skill_blown(bl,bl,2,unit_getdir(bl),0);
+		clif_fixpos(bl);
+	}
+	
 	if(i > 0)
 		ud->walktimer = add_timer(tick+i,unit_walktoxy_timer,id,i);
 	else if(ud->state.running) {
 		//Keep trying to run.
 		if (!unit_run(bl))
 			ud->state.running = 0;
-	} else if (ud->target) {
+	}
+	else if (ud->target) {
 		//Update target trajectory.
 		struct block_list *tbl = map_id2bl(ud->target);
 		if (!tbl || !status_check_visibility(bl, tbl)) {	//Cancel chase.
@@ -246,7 +252,8 @@ static int unit_walktoxy_timer(int tid, unsigned int tick, int id, intptr data)
 			unit_walktobl(bl, tbl, ud->chaserange, ud->state.walk_easy|(ud->state.attack_continue?2:0));
 			return 0;
 		}
-	} else {	//Stopped walking. Update to_x and to_y to current location [Skotlex]
+	}
+	else {	//Stopped walking. Update to_x and to_y to current location [Skotlex]
 		ud->to_x = bl->x;
 		ud->to_y = bl->y;
 		if(md && md->nd) // Tell the script engine we've finished walking (for AI pathfinding)