From 9cd3eeb89819f623f8d978fb9f17107bbc67711e Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Sat, 1 Feb 2020 11:37:10 +0400 Subject: [PATCH] * UI: improved prevention effect messages (now it shows source object name in message window); --- .../main/java/mage/abilities/effects/ContinuousEffects.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java b/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java index b2cf1a7ca4f..46708c0d2ac 100644 --- a/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java +++ b/Mage/src/main/java/mage/abilities/effects/ContinuousEffects.java @@ -756,7 +756,11 @@ public class ContinuousEffects implements Serializable { effect.setValue("targetAbility", targetAbility); if (effect.applies(event, sourceAbility, game)) { if (!game.inCheckPlayableState() && !silentMode) { + MageObject sourceObject = sourceAbility.getSourceObject(game); String message = effect.getInfoMessage(sourceAbility, event, game); + if (sourceObject != null) { + message = sourceObject.getIdName() + ": " + message; + } if (message != null && !message.isEmpty()) { if (effect.sendMessageToUser()) { Player player = game.getPlayer(event.getPlayerId());