mirror of
https://github.com/correl/mage.git
synced 2024-12-26 03:00:11 +00:00
fixed Torbran, Thane of Red Fell not increasing damage to players
This commit is contained in:
parent
316f823ebf
commit
520de8a6d5
1 changed files with 7 additions and 3 deletions
|
@ -78,7 +78,7 @@ class TorbranThaneOfRedFellEffect extends ReplacementEffectImpl {
|
|||
public boolean applies(GameEvent event, Ability source, Game game) {
|
||||
Player player = game.getPlayer(source.getControllerId());
|
||||
if (player == null
|
||||
|| !player.hasOpponent(game.getControllerId(event.getTargetId()), game)
|
||||
|| !player.hasOpponent(getControllerOrSelf(event.getTargetId(), game), game)
|
||||
|| !source.isControlledBy(game.getControllerId(event.getSourceId()))) {
|
||||
return false;
|
||||
}
|
||||
|
@ -90,8 +90,12 @@ class TorbranThaneOfRedFellEffect extends ReplacementEffectImpl {
|
|||
sourceObject = sourcePermanent;
|
||||
}
|
||||
return sourceObject != null
|
||||
&& sourceObject.getColor(game).isRed()
|
||||
&& !sourceObject.getId().equals(source.getSourceId());
|
||||
&& sourceObject.getColor(game).isRed();
|
||||
}
|
||||
|
||||
private static UUID getControllerOrSelf(UUID id, Game game) {
|
||||
UUID outId = game.getControllerId(id);
|
||||
return outId == null ? id : outId;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
Loading…
Reference in a new issue