Disable warping directly to npc using @warp

[darking123]

Is there a source release to disable directly warping to an NPC? you may enter the exact coordinates when using @warp, however you will be warped beside it, not merging into it. Thank you!

[Haruka Mayumi]

			warp_get_suggestions(sd, map_name);

		return -1;
	}

-	if ((x || y) && map_getcell(m, x, y, CELL_CHKNOPASS))
-	{	//This is to prevent the pc_setpos call from printing an error.
-		clif_displaymessage(fd, msg_txt(sd,2)); // Invalid coordinates, using random target cell.
-		if (!map_search_freecell(NULL, m, &x, &y, 10, 10, 1))
-			x = y = 0; //Invalid cell, use random spot.
-	}
+	if (x || y) { //This is to prevent the pc_setpos call from printing an error.
+		if(map_getcell(m, x, y, CELL_CHKNOPASS)){
+			clif_displaymessage(fd, msg_txt(sd,2)); // Invalid coordinates, using random target cell.
+			if (!map_search_freecell(NULL, m, &x, &y, 10, 10, 1))
+				x = y = 0; //Invalid cell, use random spot.
+		} else {
+			struct map_data *mapdata = map_getmapdata(m);
+			for (int i = 0; i < mapdata->npc_num; i++)
+				if( x == mapdata->npc[i]->bl.x && y == mapdata->npc[i]->bl.y ){
+					if (!map_search_freecell(NULL, m, &x, &y, 1, 1, 1))
+						x = y = 0;
+				break;
+				}
+		}
+	}

 

Edited April 24, 2020 by Haruka Mayumi

[darking123]

28 minutes ago, Haruka Mayumi said:

	if (m < 0) { // m < 0 means on different server! [Kevin]
		clif_displaymessage(fd, msg_txt(sd,1)); // Map not found.

		if (battle_config.warp_suggestions_enabled)
			warp_get_suggestions(sd, map_name);

		return -1;
	}

+	if ((x || y) && map_getcell(m, x, y, CELL_CHKNPC))
+	{	// Disable NPC Warping
+		clif_displaymessage(fd,"NPC location warping is disabled.");
+		return 1-;
+	}
	
	if ((x || y) && map_getcell(m, x, y, CELL_CHKNOPASS))
	{	//This is to prevent the pc_setpos call from printing an error.
		clif_displaymessage(fd, msg_txt(sd,2)); // Invalid coordinates, using random target cell.
		if (!map_search_freecell(NULL, m, &x, &y, 10, 10, 1))
			x = y = 0; //Invalid cell, use random spot.
	}

I'm too lazy to add warp beside it. so just disabling the direct npc warp will do.. 

thank you for this. however I am requesting that if ever I enter the exact coordinates of the NPC via @warp. it won't directly warp me to the NPC, but beside only the NPC. any location will do but it must be beside the NPC. 

maybe a 1-3 cell apart from the NPC?

 

 

[xJhay]

Is this available for herc svn?