From 7264180a6fb71f52178cc0b629d9ecc81e175a3a Mon Sep 17 00:00:00 2001 From: Atemo Date: Thu, 3 Sep 2020 22:51:24 +0200 Subject: [PATCH] Small correction in bg_team_leave (#5372) Corrected bg_team_leave to also remove the player from the bg when entry_point (bg enqueue) is not defined --- src/map/battleground.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/map/battleground.cpp b/src/map/battleground.cpp index 22d6af021c..9cbefa0814 100644 --- a/src/map/battleground.cpp +++ b/src/map/battleground.cpp @@ -538,8 +538,8 @@ int bg_team_leave(struct map_session_data *sd, bool quit, bool deserter) auto member = bgteam->members.begin(); while (member != bgteam->members.end()) { - if (member->sd == sd && member->entry_point.map != 0) { - if (!map_getmapflag(map_mapindex2mapid(member->entry_point.map), MF_NOSAVE)) + if (member->sd == sd) { + if (member->entry_point.map != 0 && !map_getmapflag(map_mapindex2mapid(member->entry_point.map), MF_NOSAVE)) pc_setpos(sd, member->entry_point.map, member->entry_point.x, member->entry_point.y, CLR_TELEPORT); else pc_setpos(sd, sd->status.save_point.map, sd->status.save_point.x, sd->status.save_point.y, CLR_TELEPORT); // Warp to save point if the entry map has no save flag.