warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Fixes default values from serialization for basearmor (#1167)

Browse source
This commit is contained in:
Kamron Batman 2022-09-07 19:45:11 -07:00 • committed by GitHub
parent b44c69bcee
commit 2c294b463c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Projects/UOContent/Items/Armor/BaseArmor.cs
View file

@ -102,6 +102,9 @@ namespace Server.Items
[SerializableFieldSaveFlag(10)] [SerializableFieldSaveFlag(10)]
private bool ShouldSerializeCrafter() => _crafter != null; private bool ShouldSerializeCrafter() => _crafter != null;
// Field 11
private ArmorQuality _quality = ArmorQuality.Regular;
[SerializableFieldSaveFlag(14)] [SerializableFieldSaveFlag(14)]
private bool ShouldSerializeResource() => _resource != DefaultResource; private bool ShouldSerializeResource() => _resource != DefaultResource;
@ -190,19 +193,13 @@ namespace Server.Items
public virtual int OldDexReq => 0; public virtual int OldDexReq => 0;
public virtual int OldIntReq => 0; public virtual int OldIntReq => 0;
[SerializableProperty(11)] [SerializableProperty(11, useField: nameof(_quality))]
[CommandProperty(AccessLevel.GameMaster)] [CommandProperty(AccessLevel.GameMaster)]
public ArmorQuality Quality public ArmorQuality Quality
{ {
get => _quality; get => _quality;
set set
{ {
if (World.Loading)
{
_quality = value;
return;
}
UnscaleDurability(); UnscaleDurability();
_quality = value; _quality = value;
ScaleDurability(); ScaleDurability();
@ -219,12 +216,6 @@ namespace Server.Items
get => _durability; get => _durability;
set set
{ {
if (World.Loading)
{
_durability = value;
return;
}
UnscaleDurability(); UnscaleDurability();
_durability = value; _durability = value;
ScaleDurability(); ScaleDurability();