Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

* Fixed provisional game freezing bugs of the show playable cards feature #457 (caused by DelverAbility, OfferingAbility, Rooftop Storm, Omniscience, Aluren).

Browse source
This commit is contained in:
LevelX2 2014-07-21 13:03:41 +02:00
parent ad9b73c34c
commit 142e95fe42
20 changed files with 106 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/mage/abilities/SpellAbility.java
View file

@ -84,8 +84,8 @@ public class SpellAbility extends ActivatedAbilityImpl {
@Override
public boolean canActivate(UUID playerId, Game game) {
if (this.spellCanBeActivatedRegularlyNow(playerId, game) ||
game.getContinuousEffects().asThough(sourceId, AsThoughEffectType.CAST, playerId, game)) {
if (game.getContinuousEffects().asThough(sourceId, AsThoughEffectType.CAST, this, playerId, game) // check this first to allow Offering in main phase
|| this.spellCanBeActivatedRegularlyNow(playerId, game)) {
if (spellAbilityType.equals(SpellAbilityType.SPLIT)) {
return false;
}