Fixes code according to modern code style. Fixes a few expression bugs.
This commit is contained in:
Kamron Batman
parent
89eea25e5f
commit
970fd563b2
3324 changed files with 441118 additions and 433755 deletions
|
|
@ -1,163 +1,169 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Server.Items;
|
||||
using Server.Multis;
|
||||
using Server.Mobiles;
|
||||
using Server.Multis;
|
||||
|
||||
namespace Server.Misc
|
||||
{
|
||||
public class Cleanup
|
||||
{
|
||||
public static void Initialize()
|
||||
{
|
||||
Timer.DelayCall( TimeSpan.FromSeconds( 2.5 ), Run );
|
||||
}
|
||||
public class Cleanup
|
||||
{
|
||||
public static void Initialize()
|
||||
{
|
||||
Timer.DelayCall(TimeSpan.FromSeconds(2.5), Run);
|
||||
}
|
||||
|
||||
public static void Run()
|
||||
{
|
||||
List<Item> items = new List<Item>();
|
||||
List<Item> validItems = new List<Item>();
|
||||
List<Mobile> hairCleanup = new List<Mobile>();
|
||||
public static void Run()
|
||||
{
|
||||
List<Item> items = new List<Item>();
|
||||
List<Item> validItems = new List<Item>();
|
||||
List<Mobile> hairCleanup = new List<Mobile>();
|
||||
|
||||
int boxes = 0;
|
||||
int boxes = 0;
|
||||
|
||||
foreach ( Item item in World.Items.Values )
|
||||
{
|
||||
if ( item.Map == null )
|
||||
{
|
||||
items.Add( item );
|
||||
continue;
|
||||
}
|
||||
if ( item is CommodityDeed deed )
|
||||
{
|
||||
if ( deed.Commodity != null )
|
||||
validItems.Add( deed.Commodity );
|
||||
foreach (Item item in World.Items.Values)
|
||||
{
|
||||
if (item.Map == null)
|
||||
{
|
||||
items.Add(item);
|
||||
continue;
|
||||
}
|
||||
|
||||
continue;
|
||||
}
|
||||
if ( item is BaseHouse house )
|
||||
{
|
||||
foreach ( RelocatedEntity relEntity in house.RelocatedEntities )
|
||||
{
|
||||
if ( relEntity.Entity is Item item1 )
|
||||
validItems.Add( item1 );
|
||||
}
|
||||
if (item is CommodityDeed deed)
|
||||
{
|
||||
if (deed.Commodity != null)
|
||||
validItems.Add(deed.Commodity);
|
||||
|
||||
foreach ( VendorInventory inventory in house.VendorInventories )
|
||||
{
|
||||
foreach ( Item subItem in inventory.Items )
|
||||
validItems.Add( subItem );
|
||||
}
|
||||
}
|
||||
else if ( item is BankBox box )
|
||||
{
|
||||
Mobile owner = box.Owner;
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( owner == null )
|
||||
{
|
||||
items.Add( box );
|
||||
++boxes;
|
||||
}
|
||||
else if ( box.Items.Count == 0 )
|
||||
{
|
||||
items.Add( box );
|
||||
++boxes;
|
||||
}
|
||||
if (item is BaseHouse house)
|
||||
{
|
||||
foreach (RelocatedEntity relEntity in house.RelocatedEntities)
|
||||
if (relEntity.Entity is Item item1)
|
||||
validItems.Add(item1);
|
||||
|
||||
continue;
|
||||
}
|
||||
else if ( (item.Layer == Layer.Hair || item.Layer == Layer.FacialHair) )
|
||||
{
|
||||
object rootParent = item.RootParent;
|
||||
foreach (VendorInventory inventory in house.VendorInventories)
|
||||
foreach (Item subItem in inventory.Items)
|
||||
validItems.Add(subItem);
|
||||
}
|
||||
else if (item is BankBox box)
|
||||
{
|
||||
Mobile owner = box.Owner;
|
||||
|
||||
if ( rootParent is Mobile rootMobile )
|
||||
{
|
||||
if ( item.Parent != rootMobile && rootMobile.AccessLevel == AccessLevel.Player )
|
||||
{
|
||||
items.Add( item );
|
||||
continue;
|
||||
}
|
||||
if ( item.Parent == rootMobile )
|
||||
{
|
||||
hairCleanup.Add( rootMobile );
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (owner == null)
|
||||
{
|
||||
items.Add(box);
|
||||
++boxes;
|
||||
}
|
||||
else if (box.Items.Count == 0)
|
||||
{
|
||||
items.Add(box);
|
||||
++boxes;
|
||||
}
|
||||
|
||||
if ( item.Parent != null || item.Map != Map.Internal || item.HeldBy != null )
|
||||
continue;
|
||||
continue;
|
||||
}
|
||||
else if (item.Layer == Layer.Hair || item.Layer == Layer.FacialHair)
|
||||
{
|
||||
object rootParent = item.RootParent;
|
||||
|
||||
if ( item.Location != Point3D.Zero )
|
||||
continue;
|
||||
if (rootParent is Mobile rootMobile)
|
||||
{
|
||||
if (item.Parent != rootMobile && rootMobile.AccessLevel == AccessLevel.Player)
|
||||
{
|
||||
items.Add(item);
|
||||
continue;
|
||||
}
|
||||
|
||||
if ( !IsBuggable( item ) )
|
||||
continue;
|
||||
if (item.Parent == rootMobile)
|
||||
{
|
||||
hairCleanup.Add(rootMobile);
|
||||
continue;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
items.Add( item );
|
||||
}
|
||||
if (item.Parent != null || item.Map != Map.Internal || item.HeldBy != null)
|
||||
continue;
|
||||
|
||||
for ( int i = 0; i < validItems.Count; ++i )
|
||||
items.Remove( validItems[i] );
|
||||
if (item.Location != Point3D.Zero)
|
||||
continue;
|
||||
|
||||
if ( items.Count > 0 )
|
||||
{
|
||||
if ( boxes > 0 )
|
||||
Console.WriteLine( "Cleanup: Detected {0} inaccessible items, including {1} bank boxes, removing..", items.Count, boxes );
|
||||
else
|
||||
Console.WriteLine( "Cleanup: Detected {0} inaccessible items, removing..", items.Count );
|
||||
if (!IsBuggable(item))
|
||||
continue;
|
||||
|
||||
for ( int i = 0; i < items.Count; ++i )
|
||||
items[i].Delete();
|
||||
}
|
||||
items.Add(item);
|
||||
}
|
||||
|
||||
if ( hairCleanup.Count > 0 )
|
||||
{
|
||||
Console.WriteLine( "Cleanup: Detected {0} hair and facial hair items being worn, converting to their virtual counterparts..", hairCleanup.Count );
|
||||
for (int i = 0; i < validItems.Count; ++i)
|
||||
items.Remove(validItems[i]);
|
||||
|
||||
for ( int i = 0; i < hairCleanup.Count; i++ )
|
||||
hairCleanup[i].ConvertHair();
|
||||
}
|
||||
}
|
||||
if (items.Count > 0)
|
||||
{
|
||||
if (boxes > 0)
|
||||
Console.WriteLine("Cleanup: Detected {0} inaccessible items, including {1} bank boxes, removing..",
|
||||
items.Count, boxes);
|
||||
else
|
||||
Console.WriteLine("Cleanup: Detected {0} inaccessible items, removing..", items.Count);
|
||||
|
||||
public static bool IsBuggable( Item item )
|
||||
{
|
||||
if ( item is Fists )
|
||||
return false;
|
||||
for (int i = 0; i < items.Count; ++i)
|
||||
items[i].Delete();
|
||||
}
|
||||
|
||||
if ( item is ICommodity || item is BaseBoat
|
||||
|| item is Fish || item is BigFish
|
||||
|| item is BasePotion || item is Food || item is CookableFood
|
||||
|| item is SpecialFishingNet || item is BaseMagicFish
|
||||
|| item is Shoes || item is Sandals
|
||||
|| item is Boots || item is ThighBoots
|
||||
|| item is TreasureMap || item is MessageInABottle
|
||||
|| item is BaseArmor || item is BaseWeapon
|
||||
|| item is BaseClothing
|
||||
|| ( item is BaseJewel && Core.AOS )
|
||||
|| ( item is BasePotion && Core.ML )
|
||||
#region Champion artifacts
|
||||
|| item is SkullPole
|
||||
|| item is EvilIdolSkull
|
||||
|| item is MonsterStatuette
|
||||
|| item is Pier
|
||||
|| item is ArtifactLargeVase
|
||||
|| item is ArtifactVase
|
||||
|| item is MinotaurStatueDeed
|
||||
|| item is SwampTile
|
||||
|| item is WallBlood
|
||||
|| item is TatteredAncientMummyWrapping
|
||||
|| item is LavaTile
|
||||
|| item is DemonSkull
|
||||
|| item is Web
|
||||
|| item is WaterTile
|
||||
|| item is WindSpirit
|
||||
|| item is DirtPatch
|
||||
|| item is Futon )
|
||||
#endregion
|
||||
return true;
|
||||
if (hairCleanup.Count > 0)
|
||||
{
|
||||
Console.WriteLine(
|
||||
"Cleanup: Detected {0} hair and facial hair items being worn, converting to their virtual counterparts..",
|
||||
hairCleanup.Count);
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
for (int i = 0; i < hairCleanup.Count; i++)
|
||||
hairCleanup[i].ConvertHair();
|
||||
}
|
||||
}
|
||||
|
||||
public static bool IsBuggable(Item item)
|
||||
{
|
||||
if (item is Fists)
|
||||
return false;
|
||||
|
||||
if (item is ICommodity || item is BaseBoat
|
||||
|| item is Fish || item is BigFish
|
||||
|| item is BasePotion || item is Food || item is CookableFood
|
||||
|| item is SpecialFishingNet || item is BaseMagicFish
|
||||
|| item is Shoes || item is Sandals
|
||||
|| item is Boots || item is ThighBoots
|
||||
|| item is TreasureMap || item is MessageInABottle
|
||||
|| item is BaseArmor || item is BaseWeapon
|
||||
|| item is BaseClothing
|
||||
|| item is BaseJewel && Core.AOS
|
||||
|| item is BasePotion && Core.ML
|
||||
|
||||
#region Champion artifacts
|
||||
|
||||
|| item is SkullPole
|
||||
|| item is EvilIdolSkull
|
||||
|| item is MonsterStatuette
|
||||
|| item is Pier
|
||||
|| item is ArtifactLargeVase
|
||||
|| item is ArtifactVase
|
||||
|| item is MinotaurStatueDeed
|
||||
|| item is SwampTile
|
||||
|| item is WallBlood
|
||||
|| item is TatteredAncientMummyWrapping
|
||||
|| item is LavaTile
|
||||
|| item is DemonSkull
|
||||
|| item is Web
|
||||
|| item is WaterTile
|
||||
|| item is WindSpirit
|
||||
|| item is DirtPatch
|
||||
|| item is Futon)
|
||||
|
||||
#endregion
|
||||
|
||||
return true;
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue