Remove custom OptionalType and use the default c# nullable type.

2022-03-01 17:27:56 -05:00
parent cc08afe269
commit c14f1eb3dc
89 changed files with 924 additions and 976 deletions
@@ -441,11 +441,11 @@ namespace Game.Networking.Packets
            data.WriteUInt32(FollowerXP);
            data.WriteUInt32(GarrMssnBonusAbilityID);
            data.WriteInt32(ItemFileDataID);
-            data.WriteBit(ItemInstance.HasValue);
+            data.WriteBit(ItemInstance != null);
            data.FlushBits();

-            if (ItemInstance.HasValue)
-                ItemInstance.Value.Write(data);
+            if (ItemInstance != null)
+                ItemInstance.Write(data);
        }

        public int ItemID;
@@ -455,7 +455,7 @@ namespace Game.Networking.Packets
        public uint FollowerXP;
        public uint GarrMssnBonusAbilityID;
        public int ItemFileDataID;
-        public Optional<ItemInstance> ItemInstance;
+        public ItemInstance ItemInstance;
    }

    struct GarrisonMissionBonusAbility
@@ -501,7 +501,7 @@ namespace Game.Networking.Packets
        public int Rank;
        public long ResearchStartTime;
        public int Flags;
-        public Optional<GarrisonTalentSocketData> Socket;
+        public GarrisonTalentSocketData? Socket;
    }

    struct GarrisonCollectionEntry