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

Browse source
This commit is contained in:
mark 2007-12-17 20:41:34 +00:00
parent 7ad00dceac
commit 0b4c3b15d9
41 changed files with 976 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Scripts/Items/Misc/Corpses/Corpse.cs
View file

@ -568,7 +568,7 @@ namespace Server.Items
return false;
if ( item != this )
return CanLoot( from );
return CanLoot( from, item );
return true;
}
@ -578,7 +578,7 @@ namespace Server.Items
if ( !base.CheckLift( from, item, ref reject ) )
return false;
return CanLoot( from );
return CanLoot( from,item );
}
public override void OnItemUsed( Mobile from, Item item )
@ -664,7 +664,7 @@ namespace Server.Items
m_RestoreTable = null;
}
public bool CanLoot( Mobile from )
public bool CanLoot( Mobile from, Item item )
{
if ( !IsCriminalAction( from ) )
return true;
@ -677,9 +677,9 @@ namespace Server.Items
return true;
}
public bool CheckLoot( Mobile from )
public bool CheckLoot( Mobile from, Item item )
{
if ( !CanLoot( from ) )
if ( !CanLoot( from, item ) )
{
if ( m_Owner == null || !m_Owner.Player )
from.SendLocalizedMessage( 1005035 ); // You did not earn the right to loot this creature!
@ -786,7 +786,7 @@ namespace Server.Items
#endregion
if ( !CheckLoot( from ) )
if ( !CheckLoot( from, null ) )
return;
#region Quests

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

@ -1,5 +1,6 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Server;
using Server.Gumps;
using Server.Multis;
@ -72,11 +73,11 @@ namespace Server.Items
public abstract class BasePlayerBB : Item, ISecurable
{
private PlayerBBMessage m_Greeting;
private ArrayList m_Messages;
private List<PlayerBBMessage> m_Messages;
private string m_Title;
private SecureLevel m_Level;
public ArrayList Messages
public List<PlayerBBMessage> Messages
{
get{ return m_Messages; }
}
@ -103,7 +104,7 @@ namespace Server.Items
public BasePlayerBB( int itemID ) : base( itemID )
{
m_Messages = new ArrayList();
m_Messages = new List<PlayerBBMessage>();
m_Level = SecureLevel.Anyone;
}
@ -140,7 +141,7 @@ namespace Server.Items
writer.WriteEncodedInt( m_Messages.Count );
for ( int i = 0; i < m_Messages.Count; ++i )
((PlayerBBMessage)m_Messages[i]).Serialize( writer );
m_Messages[i].Serialize( writer );
}
public override void Deserialize( GenericReader reader )
@ -168,7 +169,7 @@ namespace Server.Items
int count = reader.ReadEncodedInt();
m_Messages = new ArrayList( count );
m_Messages = new List<PlayerBBMessage>( count );
for ( int i = 0; i < count; ++i )
m_Messages.Add( new PlayerBBMessage( reader ) );

7
Scripts/Items/Misc/WarningItem.cs
View file

@ -2,6 +2,7 @@ using System;
using Server;
using Server.Network;
using System.Collections;
using System.Collections.Generic;
namespace Server.Items
{
@ -106,16 +107,16 @@ namespace Server.Items
if ( NeighborRange >= 0 )
{
ArrayList list = new ArrayList();
List<WarningItem> list = new List<WarningItem>();
foreach ( Item item in GetItemsInRange( NeighborRange ) )
{
if ( item != this && item is WarningItem )
list.Add( item );
list.Add( (WarningItem)item );
}
for ( int i = 0; i < list.Count; i++ )
( (WarningItem) list[i] ).Broadcast( triggerer );
list[i].Broadcast( triggerer );
}
Timer.DelayCall( TimeSpan.Zero, new TimerCallback( InternalCallback ) );