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

feat: Adds new decay system and SkipSerialization (#2311)

Browse source 
## Summary

- Replaces scan-based decay checking during world saves with an event-driven timer wheel scheduler
- Removes virtual property checks from serialization hot path, achieving 6-8x faster world saves

## Changes

### DecayScheduler (new):
- Timer wheel with 12 HashSet buckets (5-min intervals) + PriorityQueue for active processing
- O(1) register/unregister vs O(n) scan of all items
- Auto start/stop when items exist/empty
- Configurable tick interval with jitter to prevent system synchronization

### Item.cs:
- Added ScheduledDecayTime computed property
- Added UpdateDecayRegistration() called from SetLastMoved(), property setters, AddItem()/RemoveItem()
- Hooks in Visible, Movable, Spawner setters and Delete()

### World.cs:
- Removed _decayQueue, EnqueueForDecay(), ProcessDecay()
- ItemPersistence.Serialize() now tight loop without virtual calls

## Performance

| Metric        | Before     | After     | Improvement |
|---------------|------------|-----------|-------------|
| Items (230K)  | 245K ticks | 34K ticks | 8x faster   |
| Mobiles (43K) | 56K ticks  | 6K ticks  | 9x faster   |
| Total         | 302K ticks | 40K ticks | 7.5x faster |

## Configuration

decay.maxItemsPerTick = 250       # Items processed per tick
decay.tickInterval = 256ms        # Base processing interval
decay.bucketInterval = 5min       # Timer wheel bucket size
decay.jitterMaxMs = 25            # ±25ms tick jitter
This commit is contained in:
Kamron Batman 2026-01-08 11:43:51 -08:00 • committed by GitHub
parent c14f361de1
commit ee2cd1d18d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
27 changed files with 426 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Projects/UOContent/Engines/ConPVP/Games/BombingRun.cs
View file

@ -37,11 +37,13 @@ namespace Server.Engines.ConPVP
{
}
public override bool SkipSerialization => true;
public override string DefaultName => "da bomb";
public Mobile Thrower { get; private set; }
private Mobile FindOwner(IEntity parent)
private static Mobile FindOwner(IEntity parent)
{
if (parent is Item item)
{
@ -61,16 +63,6 @@ namespace Server.Engines.ConPVP
base.Deserialize(reader);
var version = reader.ReadInt();
switch (version)
{
case 0:
{
break;
}
}
Timer.StartTimer(Delete); // delete this after the world loads
}
public override void Serialize(IGenericWriter writer)

8
Projects/UOContent/Engines/Plants/MiscItems/GreenThorns.cs
View file

@ -703,6 +703,8 @@ public partial class GreenThornsSHTeleporter : Item
public override string DefaultName => "a hole";
public override bool SkipSerialization => true;
public static void Create(Point3D location, Map map)
{
var tele = new GreenThornsSHTeleporter();
@ -726,12 +728,6 @@ public partial class GreenThornsSHTeleporter : Item
}
}
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
private class InternalTimer : Timer
{
private readonly GreenThornsSHTeleporter _teleporter;

8
Projects/UOContent/Engines/Quests/Core/Items/HornOfRetreat.cs
View file

@ -115,6 +115,8 @@ public partial class HornOfRetreatMoongate : Moongate
public override int LabelNumber => 1049114; // Sanctuary Gate
public override bool SkipSerialization => true;
public override void BeginConfirmation(Mobile from)
{
EndConfirmation(from);
@ -132,10 +134,4 @@ public partial class HornOfRetreatMoongate : Moongate
Delete();
}
}
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
}

8
Projects/UOContent/Engines/Quests/Witch Apprentice/Mobiles/Zeefzorpul.cs
View file

@ -12,6 +12,8 @@ public partial class Zeefzorpul : BaseQuester
public override string DefaultName => "Zeefzorpul";
public override bool SkipSerialization => true;
public override void InitBody()
{
Body = 0x4A;
@ -22,10 +24,4 @@ public partial class Zeefzorpul : BaseQuester
public override void OnTalk(PlayerMobile player, bool contextMenu)
{
}
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
}

6
Projects/UOContent/Engines/Spawners/Commands/ShowSpawnerBordersCommand.cs
View file

@ -160,11 +160,7 @@ public partial class SpawnerBorder : ProjectedItem
MinimumVisible = AccessLevel.Developer;
}
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
public override bool SkipSerialization => true;
protected override bool SendEffect()
{

8
Projects/UOContent/Items/Maps/TreasureMap.cs
View file

@ -901,6 +901,8 @@ public partial class TreasureChestDirt : Item
Timer.StartTimer(TimeSpan.FromMinutes(2.0), Delete);
}
public override bool SkipSerialization => true;
public void Turn1()
{
ItemID = 0x913;
@ -910,10 +912,4 @@ public partial class TreasureChestDirt : Item
{
ItemID = 0x914;
}
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
}

8
Projects/UOContent/Items/Misc/Acid.cs
View file

@ -39,6 +39,8 @@ public partial class Acid : Item
public override string DefaultName => "a pool of acid";
public override bool SkipSerialization => true;
public override void OnDelete()
{
_timerToken.Cancel();
@ -89,10 +91,4 @@ public partial class Acid : Item
{
m.Damage(Utility.RandomMinMax(_minDamage, _maxDamage));
}
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
}

8
Projects/UOContent/Items/Misc/EffectItem.cs
View file

@ -15,6 +15,8 @@ public partial class EffectItem : Item
public override bool Decays => true;
public override bool SkipSerialization => true;
public static EffectItem Create(Point3D p, Map map, TimeSpan duration)
{
EffectItem item = null;
@ -46,12 +48,6 @@ public partial class EffectItem : Item
public void BeginFree(TimeSpan duration) => new FreeTimer(this, duration).Start();
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
private class FreeTimer : Timer
{
private EffectItem _item;

8
Projects/UOContent/Items/Misc/MoonstoneGate.cs
View file

@ -21,6 +21,8 @@ public partial class MoonstoneGate : Moongate
Effects.PlaySound(loc, map, 0x20E);
}
public override bool SkipSerialization => true;
public override void CheckGate(Mobile m, int range)
{
if (m.Kills >= 5)
@ -53,12 +55,6 @@ public partial class MoonstoneGate : Moongate
}
}
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
private class InternalTimer : Timer
{
private Item _item;

8
Projects/UOContent/Items/Skill Items/Camping/Campfire.cs
View file

@ -32,6 +32,8 @@ public partial class Campfire : Item
Timer.StartTimer(TimeSpan.FromSeconds(1.0), TimeSpan.FromSeconds(1.0), OnTick, out _timerToken);
}
public override bool SkipSerialization => true;
[CommandProperty(AccessLevel.GameMaster)]
public CampfireStatus Status
{
@ -159,12 +161,6 @@ public partial class Campfire : Item
_timerToken.Cancel();
ClearEntries();
}
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
}
public class CampfireEntry

8
Projects/UOContent/Items/Weapons/Fists.cs
View file

@ -14,6 +14,8 @@ namespace Server.Items
Quality = WeaponQuality.Regular;
}
public override bool SkipSerialization => true;
public override WeaponAbility PrimaryAbility => WeaponAbility.Disarm;
public override WeaponAbility SecondaryAbility => WeaponAbility.ParalyzingBlow;
@ -169,12 +171,6 @@ namespace Server.Items
base.PlaySwingAnimation( attacker );
}*/
[AfterDeserialization(false)]
private void OnAfterDeserialization()
{
Delete();
}
/* Wrestling moves */
private static bool CheckMove(Mobile m, SkillName other)

8
Projects/UOContent/Mobiles/AI/BaseAI/TransferItem.cs
View file

@ -34,13 +34,9 @@ internal sealed partial class TransferItem : Item
Hue = creature.Hue & 0x0FFF;
}
public static bool IsInCombat(BaseCreature creature) => creature?.Aggressors.Count > 0 || creature?.Aggressed.Count > 0;
public override bool SkipSerialization => true;
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
public static bool IsInCombat(BaseCreature creature) => creature?.Aggressors.Count > 0 || creature?.Aggressed.Count > 0;
public override void GetProperties(IPropertyList list)
{

8
Projects/UOContent/Mobiles/Monsters/AOS/Revenant.cs
View file

@ -57,6 +57,8 @@ namespace Server.Mobiles
AddItem(new Halberd { Hue = 1, Movable = false });
}
public override bool SkipSerialization => true;
public override Mobile ConstantFocus => m_Target;
public override bool NoHouseRestrictions => true;
@ -172,11 +174,5 @@ namespace Server.Mobiles
Delete();
return false;
}
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
}
}

8
Projects/UOContent/Mobiles/Monsters/Humanoid/Melee/KhaldunRevenant.cs
View file

@ -56,6 +56,8 @@ namespace Server.Mobiles
AddItem(weapon);
}
public override bool SkipSerialization => true;
public override bool DeleteCorpseOnDeath => true;
public override Mobile ConstantFocus => m_Target;
@ -149,11 +151,5 @@ namespace Server.Mobiles
base.OnDelete();
}
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
}
}

6
Projects/UOContent/Mobiles/Monsters/Mammal/Melee/VorpalBunny.cs
View file

@ -102,11 +102,7 @@ namespace Server.Mobiles
public override string DefaultName => "a mysterious rabbit hole";
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
public override bool SkipSerialization => true;
}
}
}

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

@ -3739,6 +3739,8 @@ namespace Server.Multis
Movable = false;
}
public override bool SkipSerialization => true;
public override string DefaultName => "a house transfer contract";
public override void GetProperties(IPropertyList list)
@ -3775,12 +3777,6 @@ namespace Server.Multis
}
}
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
public override bool AllowSecureTrade(Mobile from, Mobile to, Mobile newOwner, bool accepted)
{
if (!base.AllowSecureTrade(from, to, newOwner, accepted))

8
Projects/UOContent/Multis/Houses/PreviewHouse.cs
View file

@ -35,6 +35,8 @@ public partial class PreviewHouse : BaseMulti
_timer.Start();
}
public override bool SkipSerialization => true;
public override void OnLocationChange(Point3D oldLocation)
{
base.OnLocationChange(oldLocation);
@ -94,12 +96,6 @@ public partial class PreviewHouse : BaseMulti
base.OnAfterDelete();
}
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
private class DecayTimer : Timer
{
private readonly Item _item;

8
Projects/UOContent/Spells/Seventh/GateTravel.cs
View file

@ -170,6 +170,8 @@ public partial class GateTravelMoongate : Moongate
Timer.StartTimer(TimeSpan.FromSeconds(Core.T2A ? 30.0 : 10.0), Delete);
}
public override bool SkipSerialization => true;
[CommandProperty(AccessLevel.GameMaster)]
public Moongate LinkedGate { get; set; }
@ -200,10 +202,4 @@ public partial class GateTravelMoongate : Moongate
base.UseGate(m);
}
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
}

8
Projects/UOContent/Spells/Spellweaving/Mobiles/NatureFury.cs
View file

@ -36,6 +36,8 @@ public partial class NatureFury : BaseCreature
ControlSlots = 1;
}
public override bool SkipSerialization => true;
public override bool DeleteCorpseOnDeath => Core.AOS;
public override bool IsHouseSummonable => true;
@ -65,10 +67,4 @@ public partial class NatureFury : BaseCreature
Timer.StartTimer(TimeSpan.FromSeconds(7.0), DoEffects);
}
}
[AfterDeserialization(false)]
private void AfterDeserialization()
{
Delete();
}
}