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

fix: Optimizes OPL using string interpolation (#1041)

Browse source 
## Breaking Changes (New API)
ObjectPropertyList supports the following API:
```cs
list.Add(500000);
list.Add(500001, stringArgument);
list.Add("Some text");
list.Add($"Some text with {argument}");
list.Add(500002, $"{arg1}\t{arg2}");
```

## Notes
1. All API uses that require a formatter like this:
    ```cs
    list.Add(500002, "{0}\t{1}", arg1, arg2);
    ```
    Should be changed to use string interpolation, for example:
    ```cs
    list.Add(500002, $"{arg1}\t{arg2}");
    ```
2. The following paradigm should no longer be used:
    ```cs
    list.Add(1061170, prop.ToString()); // strength requirement ~1_val~
    ```
    The new string interpolation API will avoid having to convert the argument to a string before writing it to the packet. Instead use the following:
    ```cs
    list.Add(1061170, $"{prop}"); // strength requirement ~1_val~
    ```

### Benchmarks
```cs
|                         Method |     Mean |   Error |  StdDev |  Gen 0 | Allocated |
|------------------------------- |---------:|--------:|--------:|-------:|----------:|
|                BenchmarkOldOPL | 241.0 ns | 0.56 ns | 0.47 ns | 0.0105 |      88 B |
| BenchmarkStringInterpolatedOPL | 199.9 ns | 2.44 ns | 2.39 ns |      - |         - |
```

### Changes
- [X] Removes crash in STArray.Return when array is null.
- [X] Fixes NPE in OPL when entity is null. Serial in packet will be 0 when entity is null.
- [X] Fixes NPE in AosAttributes when Parent is null.
- [X] Changes OPL to use string interpolation.
- [X] Introduces `IPropertyList` to allow extending PropertyList for other uses.
This commit is contained in:
Kamron Batman 2022-06-02 10:09:53 -07:00 • committed by GitHub
parent fe31470f05
commit ecbee17690
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
227 changed files with 1426 additions and 1008 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Projects/UOContent/Items/Wands/BaseWand.cs
View file

@ -123,44 +123,44 @@ namespace Server.Items
_charges = reader.ReadInt();
}
public override void GetProperties(ObjectPropertyList list)
public override void GetProperties(IPropertyList list)
{
base.GetProperties(list);
switch (_wandEffect)
{
case WandEffect.Clumsiness:
list.Add(1017326, _charges.ToString());
list.Add(1017326, $"{_charges}");
break; // clumsiness charges: ~1_val~
case WandEffect.Identification:
list.Add(1017350, _charges.ToString());
list.Add(1017350, $"{_charges}");
break; // identification charges: ~1_val~
case WandEffect.Healing:
list.Add(1017329, _charges.ToString());
list.Add(1017329, $"{_charges}");
break; // healing charges: ~1_val~
case WandEffect.Feeblemindedness:
list.Add(1017327, _charges.ToString());
list.Add(1017327, $"{_charges}");
break; // feeblemind charges: ~1_val~
case WandEffect.Weakness:
list.Add(1017328, _charges.ToString());
list.Add(1017328, $"{_charges}");
break; // weakness charges: ~1_val~
case WandEffect.MagicArrow:
list.Add(1060492, _charges.ToString());
list.Add(1060492, $"{_charges}");
break; // magic arrow charges: ~1_val~
case WandEffect.Harming:
list.Add(1017334, _charges.ToString());
list.Add(1017334, $"{_charges}");
break; // harm charges: ~1_val~
case WandEffect.Fireball:
list.Add(1060487, _charges.ToString());
list.Add(1060487, $"{_charges}");
break; // fireball charges: ~1_val~
case WandEffect.GreaterHealing:
list.Add(1017330, _charges.ToString());
list.Add(1017330, $"{_charges}");
break; // greater healing charges: ~1_val~
case WandEffect.Lightning:
list.Add(1060491, _charges.ToString());
list.Add(1060491, $"{_charges}");
break; // lightning charges: ~1_val~
case WandEffect.ManaDraining:
list.Add(1017339, _charges.ToString());
list.Add(1017339, $"{_charges}");
break; // mana drain charges: ~1_val~
}
}