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

Fixes FindItemsByType and FindItemByType and new override of IsLockedDown and IsSecure by renaming their methods.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 15:50:35 -07:00
parent 7321fa1b63
commit a48ebb3a5f
50 changed files with 416 additions and 643 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Items/Misc/InteriorDecorator.cs
View file

@ -212,7 +212,7 @@ namespace Server.Items
{
from.SendLocalizedMessage(1042270); // That is not in your house.
}
else if (!house.IsLockedDown(item) && !house.IsSecure(item) && !isDecorableComponent)
else if (!house.HasLockedDownItem(item) && !house.HasSecureItem(item) && !isDecorableComponent)
{
if (item is AddonComponent && m_Decorator.Command == DecorateCommand.Up)
from.SendLocalizedMessage(1042274); // You cannot raise it up any higher.

8
Scripts/Items/Misc/PlayerBulletinBoards.cs
View file

@ -168,7 +168,7 @@ namespace Server.Items
{
BaseHouse house = BaseHouse.FindHouseAt( this );
if ( house == null || !house.IsLockedDown( this ) )
if ( house == null || !house.HasLockedDownItem( this ) )
from.SendLocalizedMessage( 1062396 ); // This bulletin board must be locked down in a house to be usable.
else if ( !from.InRange( GetWorldLocation(), 2 ) || !from.InLOS( this ) )
from.LocalOverheadMessage( MessageType.Regular, 0x3B2, 1019045 ); // I can't reach that.
@ -202,7 +202,7 @@ namespace Server.Items
BaseHouse house = m_House;
BasePlayerBB board = m_Board;
if ( house == null || !house.IsLockedDown( board ) )
if ( house == null || !house.HasLockedDownItem( board ) )
{
from.SendLocalizedMessage( 1062396 ); // This bulletin board must be locked down in a house to be usable.
return;
@ -278,7 +278,7 @@ namespace Server.Items
BaseHouse house = m_House;
BasePlayerBB board = m_Board;
if ( house == null || !house.IsLockedDown( board ) )
if ( house == null || !house.HasLockedDownItem( board ) )
{
from.SendLocalizedMessage( 1062396 ); // This bulletin board must be locked down in a house to be usable.
return;
@ -369,7 +369,7 @@ namespace Server.Items
BaseHouse house = m_House;
BasePlayerBB board = m_Board;
if ( house == null || !house.IsLockedDown( board ) )
if ( house == null || !house.HasLockedDownItem( board ) )
{
from.SendLocalizedMessage( 1062396 ); // This bulletin board must be locked down in a house to be usable.
return;

3
Scripts/Items/Misc/Teleporter.cs
View file

@ -1067,8 +1067,7 @@ namespace Server.Items
}
if (GetFlag(ConditionFlag.DenyPackEthereals) &&
(pack.FindItemByType(typeof(EtherealMount)) != null ||
pack.FindItemByType(typeof(BaseImprisonedMobile)) != null))
pack.FindItemByType(new []{typeof(EtherealMount), typeof(BaseImprisonedMobile)}) != null)
{
m.SendMessage("You must empty your backpack of ethereal mounts before proceeding.");
return false;