External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-26 21:29:17 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Additional fixes for 9d9916280a

Browse source
This commit is contained in:
Oleg Agafonov 2023-05-09 15:05:24 +04:00
parent 9d9916280a
commit 3c66dc8706
5 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/dynamicvalue/common/CreaturesAttackingYouCount.java
View file

@ -21,7 +21,7 @@ public enum CreaturesAttackingYouCount implements DynamicValue {
public int calculate(Game game, Ability sourceAbility, Effect effect) {
int count = 0;
for (CombatGroup combatGroup : game.getCombat().getGroups()) {
if (combatGroup.getDefenderId().equals(sourceAbility.getControllerId())) {
if (combatGroup.getDefenderId() != null && combatGroup.getDefenderId().equals(sourceAbility.getControllerId())) {
count += combatGroup.getAttackers().size();
}
}

1
Mage/src/main/java/mage/filter/predicate/permanent/AttackingSameNotBandedPredicate.java
View file

@ -26,6 +26,7 @@ public class AttackingSameNotBandedPredicate implements Predicate<Permanent> {
return combatGroup != null
&& input.isAttacking()
&& input.getBandedCards().isEmpty()
&& combatGroup.getDefenderId() != null
&& combatGroup.getDefenderId().equals(defenderId);
}
}

4
Mage/src/main/java/mage/game/combat/CombatGroup.java
View file

@ -66,6 +66,10 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
}
/**
*
* @return can be null
*/
public UUID getDefenderId() {
return defenderId;
}