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

fix: Changes Map.Sector.Items to link list. (#1547)

Browse source 
### Summary

Eliminates `IPooledEnumerable<T>` and `eable.Free()` from `Map` for items. This drastically simplifies code that iterates in range, for example:

```cs
foreach (var item in m.GetItemsInRange(5))
{
}
```
The code above no longer requires an eable and calling `Free()`.
This commit is contained in:
Kamron Batman 2023-10-16 20:51:02 -07:00 • committed by GitHub
parent 1330c4a830
commit 24858f3989
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
42 changed files with 577 additions and 419 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Projects/UOContent/Engines/ML Quests/MLQuest.cs
View file

@ -1,6 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.Collections;
using Server.Engines.MLQuests.Gumps;
using Server.Engines.MLQuests.Objectives;
using Server.Engines.MLQuests.Rewards;
@ -266,25 +266,39 @@ namespace Server.Engines.MLQuests
{
var name = $"MLQS-{GetType().Name}";
var toDelete = map.GetItemsInRange(loc, 0).Where(item => item is BaseSpawner && item.Name == name);
foreach (var item in toDelete)
using var queue = PooledRefQueue<Item>.Create();
foreach (var item in map.GetItemsInRange(loc, 0))
{
item.Delete();
// This predates GUIDs. Let's build these spawners and export them so we can delete this code!
if (item is BaseSpawner spawner && spawner.Name == name)
{
queue.Enqueue(item);
}
}
while (queue.Count > 0)
{
queue.Dequeue().Delete();
}
s.Name = name;
s.MoveToWorld(loc, map);
}
public void PutDeco(Item deco, Point3D loc, Map map)
public static void PutDeco(Item deco, Point3D loc, Map map)
{
// Auto cleanup on regeneration
var toDelete = map.GetItemsInRange(loc, 0).Where(item => item.ItemID == deco.ItemID && item.Z == loc.Z);
foreach (var item in toDelete)
using var queue = PooledRefQueue<Item>.Create();
foreach (var item in map.GetItemsInRange(loc, 0))
{
item.Delete();
if (item.ItemID == deco.ItemID && item.Z == loc.Z)
{
queue.Enqueue(item);
}
}
while (queue.Count > 0)
{
queue.Dequeue().Delete();
}
deco.MoveToWorld(loc, map);