From 4a5b3b59ed8f0e60a842e84619e2da90ffe71d1c Mon Sep 17 00:00:00 2001 From: penev92 Date: Thu, 5 Mar 2015 22:22:08 +0200 Subject: [PATCH] Properly remove worms from the world --- OpenRA.Mods.Common/Traits/Player/EnemyWatcher.cs | 3 +++ OpenRA.Mods.D2k/Activities/SwallowActor.cs | 6 +----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Player/EnemyWatcher.cs b/OpenRA.Mods.Common/Traits/Player/EnemyWatcher.cs index 2469ac9479..257995df43 100644 --- a/OpenRA.Mods.Common/Traits/Player/EnemyWatcher.cs +++ b/OpenRA.Mods.Common/Traits/Player/EnemyWatcher.cs @@ -75,6 +75,9 @@ namespace OpenRA.Mods.Common.Traits || self.Owner.Stances[actor.Actor.Owner] != Stance.Enemy) continue; + if (actor.Actor.IsDead || !actor.Actor.IsInWorld) + continue; + // The actor is not currently visible if (!self.Owner.Shroud.IsVisible(actor.Actor)) continue; diff --git a/OpenRA.Mods.D2k/Activities/SwallowActor.cs b/OpenRA.Mods.D2k/Activities/SwallowActor.cs index b38e7ccb43..b9ee1a0a32 100644 --- a/OpenRA.Mods.D2k/Activities/SwallowActor.cs +++ b/OpenRA.Mods.D2k/Activities/SwallowActor.cs @@ -115,11 +115,7 @@ namespace OpenRA.Mods.D2k.Activities if (self.World.SharedRandom.Next() % 100 <= sandworm.Info.ChanceToDisappear) { self.CancelActivity(); - self.World.AddFrameEndTask(w => w.Remove(self)); - - var wormManager = self.World.WorldActor.TraitOrDefault(); - if (wormManager != null) - wormManager.DecreaseWormCount(); + self.World.AddFrameEndTask(w => self.Kill(self)); } else renderUnit.DefaultAnimation.ReplaceAnim("idle");