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

Session check standarization (#5388)

Browse Source 
Thanks to @Lemongrass3110
This commit is contained in:
Daegaladh
2021-01-14 15:57:30 +01:00
committed by GitHub
parent ae4e2b9cba
commit ecb4cc0a42
8 changed files with 66 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/char/char.cpp
View File

@@ -1752,7 +1752,7 @@ int char_count_users(void)
users = 0;
for(i = 0; i < ARRAYLENGTH(map_server); i++) {
if (map_server[i].fd > 0) {
if (session_isValid(map_server[i].fd)) {
users += map_server[i].users;
}
}
@@ -1987,7 +1987,7 @@ void char_auth_ok(int fd, struct char_session_data *sd) {
chclif_send_auth_result(fd,8);
return;
}
if (character->fd >= 0 && character->fd != fd)
if (session_isValid(character->fd) && character->fd != fd)
{ //There's already a connection from this account that hasn't picked a char yet.
chclif_send_auth_result(fd,8);
return;
@@ -2094,7 +2094,7 @@ int char_loadName(uint32 char_id, char* name){
int char_search_mapserver(unsigned short map, uint32 ip, uint16 port){
for(int i = 0; i < ARRAYLENGTH(map_server); i++)
{
if (map_server[i].fd > 0
if (session_isValid(map_server[i].fd)
&& (ip == (uint32)-1 || map_server[i].ip == ip)
&& (port == (uint16)-1 || map_server[i].port == port))
{