Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2017-10-21 16:14:14 +02:00
commit 919ec2fade
62 changed files with 2504 additions and 253 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -3484,9 +3484,10 @@ public abstract class PlayerImpl implements Player, Serializable {
}
@Override
public boolean hasOpponent(UUID playerToCheckId, Game game
) {
return !this.getId().equals(playerToCheckId) && game.isOpponent(this, playerToCheckId);
public boolean hasOpponent(UUID playerToCheckId, Game game) {
return !this.getId().equals(playerToCheckId)
&& game.isOpponent(this, playerToCheckId)
&& getInRange().contains(playerToCheckId);
}
@Override