- Removed the ASCII 0x7F control character from safe character lists.

- Added the TraceLockdown command.
- Fixed a missing conflicting layer check for FishingPole.
- Controlled and summoned creatures are no longer affected by the confusion blast potion effect.
This commit is contained in:
eos 2012-09-08 23:42:45 +00:00
parent 512ab4bfbf
commit 11f84a33cd
8 changed files with 69 additions and 8 deletions

View file

@ -35,6 +35,20 @@ namespace Server.Items
BaseHarvestTool.AddContextMenuEntries( from, this, list, Fishing.System );
}
public override bool CheckConflictingLayer( Mobile m, Item item, Layer layer )
{
if ( base.CheckConflictingLayer( m, item, layer ) )
return true;
if ( layer == Layer.OneHanded )
{
m.SendLocalizedMessage( 500214 ); // You already have something in both hands.
return true;
}
return false;
}
public FishingPole( Serial serial ) : base( serial )
{
}

View file

@ -106,6 +106,9 @@ namespace Server.Items
{
BaseCreature mon = (BaseCreature) mobile;
if ( mon.Controlled || mon.Summoned )
continue;
mon.Pacify( from, DateTime.Now + TimeSpan.FromSeconds( 5.0 ) ); // TODO check
}
}