diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 1 | ||||
| -rw-r--r-- | src/server/game/Maps/Map.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index c0dc3695161..c4134b4f3b5 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -16476,6 +16476,7 @@ void Player::RemoveRewardedQuest(uint32 questId, bool update /*= true*/) // Remove seasonal quest also Quest const* qInfo = sObjectMgr->GetQuestTemplate(questId); + ASSERT(qInfo); if (qInfo->IsSeasonal()) { uint16 eventId = qInfo->GetEventIdForQuest(); diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 5bee032d2c2..8b2e2cab53e 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -2943,8 +2943,10 @@ void Map::GetFullTerrainStatusForPosition(PhaseShift const& phaseShift, float x, if (vmapData.areaInfo) data.areaInfo = boost::in_place(vmapData.areaInfo->adtId, vmapData.areaInfo->rootId, vmapData.areaInfo->groupId, vmapData.areaInfo->mogpFlags); + float mapHeight = VMAP_INVALID_HEIGHT; GridMap* gmap = GetGrid(terrainMapId, x, y); - float mapHeight = gmap->getHeight(x, y); + if (gmap) + mapHeight = gmap->getHeight(x, y); // area lookup AreaTableEntry const* areaEntry = nullptr; |