- 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
This commit is contained in:
parent
9ea5b9c76c
commit
94896dc707
@ -3254,11 +3254,11 @@ int parse_char(int fd)
|
|||||||
|
|
||||||
// request to connect
|
// request to connect
|
||||||
case 0x65:
|
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)
|
if (RFIFOREST(fd) < 17)
|
||||||
return 0;
|
return 0;
|
||||||
{
|
{
|
||||||
int GM_value;
|
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) {
|
if (sd) {
|
||||||
//Received again auth packet for already authentified account?? Discard it.
|
//Received again auth packet for already authentified account?? Discard it.
|
||||||
|
@ -2772,10 +2772,10 @@ int parse_char(int fd)
|
|||||||
|
|
||||||
// request to connect
|
// request to connect
|
||||||
case 0x65:
|
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)
|
if (RFIFOREST(fd) < 17)
|
||||||
return 0;
|
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) {
|
if (sd) {
|
||||||
//Received again auth packet for already authentified account?? Discard it.
|
//Received again auth packet for already authentified account?? Discard it.
|
||||||
//TODO: Perhaps log this as a hack attempt?
|
//TODO: Perhaps log this as a hack attempt?
|
||||||
|
@ -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( x = x0; x <= x1; ++x )
|
||||||
for( y = y0; y <= y1; ++y )
|
for( y = y0; y <= y1; ++y )
|
||||||
|
if (map_getcell(m, x, y, CELL_CHKNOREACH))
|
||||||
|
continue;
|
||||||
map_setcell(m, x, y, cell);
|
map_setcell(m, x, y, cell);
|
||||||
|
|
||||||
return strchr(start,'\n');// continue
|
return strchr(start,'\n');// continue
|
||||||
|
Loading…
x
Reference in New Issue
Block a user