From 5ab7149cf6f6aeb07f3fccf60124f194bd459575 Mon Sep 17 00:00:00 2001 From: eos Date: Sun, 22 Apr 2012 07:21:00 +0000 Subject: [PATCH] - Re-applied SOS fix regarding facets. - Removed CTFGame specific code. --- Scripts/Engines/Harvest/Fishing.cs | 2 +- Scripts/Mobiles/PlayerMobile.cs | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/Scripts/Engines/Harvest/Fishing.cs b/Scripts/Engines/Harvest/Fishing.cs index 8b044c351..c950f5ae2 100644 --- a/Scripts/Engines/Harvest/Fishing.cs +++ b/Scripts/Engines/Harvest/Fishing.cs @@ -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; diff --git a/Scripts/Mobiles/PlayerMobile.cs b/Scripts/Mobiles/PlayerMobile.cs index 2170d26ed..d3fc5f751 100644 --- a/Scripts/Mobiles/PlayerMobile.cs +++ b/Scripts/Mobiles/PlayerMobile.cs @@ -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 ) )