Merge branch 'fixstuff' into 'master'

Some smaller fixes

Closes #1868

See merge request core-developers/forge!4806
This commit is contained in:
Michael Kamensky
2021-06-03 14:02:50 +00:00
16 changed files with 24 additions and 24 deletions

View File

@@ -244,7 +244,6 @@ public class SpellAbilityCondition extends SpellAbilityVariables {
* @return a boolean.
*/
public final boolean areMet(final SpellAbility sa) {
Player activator = sa.getActivatingPlayer();
if (activator == null) {
activator = sa.getHostCard().getController();