diff options
Diffstat (limited to 'src/map/battleground.c')
| -rw-r--r-- | src/map/battleground.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/battleground.c b/src/map/battleground.c index 7ac18daf8..e740a3370 100644 --- a/src/map/battleground.c +++ b/src/map/battleground.c @@ -238,8 +238,8 @@ int bg_team_get_id(struct block_list *bl) { return ((struct homun_data*)bl)->master->bg_id; break; case BL_MER: - if( ((TBL_MER*)bl)->master ) - return ((TBL_MER*)bl)->master->bg_id; + if (((struct mercenary_data *)bl)->master != NULL) + return ((struct mercenary_data *)bl)->master->bg_id; break; case BL_SKILL: return ((TBL_SKILL*)bl)->group->bg_id; |