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

Merge pull request #8268 from obrakmann/fix8262_d2k_double_remove_from_world

Browse Source 
Fix potentially removing actors twice from world in Actor::ChangeOwner
This commit is contained in:
Matthias Mailänder
2015-05-27 22:03:43 +02:00
parent 7ddf11433b 7b3b2f85f8
commit dec7ad1ee2
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenRA.Game/Actor.cs
View File

@@ -242,12 +242,17 @@ namespace OpenRA
return; return;
var oldOwner = Owner; var oldOwner = Owner;
var wasInWorld = IsInWorld;
// momentarily remove from world so the ownership queries don't get confused // momentarily remove from world so the ownership queries don't get confused
w.Remove(this); if (wasInWorld)
w.Remove(this);
Owner = newOwner; Owner = newOwner;
Generation++; Generation++;
w.Add(this);
if (wasInWorld)
w.Add(this);
foreach (var t in this.TraitsImplementing<INotifyOwnerChanged>()) foreach (var t in this.TraitsImplementing<INotifyOwnerChanged>())
t.OnOwnerChanged(this, oldOwner, newOwner); t.OnOwnerChanged(this, oldOwner, newOwner);