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

23
Projects/UOContent/Items/Containers/FillableContainers.cs
View file

@ -9,7 +9,7 @@ namespace Server.Items
protected FillableContent m_Content;
protected DateTime m_NextRespawnTime;
protected TimerExecutionToken _respawnTimerToken;
protected Timer _respawnTimer;
public FillableContainer(int itemID) : base(itemID) => Movable = false;
@ -96,7 +96,8 @@ namespace Server.Items
{
base.OnAfterDelete();
_respawnTimerToken.Cancel();
_respawnTimer?.Stop();
_respawnTimer = null;
}
public int GetItemsCount()
@ -118,24 +119,26 @@ namespace Server.Items
if (canSpawn)
{
if (!_respawnTimerToken.Running)
if (_respawnTimer?.Running != true)
{
var mins = Utility.RandomMinMax(MinRespawnMinutes, MaxRespawnMinutes);
var delay = TimeSpan.FromMinutes(mins);
m_NextRespawnTime = Core.Now + delay;
Timer.StartTimer(delay, Respawn, out _respawnTimerToken);
_respawnTimer = Timer.DelayCall(delay, Respawn);
}
}
else if (_respawnTimerToken.Running)
else
{
_respawnTimerToken.Cancel();
_respawnTimer?.Stop();
_respawnTimer = null;
}
}
public void Respawn()
{
_respawnTimerToken.Cancel();
_respawnTimer?.Stop();
_respawnTimer = null;
if (m_Content == null || Deleted)
{
@ -217,7 +220,7 @@ namespace Server.Items
{
var subItem = list[j];
if (!(subItem is Container) && subItem.StackWith(null, item, false))
if (subItem is not Container && subItem.StackWith(null, item, false))
{
break;
}
@ -238,7 +241,7 @@ namespace Server.Items
writer.Write((int)ContentType);
if (_respawnTimerToken.Running)
if (_respawnTimer?.Running == true)
{
writer.Write(true);
writer.WriteDeltaTime(m_NextRespawnTime);
@ -269,7 +272,7 @@ namespace Server.Items
m_NextRespawnTime = reader.ReadDeltaTime();
var delay = m_NextRespawnTime - Core.Now;
Timer.StartTimer(delay, Respawn, out _respawnTimerToken);
Timer.DelayCall(delay, Respawn);
}
else
{