diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-01-23 20:31:52 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-01-23 20:31:52 +0100 |
| commit | 596bf2b77218e6b959c1bf7de848c6f09d5a91f0 (patch) | |
| tree | a129c1cf5e01ce8ba04d70348a01790b14105bf2 /src/server/game/Garrison/Garrison.cpp | |
| parent | 770fbcca0cae18faac981a326d73996afc20b9ba (diff) | |
Core/Misc: Replace boost::optional with std::optional part 2
Diffstat (limited to 'src/server/game/Garrison/Garrison.cpp')
| -rw-r--r-- | src/server/game/Garrison/Garrison.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Garrison/Garrison.cpp b/src/server/game/Garrison/Garrison.cpp index 96b41bbb9a3..6f0ee01d924 100644 --- a/src/server/game/Garrison/Garrison.cpp +++ b/src/server/game/Garrison/Garrison.cpp @@ -77,7 +77,7 @@ bool Garrison::LoadFromDB(PreparedQueryResult garrison, PreparedQueryResult blue if (!sGarrBuildingStore.LookupEntry(buildingId)) continue; - plot->BuildingInfo.PacketInfo = boost::in_place(); + plot->BuildingInfo.PacketInfo.emplace(); plot->BuildingInfo.PacketInfo->GarrPlotInstanceID = plotInstanceId; plot->BuildingInfo.PacketInfo->GarrBuildingID = buildingId; plot->BuildingInfo.PacketInfo->TimeBuilt = timeBuilt; @@ -558,7 +558,7 @@ void Garrison::SendInfo() Plot& plot = p.second; garrison.Plots.push_back(&plot.PacketInfo); if (plot.BuildingInfo.PacketInfo) - garrison.Buildings.push_back(plot.BuildingInfo.PacketInfo.get_ptr()); + garrison.Buildings.push_back(&*plot.BuildingInfo.PacketInfo); } for (auto const& p : _followers) |