Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix timed external conditions being rejected instead of reset. #12625

Merged
merged 1 commit into from
Jan 27, 2017

Conversation

pchote
Copy link
Member

@pchote pchote commented Jan 25, 2017

Fixes #12498.

@pchote pchote added this to the Next Release milestone Jan 25, 2017
Copy link
Contributor

@GraionDilach GraionDilach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@@ -83,7 +83,7 @@ public void GrantTimedUpgrade(string upgrade, int duration)
public bool AcceptsUpgrade(string upgrade)
{
Game.Debug("AcceptsUpgrade is deprecated. Use AcceptsCondition instead.");
return AcceptsCondition(upgrade);
return AcceptsCondition(upgrade, false);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this explicit false necessary?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It isn't on this version of the commit. Removed.

@abcdefg30 abcdefg30 merged commit 0f11926 into OpenRA:bleed Jan 27, 2017
@abcdefg30
Copy link
Member

Changelog

@pchote pchote deleted the fix-timed-conditions branch May 7, 2017 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants