- Re-applied SOS fix regarding facets.

- Removed CTFGame specific code.
This commit is contained in:
eos 2012-04-22 07:21:00 +00:00
parent 599b2af6d5
commit 5ab7149cf6
2 changed files with 1 additions and 15 deletions

View file

@ -252,7 +252,7 @@ namespace Server.Engines.Harvest
{
SOS sos = messages[i];
if ( from.Map == sos.TargetMap && from.InRange( sos.TargetLocation, 60 ) )
if ( ( from.Map == Map.Felucca || from.Map == Map.Trammel ) && from.InRange( sos.TargetLocation, 60 ) )
{
Item preLoot = null;

View file

@ -3605,20 +3605,6 @@ namespace Server.Mobiles
if ( checkTurning && (dir & Direction.Mask) != (this.Direction & Direction.Mask) )
return Mobile.RunMount; // We are NOT actually moving (just a direction change)
#region Dueling / CTF
if ( m_DuelContext != null && m_DuelContext.m_EventGame is CTFGame )
{
CTFGame game = (CTFGame)m_DuelContext.m_EventGame;
CTFTeamInfo team = game.GetTeamInfo( this );
//We don't want to just search through all the contents of our pack everytime we take a step.
if ( game.Controller != null && game.Controller.SlowFlagBearer && team != null && team.Flag != null && team.Flag.RootParent == this )
return Mobile.WalkFoot;
}
#endregion
TransformContext context = TransformationSpellHelper.GetContext( this );
if ( context != null && context.Type == typeof( ReaperFormSpell ) )