- setting npc cells will no longer work on non-walkable tiles (since you could do this to override cell types and make unwalkable cells walkable again, for example).

- Small fix in the char-server accept code.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@11755 54d463be-8e91-2dee-dedb-b68131a5f0ec

src/char/char.c

@@ -3254,11 +3254,11 @@ int parse_char(int fd)
 
 		// request to connect
 		case 0x65:
-			ShowInfo("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10));
 			if (RFIFOREST(fd) < 17)
 				return 0;
 		{
 			int GM_value;
+			ShowInfo("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10));
 
 			if (sd) {
 				//Received again auth packet for already authentified account?? Discard it.

src/char_sql/char.c

@@ -2772,10 +2772,10 @@ int parse_char(int fd)
 
 		// request to connect
 		case 0x65:
-			ShowInfo("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10));
 			if (RFIFOREST(fd) < 17)
 				return 0;
 		{
+			ShowInfo("request connect - account_id:%d/login_id1:%d/login_id2:%d\n", RFIFOL(fd,2), RFIFOL(fd,6), RFIFOL(fd,10));
 			if (sd) {
 				//Received again auth packet for already authentified account?? Discard it.
 				//TODO: Perhaps log this as a hack attempt?

src/map/npc.c

@@ -2544,6 +2544,8 @@ static const char* npc_parse_mapcell(char* w1, char* w2, char* w3, char* w4, con
 
 	for( x = x0; x <= x1; ++x )
 		for( y = y0; y <= y1; ++y )
+			if (map_getcell(m, x, y, CELL_CHKNOREACH))
+				continue;
 			map_setcell(m, x, y, cell);
 
 	return strchr(start,'\n');// continue