diff --git a/Scripts/Accounting/AccountHandler.cs b/Scripts/Accounting/AccountHandler.cs index f740daf18..76552bbe3 100644 --- a/Scripts/Accounting/AccountHandler.cs +++ b/Scripts/Accounting/AccountHandler.cs @@ -121,7 +121,7 @@ namespace Server.Misc bool isSafe = true; for ( int i = 0; isSafe && i < pass.Length; ++i ) - isSafe = ( pass[i] >= 0x20 && pass[i] < 0x80 ); + isSafe = ( pass[i] >= 0x20 && pass[i] < 0x7F ); if ( !isSafe ) { @@ -275,10 +275,10 @@ namespace Server.Misc bool isSafe = !( un.StartsWith( " " ) || un.EndsWith( " " ) || un.EndsWith( "." ) ); for ( int i = 0; isSafe && i < un.Length; ++i ) - isSafe = ( un[i] >= 0x20 && un[i] < 0x80 && !IsForbiddenChar( un[i] ) ); + isSafe = ( un[i] >= 0x20 && un[i] < 0x7F && !IsForbiddenChar( un[i] ) ); for ( int i = 0; isSafe && i < pw.Length; ++i ) - isSafe = ( pw[i] >= 0x20 && pw[i] < 0x80 ); + isSafe = ( pw[i] >= 0x20 && pw[i] < 0x7F ); if ( !isSafe ) return null; diff --git a/Scripts/Commands/Docs.cs b/Scripts/Commands/Docs.cs index 3f54dc089..172974082 100644 --- a/Scripts/Commands/Docs.cs +++ b/Scripts/Commands/Docs.cs @@ -1396,7 +1396,7 @@ namespace Server.Commands html.Write( """ ); else if( c == '\'' ) html.Write( "'" ); - else if( c >= 0x20 && c < 0x80 ) + else if( c >= 0x20 && c < 0x7F ) html.Write( c ); else html.Write( "&#{0};", (int)c ); diff --git a/Scripts/Commands/Generic/Commands/Commands.cs b/Scripts/Commands/Generic/Commands/Commands.cs index 8eb6a331b..543a14651 100644 --- a/Scripts/Commands/Generic/Commands/Commands.cs +++ b/Scripts/Commands/Generic/Commands/Commands.cs @@ -58,6 +58,7 @@ namespace Server.Commands.Generic Register( new Factions.FactionKickCommand( Factions.FactionKickType.Ban ) ); Register( new Factions.FactionKickCommand( Factions.FactionKickType.Unban ) ); Register( new BringToPackCommand() ); + Register( new TraceLockdownCommand() ); } private static List m_AllCommands = new List(); @@ -1079,4 +1080,42 @@ namespace Server.Commands.Generic } } } -} \ No newline at end of file + + public class TraceLockdownCommand : BaseCommand + { + public TraceLockdownCommand() + { + AccessLevel = AccessLevel.Administrator; + Supports = CommandSupport.Simple; + Commands = new string[] { "TraceLockdown" }; + ObjectTypes = ObjectTypes.Items; + Usage = "TraceLockdown"; + Description = "Finds the BaseHouse for which a targeted item is locked down or secured."; + } + + public override void Execute( CommandEventArgs e, object obj ) + { + Item item = obj as Item; + + if ( item == null ) + return; + + if ( !item.IsLockedDown && !item.IsSecure ) + { + LogFailure( "That is not locked down." ); + return; + } + + foreach ( BaseHouse house in BaseHouse.AllHouses ) + { + if ( house.IsSecure( item ) || house.IsLockedDown( item ) ) + { + e.Mobile.SendGump( new PropertiesGump( e.Mobile, house ) ); + return; + } + } + + LogFailure( "No house was found." ); + } + } +} diff --git a/Scripts/Engines/MyRunUO/MyRunUO.cs b/Scripts/Engines/MyRunUO/MyRunUO.cs index efe5bd7e5..3abcc4079 100644 --- a/Scripts/Engines/MyRunUO/MyRunUO.cs +++ b/Scripts/Engines/MyRunUO/MyRunUO.cs @@ -305,7 +305,7 @@ namespace Server.Engines.MyRunUO { char c = input[i]; - if ( c < 0x20 || c > 0x80 ) + if ( c < 0x20 || c >= 0x7F ) { AppendCharEntity( input, i, ref sb, c ); } diff --git a/Scripts/Items/Skill Items/Fishing/FishingPole.cs b/Scripts/Items/Skill Items/Fishing/FishingPole.cs index ebfd3f18a..77c443c0d 100644 --- a/Scripts/Items/Skill Items/Fishing/FishingPole.cs +++ b/Scripts/Items/Skill Items/Fishing/FishingPole.cs @@ -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 ) { } diff --git a/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs b/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs index c1679562a..06d084e63 100644 --- a/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs +++ b/Scripts/Items/Skill Items/Magical/Potions/Confusion Blast Potions/BaseConfusionBlastPotion.cs @@ -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 } } diff --git a/Scripts/Multis/BaseHouse.cs b/Scripts/Multis/BaseHouse.cs index 1926ddbfa..505779348 100644 --- a/Scripts/Multis/BaseHouse.cs +++ b/Scripts/Multis/BaseHouse.cs @@ -1208,6 +1208,11 @@ namespace Server.Multis private static List m_AllHouses = new List(); + public static List AllHouses + { + get { return m_AllHouses; } + } + public BaseHouse( int multiID, Mobile owner, int MaxLockDown, int MaxSecure ) : base( multiID ) { m_AllHouses.Add( this ); diff --git a/Server/Utility.cs b/Server/Utility.cs index 5299e6fe6..164b1e2d7 100644 --- a/Server/Utility.cs +++ b/Server/Utility.cs @@ -1131,7 +1131,7 @@ namespace Server bytes.Append( " " ); } - if ( c >= 0x20 && c < 0x80 ) + if ( c >= 0x20 && c < 0x7F ) { chars.Append( (char)c ); } @@ -1170,7 +1170,7 @@ namespace Server bytes.Append( " " ); } - if ( c >= 0x20 && c < 0x80 ) + if ( c >= 0x20 && c < 0x7F ) { chars.Append( (char)c ); }