external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 04:38:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'foul' into 'master'

Browse Source 
Foul Emissary: Fix NPE

See merge request core-developers/forge!4739
This commit is contained in:
Michael Kamensky
2021-05-25 06:21:36 +00:00
parent d1e8f9db6b 2f26cbe676
commit 3d5a7e9bc7
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
forge-game/src/main/java/forge/game/trigger/TriggerSacrificed.java
View File

@@ -80,13 +80,17 @@ public class TriggerSacrificed extends Trigger {
// When cast with Emerge, the cost instance is there
IndividualCostPaymentInstance currentPayment = (IndividualCostPaymentInstance) runParams.get(AbilityKey.IndividualCostPaymentInstance);
SpellAbility sa = currentPayment.getPayment().getAbility();
SpellAbility sa;
if (currentPayment != null) {
sa = currentPayment.getPayment().getAbility();
if (sa != null && sa.getHostCard() != null) {
if (sa.isSpell() && sa.getHostCard().hasStartOfUnHiddenKeyword(keyword)) {
withKeyword = true;
}
}
}
if (!withKeyword) {
// When done for another card to get the Mana, the Emerge card is there