diff --git a/src/server/game/Calendar/CalendarMgr.cpp b/src/server/game/Calendar/CalendarMgr.cpp index a4cb972e62..03d65fb134 100644 --- a/src/server/game/Calendar/CalendarMgr.cpp +++ b/src/server/game/Calendar/CalendarMgr.cpp @@ -441,8 +441,8 @@ void CalendarMgr::SendCalendarEventInvite(CalendarInvite const& invite) if (!calendarEvent) // Pre-invite { - if (Player* player = ObjectAccessor::FindPlayer(invite.GetSenderGUID())) - player->SendDirectMessage(&data); + if (Player* playerSender = ObjectAccessor::FindPlayer(invite.GetSenderGUID())) + playerSender->SendDirectMessage(&data); } else { diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 1c15aebbab..10b8e5ffc0 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -17537,7 +17537,6 @@ bool Player::LoadFromDB(uint32 guid, SQLQueryHolder *holder) if (!map) { - PlayerInfo const* info = sObjectMgr->GetPlayerInfo(getRace(), getClass()); mapId = info->mapId; Relocate(info->positionX, info->positionY, info->positionZ, 0.0f); map = sMapMgr->CreateMap(mapId, this);