Fixes code according to modern code style. Fixes a few expression bugs.

This commit is contained in:
Kamron Batman 2018-09-15 09:58:51 -07:00
parent 89eea25e5f
commit 970fd563b2
3324 changed files with 441118 additions and 433755 deletions

View file

@ -1,50 +1,47 @@
using System;
namespace Server.Misc
{
public class RenameRequests
{
public static void Initialize()
{
EventSink.RenameRequest += EventSink_RenameRequest;
}
public class RenameRequests
{
public static void Initialize()
{
EventSink.RenameRequest += EventSink_RenameRequest;
}
private static void EventSink_RenameRequest( RenameRequestEventArgs e )
{
Mobile from = e.From;
Mobile targ = e.Target;
string name = e.Name;
private static void EventSink_RenameRequest(RenameRequestEventArgs e)
{
Mobile from = e.From;
Mobile targ = e.Target;
string name = e.Name;
if ( from.CanSee( targ ) && from.InRange( targ, 12 ) && targ.CanBeRenamedBy( from ) )
{
name = name.Trim();
if (from.CanSee(targ) && from.InRange(targ, 12) && targ.CanBeRenamedBy(from))
{
name = name.Trim();
if ( NameVerification.Validate( name, 1, 16, true, false, true, 0, NameVerification.Empty, NameVerification.StartDisallowed, ( Core.ML ? NameVerification.Disallowed : new string[]{} ) ) )
{
if (NameVerification.Validate(name, 1, 16, true, false, true, 0, NameVerification.Empty,
NameVerification.StartDisallowed, Core.ML ? NameVerification.Disallowed : new string[] { }))
{
if (Core.ML)
{
string[] disallowed = ProfanityProtection.Disallowed;
if ( Core.ML )
{
string[] disallowed = ProfanityProtection.Disallowed;
for (int i = 0; i < disallowed.Length; i++)
if (name.IndexOf(disallowed[i]) != -1)
{
from.SendLocalizedMessage(1072622); // That name isn't very polite.
return;
}
for( int i = 0; i < disallowed.Length; i++ )
{
if ( name.IndexOf( disallowed[i] ) != -1 )
{
from.SendLocalizedMessage( 1072622 ); // That name isn't very polite.
return;
}
}
from.SendLocalizedMessage(1072623,
$"{targ.Name}\t{name}"); // Pet ~1_OLDPETNAME~ renamed to ~2_NEWPETNAME~.
}
from.SendLocalizedMessage( 1072623, $"{targ.Name}\t{name}"); // Pet ~1_OLDPETNAME~ renamed to ~2_NEWPETNAME~.
}
targ.Name = name;
}
else
{
from.SendMessage( "That name is unacceptable." );
}
}
}
}
}
targ.Name = name;
}
else
{
from.SendMessage("That name is unacceptable.");
}
}
}
}
}