epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent multiple Transforms from triggering in the same tick.

Browse Source 
This leads to actor duplication.
This commit is contained in:
Paul Chote
2018-12-05 21:01:00 +00:00
committed by reaperrr
parent 72923b9572
commit 4b6853b433
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Actor.cs
View File

@@ -42,6 +42,7 @@ namespace OpenRA
public Player Owner { get; internal set; } public Player Owner { get; internal set; }
public bool IsInWorld { get; internal set; } public bool IsInWorld { get; internal set; }
public bool WillDispose { get; private set; }
public bool Disposed { get; private set; } public bool Disposed { get; private set; }
public Activity CurrentActivity { get; private set; } public Activity CurrentActivity { get; private set; }
@@ -284,6 +285,9 @@ namespace OpenRA
if (CurrentActivity != null) if (CurrentActivity != null)
CurrentActivity.RootActivity.OnActorDisposeOuter(this); CurrentActivity.RootActivity.OnActorDisposeOuter(this);
// Allow traits/activities to prevent a race condition when they depend on disposing the actor (e.g. Transforms)
WillDispose = true;
World.AddFrameEndTask(w => World.AddFrameEndTask(w =>
{ {
if (Disposed) if (Disposed)

3
OpenRA.Mods.Cnc/Traits/ConyardChronoReturn.cs
View File

@@ -204,6 +204,9 @@ namespace OpenRA.Mods.Cnc.Traits
void ITick.Tick(Actor self) void ITick.Tick(Actor self)
{ {
if (self.WillDispose)
return;
if (triggered) if (triggered)
health.InflictDamage(self, chronosphere, new Damage(info.Damage, info.DamageTypes), true); health.InflictDamage(self, chronosphere, new Damage(info.Damage, info.DamageTypes), true);

2
OpenRA.Mods.Common/Activities/Transform.cs
View File

@@ -89,7 +89,7 @@ namespace OpenRA.Mods.Common.Activities
{ {
self.World.AddFrameEndTask(w => self.World.AddFrameEndTask(w =>
{ {
if (self.IsDead) if (self.IsDead || self.WillDispose)
return; return;
foreach (var nt in self.TraitsImplementing<INotifyTransform>()) foreach (var nt in self.TraitsImplementing<INotifyTransform>())