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

Skip MapN parsing if it is equal to EnterMap for instances (#2131)

Browse Source 
Added a check to prevent instance from adding duplicate maps
This commit is contained in:
Jittapan Pluemsumran 2017-05-21 00:50:01 +07:00 committed by Lemongrass3110
parent ae540f133f
commit 6a75b17380
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/map/instance.c
View File

@ -839,7 +839,7 @@ static bool instance_db_free_sub(struct instance_db *db);
*------------------------------------------*/ *------------------------------------------*/
static bool instance_readdb_sub(char* str[], int columns, int current) static bool instance_readdb_sub(char* str[], int columns, int current)
{ {
uint8 i; uint8 i,j;
char *ptr; char *ptr;
int id = strtol(str[0], &ptr, 10); int id = strtol(str[0], &ptr, 10);
struct instance_db *db; struct instance_db *db;
@ -911,6 +911,30 @@ static bool instance_readdb_sub(char* str[], int columns, int current)
ShowWarning("instance_readdb_sub: Invalid map '%s' in maplist, skipping...\n", str[i]); ShowWarning("instance_readdb_sub: Invalid map '%s' in maplist, skipping...\n", str[i]);
continue; continue;
} }
if (strcmpi(str[4], str[i]) == 0) {
ShowWarning("instance_readdb_sub: '%s'(Map%d) must not be equal to EnterMap for instance id '%d', skipping...\n", str[i], i - 5, id);
continue;
}
// Check if the map is in the list already
for (j = 7; j < i; j++) {
// Skip empty columns
if (!strlen(str[j])) {
continue;
}
if (strcmpi(str[j], str[i]) == 0) {
break;
}
}
// If it was already in the list
if (j < i) {
ShowWarning("instance_readdb_sub: '%s'(Map%d) was already added for instance id '%d', skipping...\n", str[i], i - 5, id);
continue; // Skip it
}
RECREATE(db->maplist, StringBuf *, db->maplist_count+1); RECREATE(db->maplist, StringBuf *, db->maplist_count+1);
db->maplist[db->maplist_count] = StringBuf_Malloc(); db->maplist[db->maplist_count] = StringBuf_Malloc();
StringBuf_AppendStr(db->maplist[db->maplist_count], str[i]); StringBuf_AppendStr(db->maplist[db->maplist_count], str[i]);