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

feat: Adds tidy option for serialization. Codegens ballotbox. Fixes pooled timer leaking (#681)

Browse source 
* Fixes pooled timer leaking
* Fixes `[dumptimers` command so it outputs properly, adds spacing, and stacktraces
* Adds `[Tidy]` for serializing Lists. This will remove deleted entities during world save before serializing the list.
* Adds helpers for managing Lists/Sets/Dictionaries


### New API

```cs
// Creates the list if it is null, then adds
Utility.Add(ref list, value);
Utility.Add(ref set, value);
Utility.Add(ref dict, key, value);

// Nulls the variable if the count is zero
Utility.Remove(ref list, value);
Utility.Remove(ref set, value);
Utility.Remove(ref dict, key);

// Marks entity as dirty in addition to doing the action
entity.Add(list, value);
// Marks entity as dirty, and will create list if it doesn't exist
entity.Add(ref list, value);

// Marks entity as dirty in addition to doing the action
entity.Remove(list, value);
// Marks entity as dirty, and will null the list count is zero
entity.Remove(ref list, value);
```


### Updates to [dumptimers
<img width="825" alt="Screen Shot 2021-08-14 at 2 55 10 AM" src="https://user-images.githubusercontent.com/3953314/129442449-ccf7fe14-29d6-4f3f-9366-c8eb7b9828a7.png">
This commit is contained in:
Kamron Batman 2021-08-14 03:02:53 -07:00 • committed by GitHub
parent 84cbd52a2a
commit 360143478a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 627 additions and 464 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Projects/UOContent/Multis/Camps/BaseCamp.cs
View file

@ -9,7 +9,7 @@ namespace Server.Multis
{
private TimeSpan m_DecayDelay;
private DateTime m_DecayTime;
private TimerExecutionToken _decayTimerToken;
private Timer _decayTimer;
private List<Item> m_Items;
private List<Mobile> m_Mobiles;
@ -55,6 +55,12 @@ namespace Server.Multis
{
}
public override void OnDelete()
{
_decayTimer?.Stop();
_decayTimer = null;
}
public virtual void RefreshDecay(bool setDecayTime)
{
if (Deleted)
@ -67,8 +73,8 @@ namespace Server.Multis
m_DecayTime = Core.Now + DecayDelay;
}
_decayTimerToken.Cancel();
Timer.StartTimer(DecayDelay, Delete, out _decayTimerToken);
_decayTimer?.Stop();
_decayTimer = Timer.DelayCall(DecayDelay, Delete);
}
public virtual void AddItem(Item item, int xOffset, int yOffset, int zOffset)

2
Projects/UOContent/Multis/Houses/BaseHouse.cs
View file

@ -1197,7 +1197,7 @@ namespace Server.Multis
LockedDownFlag = 1;
SecureFlag = 2;
Timer.StartTimer(TimeSpan.FromMinutes(1.0), TimeSpan.FromMinutes(1.0), Decay_OnTick);
Timer.DelayCall(TimeSpan.FromMinutes(1.0), TimeSpan.FromMinutes(1.0), Decay_OnTick);
}
public virtual int GetAosCurLockdowns()