diff options
| author | Ujp8LfXBJ6wCPR <github@lillecarl.com> | 2020-02-08 20:29:18 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2021-12-21 15:21:39 +0100 |
| commit | 91a0fbbd7145d6fb966231689c369d641da06f9b (patch) | |
| tree | f7ca752f52b78b37fa98ad73725b123b4ca42908 /src/server/game/Garrison/Garrison.cpp | |
| parent | 94a79bac7a06aa0f931e9d651928de7eea0a8b5c (diff) | |
Use boost::optional and boost::none instead of smelly pointer (#24134)
* Remove bad pointer usage from CharacterCache
Use TrinityCore Option type instead which is intended for this purpose. (Wrapper around boost::option until C++17 bump is finalised)
* Unify codestyle regarding TC optional type
Based upon advice from @Shauren
(cherry picked from commit 76831f1f467efe4aa26a38dc58c9eab2229bce71)
Diffstat (limited to 'src/server/game/Garrison/Garrison.cpp')
| -rw-r--r-- | src/server/game/Garrison/Garrison.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Garrison/Garrison.cpp b/src/server/game/Garrison/Garrison.cpp index 1f09b37f61f..96b41bbb9a3 100644 --- a/src/server/game/Garrison/Garrison.cpp +++ b/src/server/game/Garrison/Garrison.cpp @@ -815,7 +815,7 @@ void Garrison::Plot::ClearBuildingInfo(GarrisonType garrisonType, Player* owner) plotPlaced.PlotInfo = &PacketInfo; owner->SendDirectMessage(plotPlaced.Write()); - BuildingInfo.PacketInfo = boost::none; + BuildingInfo.PacketInfo.reset(); } void Garrison::Plot::SetBuildingInfo(WorldPackets::Garrison::GarrisonBuildingInfo const& buildingInfo, Player* owner) |