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

Faction.ClearSkillLoss now returns true or false indicating if the player was actually under skill loss

Browse source 
Refactored some gump methods to account for the respective core changes
This commit is contained in:
krrios 2006-08-27 20:39:11 +00:00
parent 6095f152cf
commit 51345e02a0
4 changed files with 18 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Scripts/Engines/Factions/Core/Faction.cs
View file

@ -900,12 +900,13 @@ namespace Server.Factions
ClearSkillLoss( (Mobile) state );
}
public static void ClearSkillLoss( Mobile mob )
public static bool ClearSkillLoss( Mobile mob )
{
SkillLossContext context = (SkillLossContext)m_SkillLoss[mob];
if ( context == null )
return;
if ( context == null ) {
return false;
}
m_SkillLoss.Remove( mob );
@ -915,6 +916,8 @@ namespace Server.Factions
mob.RemoveSkillMod( (SkillMod) mods[i] );
context.m_Timer.Stop();
return true;
}
#endregion

13
Scripts/Engines/Factions/Gumps/FactionGump.cs
View file

@ -33,18 +33,7 @@ namespace Server.Factions
public static bool Exists( Mobile mob )
{
NetState ns = mob.NetState;
if ( ns == null )
return false;
for ( int i = 0; i < ns.Gumps.Count; ++i )
{
if ( ns.Gumps[i] is FactionGump )
return true;
}
return false;
return ( mob.FindGump( typeof( FactionGump ) ) != null );
}
public void AddHtmlText( int x, int y, int width, int height, TextDefinition text, bool back, bool scroll )

16
Scripts/Items/Skill Items/Magical/Runebook.cs
View file

@ -237,19 +237,13 @@ namespace Server.Items
{
NetState ns = toCheck.NetState;
if ( ns == null )
return false;
if ( ns != null ) {
foreach ( Gump gump in ns.Gumps ) {
RunebookGump bookGump = gump as RunebookGump;
List<Gump> gumps = ns.Gumps;
for ( int i = 0; i < gumps.Count; ++i )
{
if ( gumps[i] is RunebookGump )
{
RunebookGump gump = (RunebookGump)gumps[i];
if ( gump.Book == this )
if ( bookGump != null && bookGump.Book == this ) {
return true;
}
}
}

21
Scripts/Mobiles/PlayerMobile.cs
View file

@ -1079,21 +1079,12 @@ namespace Server.Mobiles
if ( ns != null )
{
List<Gump> gumps = ns.Gumps;
for ( int i = 0; i < gumps.Count; ++i )
{
if ( gumps[i] is ResurrectGump )
{
if ( Alive )
{
CloseGump( typeof( ResurrectGump ) );
}
else
{
SendLocalizedMessage( 500111 ); // You are frozen and cannot move.
return false;
}
if ( HasGump( typeof( ResurrectGump ) ) ) {
if ( Alive ) {
CloseGump( typeof( ResurrectGump ) );
} else {
SendLocalizedMessage( 500111 ); // You are frozen and cannot move.
return false;
}
}
}