mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-17 11:18:01 +00:00
Merge branch 'hotfixNPE' into 'master'
Fix NPE from PlayEffect with Jace's Mindseeker See merge request core-developers/forge!3703
This commit is contained in:
@@ -212,7 +212,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
|
|||||||
public SpellAbility getAbilityToPlay(final Card hostCard, final List<SpellAbility> abilities,
|
public SpellAbility getAbilityToPlay(final Card hostCard, final List<SpellAbility> abilities,
|
||||||
final ITriggerEvent triggerEvent) {
|
final ITriggerEvent triggerEvent) {
|
||||||
// make sure another human player can't choose opponents cards just because he might see them
|
// make sure another human player can't choose opponents cards just because he might see them
|
||||||
if (!hostCard.isInZone(ZoneType.Battlefield) && !hostCard.getOwner().equals(player) && !hostCard.getController().equals(player) && hostCard.mayPlay(player).size() == 0) {
|
if (triggerEvent != null && !hostCard.isInZone(ZoneType.Battlefield) && !hostCard.getOwner().equals(player) && !hostCard.getController().equals(player) && hostCard.mayPlay(player).size() == 0) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
spellViewCache = SpellAbilityView.getMap(abilities);
|
spellViewCache = SpellAbilityView.getMap(abilities);
|
||||||
|
|||||||
Reference in New Issue
Block a user