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

Fixes Instance idle timer. (#2155)

Browse Source 
* Fixes #2154
* Fixes an incorrect start of the instance idle timer.
* Thanks to generic!
This commit is contained in:
Jeybla 2017-05-22 06:23:34 +02:00 committed by GitHub
parent 39dbb9abd3
commit cc700f1fb5
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/map/instance.c
View File

@ -812,7 +812,7 @@ int instance_addusers(unsigned short instance_id)
int instance_delusers(unsigned short instance_id) int instance_delusers(unsigned short instance_id)
{ {
struct instance_data *im; struct instance_data *im;
int i, idle = 0; int i, users = 0;
if(instance_id == 0 || instance_id > MAX_INSTANCE_DATA) if(instance_id == 0 || instance_id > MAX_INSTANCE_DATA)
return 1; return 1;
@ -823,10 +823,11 @@ int instance_delusers(unsigned short instance_id)
// If no one is in the instance, start the idle timer // If no one is in the instance, start the idle timer
for(i = 0; i < im->cnt_map && im->map[i]->m; i++) for(i = 0; i < im->cnt_map && im->map[i]->m; i++)
if(map[im->map[i]->m].users > 1) // We check this before the actual map.users are updated, hence the 1 users += max(map[im->map[i]->m].users,0);
idle++;
if(!idle) // If idle wasn't added to, we know no one was in the instance // We check the actual map.users before being updated, hence the 1
// The instance should be empty if users are now <= 1
if(users <= 1)
instance_startidletimer(im, instance_id); instance_startidletimer(im, instance_id);
return 0; return 0;