UPMod Bug Fixes #5

[ModifiesType]
public class mod_StatusEffect : StatusEffect
{
    [ModifiesMember("UpdateHelper")]
    private void mod_UpdateHelper(float seconds)
    {
        if (this.m_target == null)
        {
            return;
        }
        if (this.IsSuspended)
        {
            return;
        }
        if (this.m_intervalTimer > 0f)
        {
            float num = seconds;
            CharacterStats characterStats = this.m_targetStats;
            if (this.IsFromAura)
            {
                characterStats = this.m_ownerStats;
            }
            if (characterStats != null)
            {
                if (this.IsDOT)
                {
                    num *= characterStats.DOTTickMult;
                }
                if (this.IsNegativeMovementEffect)
                {
                    num *= characterStats.NegMoveTickMult;
                }
                if (this.IsPoisonEffect)
                {
                    num *= characterStats.PoisonTickMult;
                }
                if (this.IsDiseaseEffect)
                {
                    num *= characterStats.DiseaseTickMult;
                }
            }
            this.m_intervalTimer -= num;
        }
        this.m_timeActive += seconds;
        if (!this.m_suppressed && (this.m_applied || this.IsAura))
        {
            this.UpdateActiveEffect(seconds);
        }
        if (this.Duration > 0f && this.m_timeActive > this.Duration && this.DurationAfterBreak <= 0f)
        {
            this.UpdateFinalTick();
            this.ClearEffect(this.m_target);
        }
        else if (this.m_cachedTeam != null && this.m_targetStats != null)
        {
            this.m_swapTeamTimer -= seconds;
            if (this.m_swapTeamTimer <= 0f)
            {
                this.m_swapTeamTimer = StatusEffect.SwapTeamTimerMax;
                AIController aIController = GameUtilities.FindActiveAIController(this.m_target);

                // ORIGINAL:
                //if (aIController != null && aIController.CurrentTarget == null && !aIController.IsConfused)
                //{
                //    if (this.AfflictionOrigin != null)
                //    {
                //        this.m_targetStats.ClearEffectFromAffliction(this.AfflictionOrigin);
                //    }
                //    else
                //    {
                //        this.ClearEffect(this.m_target);
                //    }
                //}

                // PATCH START:
                // RELATED BUGS: #5a, #5b
                // TASK: fix charm and dominate effects ending prematurely
                if (aIController != null && aIController.CurrentTarget == null && !aIController.IsConfused)
                {
                    bool isPartyMember = PartyHelper.IsPartyMember(this.m_target);
                    float range = System.Math.Max(aIController.PerceptionDistance, 15);
                    List<GameObject> enemies = new List<GameObject>();
                    GameUtilities.GetEnemiesInRange(this.m_target, aIController, range, enemies);

                    if (enemies.Count <= 0)
                    {
                        //  Last enemy will no longer break charm and dominate effects immediately. These effects will last at least 5s
                        if (isPartyMember || this.m_timeActive >= 5) // clear team swap effect
                        {
                            if (this.AfflictionOrigin != null)
                            {
                                this.m_targetStats.ClearEffectFromAffliction(this.AfflictionOrigin);
                            }
                            else
                            {
                                this.ClearEffect(this.m_target);
                            }

                            if (!isPartyMember)
                              global::Console.AddMessage(this.m_targetStats.DisplayName.GetText() + " has broken free!"); // TODO: localize the string
                        }
                    }
                }
                // PATCH END
            }
        }
    }
}