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

Attacking you abilities and filters - fixed that planeswalker removes from a combat can cause a game error (NPE error, example: Curse of Hospitality)

Browse source
This commit is contained in:
Oleg Agafonov 2023-05-09 14:59:44 +04:00
parent 1f4dfd08ce
commit 9d9916280a
9 changed files with 68 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -2557,6 +2557,7 @@ public abstract class GameImpl implements Game {
.getGroups()
.stream()
.map(CombatGroup::getDefenderId)
.filter(Objects::nonNull)
.noneMatch(perm.getId()::equals)
&& this.getPlayer(perm.getProtectorId()) == null
|| perm.isControlledBy(perm.getProtectorId())) {

1
Mage/src/main/java/mage/game/combat/Combat.java
View file

@ -1594,6 +1594,7 @@ public class Combat implements Serializable, Copyable<Combat> {
.stream()
.filter(group -> group.getAttackers().contains(attackerId))
.map(CombatGroup::getDefenderId)
.filter(Objects::nonNull)
.findFirst()
.orElse(null);
}

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

@ -31,7 +31,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
protected List<UUID> attackerOrder = new ArrayList<>();
protected Map<UUID, UUID> players = new HashMap<>();
protected boolean blocked;
protected UUID defenderId; // planeswalker or player
protected UUID defenderId; // planeswalker or player, can be null after remove from combat (e.g. due damage)
protected UUID defendingPlayerId;
protected boolean defenderIsPermanent;