github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-16 03:00:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Fixed NPE bug during blocker declaration (fixes #308).

Browse source
This commit is contained in:
LevelX2 2013-08-11 20:24:57 +02:00
parent 0d643848ae
commit 09126d321a
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Mage/src/mage/game/combat/CombatGroup.java
View file

@ -56,6 +56,11 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
protected UUID defendingPlayerId; protected UUID defendingPlayerId;
protected boolean defenderIsPlaneswalker; protected boolean defenderIsPlaneswalker;
/**
* @param defenderId the player that controls the defending permanents
* @param defenderIsPlaneswalker is the defending permanent a planeswalker
* @param defendingPlayerId regular controller of the defending permanents
*/
public CombatGroup(UUID defenderId, boolean defenderIsPlaneswalker, UUID defendingPlayerId) { public CombatGroup(UUID defenderId, boolean defenderIsPlaneswalker, UUID defendingPlayerId) {
this.defenderId = defenderId; this.defenderId = defenderId;
this.defenderIsPlaneswalker = defenderIsPlaneswalker; this.defenderIsPlaneswalker = defenderIsPlaneswalker;
@ -63,14 +68,15 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
} }
public CombatGroup(final CombatGroup group) { public CombatGroup(final CombatGroup group) {
this.blocked = group.blocked;
this.defenderId = group.defenderId;
this.defenderIsPlaneswalker = group.defenderIsPlaneswalker;
this.attackers.addAll(group.attackers); this.attackers.addAll(group.attackers);
this.blockers.addAll(group.blockers); this.blockers.addAll(group.blockers);
this.blockerOrder.addAll(group.blockerOrder); this.blockerOrder.addAll(group.blockerOrder);
this.attackerOrder.addAll(group.attackerOrder); this.attackerOrder.addAll(group.attackerOrder);
this.players.putAll(group.players); this.players.putAll(group.players);
this.blocked = group.blocked;
this.defenderId = group.defenderId;
this.defendingPlayerId = group.defendingPlayerId;
this.defenderIsPlaneswalker = group.defenderIsPlaneswalker;
} }
public boolean hasFirstOrDoubleStrike(Game game) { public boolean hasFirstOrDoubleStrike(Game game) {
@ -381,7 +387,7 @@ public class CombatGroup implements Serializable, Copyable<CombatGroup> {
} }
public boolean canBlock(Permanent blocker, Game game) { public boolean canBlock(Permanent blocker, Game game) {
// you can't block if combat group attacks another player // player can't block if another player is attacked
if (!defendingPlayerId.equals(blocker.getControllerId()) ) { if (!defendingPlayerId.equals(blocker.getControllerId()) ) {
return false; return false;
} }