summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/char/char.c2
-rw-r--r--src/char_sql/char.c2
-rw-r--r--src/map/npc.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/char/char.c b/src/char/char.c
index 2df5a7318..be2f3dafa 100644
--- a/src/char/char.c
+++ b/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.
diff --git a/src/char_sql/char.c b/src/char_sql/char.c
index 4e3d7382e..04520743a 100644
--- a/src/char_sql/char.c
+++ b/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?
diff --git a/src/map/npc.c b/src/map/npc.c
index 9a6a5ff51..0636bc797 100644
--- a/src/map/npc.c
+++ b/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