From c9bdaf8069e3aaf55409cc7224c3a939baaf70a4 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Thu, 24 Nov 2022 11:31:31 -0800 Subject: [PATCH] fix: Fixes pre-codegen deserialiation of base quiver (#1280) --- Projects/UOContent/Items/Quivers/BaseQuiver.cs | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/Projects/UOContent/Items/Quivers/BaseQuiver.cs b/Projects/UOContent/Items/Quivers/BaseQuiver.cs index 28da55c4d..bdd311705 100644 --- a/Projects/UOContent/Items/Quivers/BaseQuiver.cs +++ b/Projects/UOContent/Items/Quivers/BaseQuiver.cs @@ -415,45 +415,43 @@ public partial class BaseQuiver : Container, ICraftable, IAosItem } } - private static bool GetSaveFlag(SaveFlag flags, SaveFlag toGet) => (flags & toGet) != 0; - private void Deserialize(IGenericReader reader, int version) { - var flags = (SaveFlag)reader.ReadEncodedInt(); + var flags = reader.ReadEncodedInt(); _attributes = new AosAttributes(this); - if (GetSaveFlag(flags, SaveFlag.Attributes)) + if ((flags & 0x1) != 0) { _attributes.Deserialize(reader); } - if (GetSaveFlag(flags, SaveFlag.LowerAmmoCost)) + if ((flags & 0x4) != 0) { _lowerAmmoCost = reader.ReadInt(); } - if (GetSaveFlag(flags, SaveFlag.WeightReduction)) + if ((flags & 0x3) != 0) { _weightReduction = reader.ReadInt(); } - if (GetSaveFlag(flags, SaveFlag.DamageIncrease)) + if ((flags & 0x80) != 0) { _damageIncrease = reader.ReadInt(); } - if (GetSaveFlag(flags, SaveFlag.Crafter)) + if ((flags & 0x10) != 0) { _crafter = reader.ReadEntity()?.RawName; } - if (GetSaveFlag(flags, SaveFlag.Quality)) + if ((flags & 0x20) != 0) { _quality = (ClothingQuality)reader.ReadInt(); } - if (GetSaveFlag(flags, SaveFlag.Capacity)) + if ((flags & 0x40) != 0) { _capacity = reader.ReadInt(); }