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

check name for Actor.GrantCondition()

Browse Source
This commit is contained in:
atlimit8
2020-04-26 01:19:31 -05:00
committed by abcdefg30
parent 1d2d8ed107
commit 1ef27d18c1
21 changed files with 38 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Traits/Carryable.cs
View File

@@ -78,7 +78,7 @@ namespace OpenRA.Mods.Common.Traits
attached = true;
if (carriedToken == Actor.InvalidConditionToken && !string.IsNullOrEmpty(Info.CarriedCondition))
if (carriedToken == Actor.InvalidConditionToken)
carriedToken = self.GrantCondition(Info.CarriedCondition);
}
@@ -102,7 +102,7 @@ namespace OpenRA.Mods.Common.Traits
state = State.Reserved;
Carrier = carrier;
if (reservedToken == Actor.InvalidConditionToken && !string.IsNullOrEmpty(Info.ReservedCondition))
if (reservedToken == Actor.InvalidConditionToken)
reservedToken = self.GrantCondition(Info.ReservedCondition);
return true;
@@ -134,7 +134,7 @@ namespace OpenRA.Mods.Common.Traits
state = State.Locked;
Carrier = carrier;
if (lockedToken == Actor.InvalidConditionToken && !string.IsNullOrEmpty(Info.LockedCondition))
if (lockedToken == Actor.InvalidConditionToken)
lockedToken = self.GrantCondition(Info.LockedCondition);
}