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

#W# Fix: Fixed issue with Overworld/Citizen spawners not deleting already spawn npc.

Browse source
This commit is contained in:
WarrentyExpired 2026-11-05 14:12:04 -05:00
parent 12a36c6896
commit 4161927c27
2 changed files with 72 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

39
Projects/UOContent/Engines/Spawners/DynamicSpawner/OverworldRef.cs
View file

@ -27,9 +27,30 @@ namespace Server.Items
public void Respawn()
{
// Proxy spawners do not handle their own respawns.
// When the monster dies, the proxy deletes itself,
// and the parent Master Spawner drops a new proxy.
// Store and clear reference first to avoid deletion loop
Mobile m = _trackedMobile;
_trackedMobile = null;
if (m != null && !m.Deleted)
{
m.Delete();
}
ExecuteSpawn();
}
public override void OnDelete()
{
// Store and clear reference first to avoid deletion loop
Mobile m = _trackedMobile;
_trackedMobile = null;
if (m != null && !m.Deleted)
{
m.Delete();
}
base.OnDelete();
}
public bool IsInSpawnBounds(Point3D loc)
@ -39,8 +60,12 @@ namespace Server.Items
public void Remove(ISpawnable spawn)
{
_trackedMobile = null;
if (!Deleted)
{
Delete();
}
}
public BaseProxySpawner() : base(0x6519)
@ -101,6 +126,14 @@ namespace Server.Items
return;
}
// Clean up existing mobile safely if one exists
Mobile existing = _trackedMobile;
_trackedMobile = null;
if (existing != null && !existing.Deleted)
{
existing.Delete();
}
_trackedMobile = SpawnList.RandomSpawn(this, savedLocation, savedMap);
if (_trackedMobile != null)