From 80446260cc82a5a97a876719d754132ebda4687d Mon Sep 17 00:00:00 2001
From: Alex Vasile <48962821+Alex-Vasile@users.noreply.github.com>
Date: Wed, 13 Jul 2022 15:27:21 -0400
Subject: [PATCH] [CLB] Fix Faldorn trigger. Closes #9265.

---
 Mage.Sets/src/mage/cards/f/FaldornDreadWolfHerald.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Mage.Sets/src/mage/cards/f/FaldornDreadWolfHerald.java b/Mage.Sets/src/mage/cards/f/FaldornDreadWolfHerald.java
index c488486b06e..8e12070a3c3 100644
--- a/Mage.Sets/src/mage/cards/f/FaldornDreadWolfHerald.java
+++ b/Mage.Sets/src/mage/cards/f/FaldornDreadWolfHerald.java
@@ -83,6 +83,9 @@ class FaldornDreadWolfHeraldTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
+        if (!this.isControlledBy(event.getPlayerId())) {
+            return false;
+        }
         switch (event.getType()) {
             case ENTERS_THE_BATTLEFIELD:
                 EntersTheBattlefieldEvent eEvent = (EntersTheBattlefieldEvent) event;
@@ -91,6 +94,7 @@ class FaldornDreadWolfHeraldTriggeredAbility extends TriggeredAbilityImpl {
                 return Optional
                         .ofNullable(game.getSpell(event.getTargetId()))
                         .map(Spell::getFromZone)
+                        .orElse(Zone.ALL)
                         .equals(Zone.EXILED);
         }
         return false;