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

Manually construct the PlayerActor to fix crashes during actor creation

Browse Source
This commit is contained in:
abcdefg30
2020-05-24 19:39:07 +02:00
committed by reaperrr
parent 9c0075b233
commit 7386816f52
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Game/Player.cs
View File

@@ -166,8 +166,16 @@ namespace OpenRA
if (!Spectating) if (!Spectating)
PlayerMask = new LongBitSet<PlayerBitMask>(InternalName); PlayerMask = new LongBitSet<PlayerBitMask>(InternalName);
// Special case handling is required for the Player actor:
// Since Actor.Created would be called before PlayerActor is assigned here
// querying player traits in INotifyCreated.Created would crash.
// Therefore only call the constructor of Actor and run the Created callbacks ourselves.
// Add the PlayerActor to the world afterwards.
var playerActorType = world.Type == WorldType.Editor ? EditorPlayerActorType : PlayerActorType; var playerActorType = world.Type == WorldType.Editor ? EditorPlayerActorType : PlayerActorType;
PlayerActor = world.CreateActor(playerActorType, new TypeDictionary { new OwnerInit(this) }); PlayerActor = new Actor(world, playerActorType, new TypeDictionary { new OwnerInit(this) });
PlayerActor.Created();
world.Add(PlayerActor);
Shroud = PlayerActor.Trait<Shroud>(); Shroud = PlayerActor.Trait<Shroud>();
FrozenActorLayer = PlayerActor.TraitOrDefault<FrozenActorLayer>(); FrozenActorLayer = PlayerActor.TraitOrDefault<FrozenActorLayer>();