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

Browse source
This commit is contained in:
mark 2009-02-19 08:27:47 +00:00
parent e17e4c9304
commit 49b5e96850
9 changed files with 52 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Scripts/Multis/BaseHouse.cs
View file

@ -2833,20 +2833,6 @@ namespace Server.Multis
public override void OnDelete()
{
/*Map map = this.Map;
if ( map != null )
{
MultiComponentList mcl = Components;
IPooledEnumerable eable = map.GetItemsInBounds( new Rectangle2D( X + mcl.Min.X, Y + mcl.Min.Y, mcl.Width, mcl.Height ) );
foreach ( Item item in eable )
if ( item is Guildstone && Contains( item ) )
item.Delete();
eable.Free();
}*/
RestoreRelocatedEntities();
new FixColumnTimer( this ).Start();

40
Scripts/Multis/HousePlacement.cs
View file

@ -2,7 +2,11 @@ using System;
using System.Collections;
using System.Collections.Generic;
using Server;
using Server.Guilds;
using Server.Items;
using Server.Misc;
using Server.Regions;
using Server.Spells;
namespace Server.Multis
{
@ -56,8 +60,8 @@ namespace Server.Multis
if ( from.AccessLevel >= AccessLevel.GameMaster )
return HousePlacementResult.Valid; // Staff can place anywhere
if ( map == Map.Ilshenar )
return HousePlacementResult.BadRegion; // No houses in Ilshenar
if ( map == Map.Ilshenar || SpellHelper.IsFeluccaT2A( map, center ) )
return HousePlacementResult.BadRegion; // No houses in Ilshenar/T2A
NoHousingRegion noHousingRegion = (NoHousingRegion) Region.Find( center, map ).GetRegion( typeof( NoHousingRegion ) );
@ -319,9 +323,36 @@ namespace Server.Multis
}
}
List<Sector> _sectors = new List<Sector>();
List<BaseHouse> _houses = new List<BaseHouse>();
for ( int i = 0; i < yard.Count; i++ ) {
Sector sector = map.GetSector( yard[i] );
if ( !_sectors.Contains( sector ) ) {
_sectors.Add( sector );
if ( sector.Multis != null ) {
for ( int j = 0; j < sector.Multis.Count; j++ ) {
if ( sector.Multis[j] is BaseHouse ) {
BaseHouse _house = (BaseHouse)sector.Multis[j];
if ( !_houses.Contains( _house ) ) {
_houses.Add( _house );
}
}
}
}
}
}
for ( int i = 0; i < yard.Count; ++i )
{
Point2D yardPoint = yard[i];
foreach ( BaseHouse b in _houses ) {
if ( b.Contains( yard[i] ) )
return HousePlacementResult.BadStatic; // Broke rule #3
}
/*Point2D yardPoint = yard[i];
IPooledEnumerable eable = map.GetMultiTilesAt( yardPoint.X, yardPoint.Y );
@ -337,11 +368,10 @@ namespace Server.Multis
}
}
eable.Free();
eable.Free();*/
}
return HousePlacementResult.Valid;
}
}
}