From 596bf2b77218e6b959c1bf7de848c6f09d5a91f0 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Sun, 23 Jan 2022 20:31:52 +0100
Subject: Core/Misc: Replace boost::optional with std::optional part 2

---
 src/server/game/Entities/Object/Updates/UpdateField.h    | 10 +++++-----
 src/server/game/Entities/Object/Updates/UpdateFields.cpp |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/server/game/Entities/Object')

diff --git a/src/server/game/Entities/Object/Updates/UpdateField.h b/src/server/game/Entities/Object/Updates/UpdateField.h
index e0129556486..edb07858d30 100644
--- a/src/server/game/Entities/Object/Updates/UpdateField.h
+++ b/src/server/game/Entities/Object/Updates/UpdateField.h
@@ -238,7 +238,7 @@ namespace UF
     private:
         void RemoveValue()
         {
-            if (_field.is_initialized())
+            if (_field.has_value())
                 _field.DestroyValue();
         }
 
@@ -329,7 +329,7 @@ namespace UF
             std::conditional_t<PublicSet, UpdateFieldPublicSetter<V>, UpdateFieldSetter<V>>>>>
             ModifyValue(OptionalUpdateField<V, BlockBit, Bit>(T::* field), uint32 /*dummy*/)
         {
-            if (!(_value.*field).is_initialized())
+            if (!(_value.*field).has_value())
                 (_value.*field).ConstructValue();
 
             _value._changesMask.Set(BlockBit);
@@ -433,7 +433,7 @@ namespace UF
             std::conditional_t<PublicSet, UpdateFieldPublicSetter<value_type>, UpdateFieldSetter<value_type>>>>>
             ModifyValue(uint32 /*dummy*/)
         {
-            if (!_value.is_initialized())
+            if (!_value.has_value())
                 _value.ConstructValue();
 
             return { *(_value._value) };
@@ -639,7 +639,7 @@ namespace UF
         template<typename T, uint32 BlockBit, uint32 Bit>
         void ClearChangesMask(OptionalUpdateField<T, BlockBit, Bit>& field, std::true_type)
         {
-            if (field.is_initialized())
+            if (field.has_value())
                 field._value->ClearChangesMask();
         }
 
@@ -905,7 +905,7 @@ namespace UF
             DestroyValue();
         }
 
-        bool is_initialized() const
+        bool has_value() const
         {
             return !!_value;
         }
diff --git a/src/server/game/Entities/Object/Updates/UpdateFields.cpp b/src/server/game/Entities/Object/Updates/UpdateFields.cpp
index bbff91bd710..230216889ad 100644
--- a/src/server/game/Entities/Object/Updates/UpdateFields.cpp
+++ b/src/server/game/Entities/Object/Updates/UpdateFields.cpp
@@ -3181,9 +3181,9 @@ void ActivePlayerData::WriteCreate(ByteBuffer& data, EnumFlag<UpdateFieldFlag> f
     data.WriteBit(BankAutoSortDisabled);
     data.WriteBit(SortBagsRightToLeft);
     data.WriteBit(InsertItemsLeftToRight);
-    data.WriteBits(QuestSession.is_initialized(), 1);
+    data.WriteBits(QuestSession.has_value(), 1);
     Field_1410->WriteCreate(data, owner, receiver);
-    if (QuestSession.is_initialized())
+    if (QuestSession.has_value())
     {
         QuestSession->WriteCreate(data, owner, receiver);
     }
@@ -3949,14 +3949,14 @@ void ActivePlayerData::WriteUpdate(ByteBuffer& data, Mask const& changesMask, bo
     }
     if (changesMask[98])
     {
-        data.WriteBits(QuestSession.is_initialized(), 1);
+        data.WriteBits(QuestSession.has_value(), 1);
         if (changesMask[106])
         {
             Field_1410->WriteUpdate(data, ignoreNestedChangesMask, owner, receiver);
         }
         if (changesMask[105])
         {
-            if (QuestSession.is_initialized())
+            if (QuestSession.has_value())
             {
                 QuestSession->WriteUpdate(data, ignoreNestedChangesMask, owner, receiver);
             }
-- 
cgit v1.2.3