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

Correct poor design in LampController constructor.

Browse source 
Iteration through World.Items.Values is expensive and unnecessary.
This commit is contained in:
mark 2009-10-22 11:33:20 +00:00
parent d91adf1abc
commit 0402061b87
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Scripts/Engines/Doom/Lamp Room/LampController.cs
View file

@ -75,27 +75,18 @@ namespace Server.Items
[CommandProperty( AccessLevel.GameMaster )]
public bool CanActive { get { return m_CanActive; } set { m_CanActive = value; } }
private bool Check()
{
foreach ( Item item in World.Items.Values )
{
if ( item is LampController && !item.Deleted && item != this )
{
return true;
}
}
return false;
}
private static LampController _Instance = null;
// Should this even be constructable?
[Constructable]
public LampController() : base( 0x1BC3 )
{
if ( Check() )
if ( _Instance != null )
{
World.Broadcast( 0x35, true, "Another Lamp's room controller exists in the world!" );
Delete();
return;
} else {
_Instance = this;
}
Visible = false;
@ -104,6 +95,12 @@ namespace Server.Items
Setup();
}
public override void Delete()
{
_Instance = null;
base.Delete();
}
public void Setup()
{
m_CanActive = true;
@ -499,6 +496,8 @@ namespace Server.Items
m_CanActive = true;
m_Box.CanSummon = true;
_Instance = this;
}
public class PoisonTimer : Timer