Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made charserver refuse connections if no map server is connected, performance improvement. bugreport:2359

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15379 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
shennetsind 2012-01-04 03:09:36 +00:00
parent a379d7a673
commit 7b811af129
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/char_sql/char.c
View File

@ -1994,22 +1994,21 @@ int parse_fromlogin(int fd)
ARR_FIND( 0, fd_max, i, session[i] && (sd = (struct char_session_data*)session[i]->session_data) && sd->auth && sd->account_id == RFIFOL(fd,2) ); ARR_FIND( 0, fd_max, i, session[i] && (sd = (struct char_session_data*)session[i]->session_data) && sd->auth && sd->account_id == RFIFOL(fd,2) );
if( i < fd_max ) if( i < fd_max )
{ {
int server_id;
memcpy(sd->email, RFIFOP(fd,6), 40); memcpy(sd->email, RFIFOP(fd,6), 40);
sd->expiration_time = (time_t)RFIFOL(fd,46); sd->expiration_time = (time_t)RFIFOL(fd,46);
sd->gmlevel = RFIFOB(fd,50); sd->gmlevel = RFIFOB(fd,50);
safestrncpy(sd->birthdate, (const char*)RFIFOP(fd,51), sizeof(sd->birthdate)); safestrncpy(sd->birthdate, (const char*)RFIFOP(fd,51), sizeof(sd->birthdate));
ARR_FIND( 0, ARRAYLENGTH(server), server_id, server[server_id].fd > 0 && server[server_id].map[0] );
// continued from char_auth_ok... // continued from char_auth_ok...
if( max_connect_user && count_users() >= max_connect_user && sd->gmlevel < gm_allow_level ) if( server_id == ARRAYLENGTH(server) || //server not online, bugreport:2359
{ ( max_connect_user && count_users() >= max_connect_user && sd->gmlevel < gm_allow_level ) ) {
// refuse connection (over populated) // refuse connection (over populated)
WFIFOHEAD(i,3); WFIFOHEAD(i,3);
WFIFOW(i,0) = 0x6c; WFIFOW(i,0) = 0x6c;
WFIFOW(i,2) = 0; WFIFOW(i,2) = 0;
WFIFOSET(i,3); WFIFOSET(i,3);
} } else {
else
{
// send characters to player // send characters to player
mmo_char_send006b(i, sd); mmo_char_send006b(i, sd);
#if PACKETVER >= 20110309 #if PACKETVER >= 20110309