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

Fix GrantConditionOnPrerequisite not refreshing when the actor's owner changes

Browse Source
This commit is contained in:
abcdefg30
2016-10-15 18:14:24 +02:00
parent b2b3390bc0
commit e1dda2bf54
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenRA.Mods.Common/Traits/Conditions/GrantConditionOnPrerequisite.cs
View File

@@ -29,15 +29,14 @@ namespace OpenRA.Mods.Common.Traits
public object Create(ActorInitializer init) { return new GrantConditionOnPrerequisite(init.Self, this); } public object Create(ActorInitializer init) { return new GrantConditionOnPrerequisite(init.Self, this); }
} }
public class GrantConditionOnPrerequisite : INotifyCreated, INotifyAddedToWorld, INotifyRemovedFromWorld public class GrantConditionOnPrerequisite : INotifyCreated, INotifyAddedToWorld, INotifyRemovedFromWorld, INotifyOwnerChanged
{ {
readonly GrantConditionOnPrerequisiteInfo info; readonly GrantConditionOnPrerequisiteInfo info;
readonly GrantConditionOnPrerequisiteManager globalManager;
ConditionManager conditionManager;
int conditionToken = ConditionManager.InvalidConditionToken;
bool wasAvailable; bool wasAvailable;
ConditionManager conditionManager;
GrantConditionOnPrerequisiteManager globalManager;
int conditionToken = ConditionManager.InvalidConditionToken;
public GrantConditionOnPrerequisite(Actor self, GrantConditionOnPrerequisiteInfo info) public GrantConditionOnPrerequisite(Actor self, GrantConditionOnPrerequisiteInfo info)
{ {
@@ -62,6 +61,11 @@ namespace OpenRA.Mods.Common.Traits
globalManager.Unregister(self, this, info.Prerequisites); globalManager.Unregister(self, this, info.Prerequisites);
} }
void INotifyOwnerChanged.OnOwnerChanged(Actor self, Player oldOwner, Player newOwner)
{
globalManager = newOwner.PlayerActor.Trait<GrantConditionOnPrerequisiteManager>();
}
public void PrerequisitesUpdated(Actor self, bool available) public void PrerequisitesUpdated(Actor self, bool available)
{ {
if (available == wasAvailable || conditionManager == null) if (available == wasAvailable || conditionManager == null)