From ac4e51ce0da99bef0a2ab740c2fad3a47c9f3458 Mon Sep 17 00:00:00 2001
From: Jeff <jeff@delmarus.com>
Date: Wed, 13 Feb 2019 10:19:07 -0600
Subject: [PATCH] - Fixed Rivals' Duel

---
 Mage.Sets/src/mage/cards/r/RivalsDuel.java          | 13 ++++++++++---
 .../TargetCreaturePermanentWithDifferentTypes.java  |  3 ++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/r/RivalsDuel.java b/Mage.Sets/src/mage/cards/r/RivalsDuel.java
index a342736f022..08d8be7d6ec 100644
--- a/Mage.Sets/src/mage/cards/r/RivalsDuel.java
+++ b/Mage.Sets/src/mage/cards/r/RivalsDuel.java
@@ -1,4 +1,3 @@
-
 package mage.cards.r;
 
 import java.util.UUID;
@@ -51,8 +50,16 @@ class RivalsDuelFightTargetsEffect extends OneShotEffect {
 
     @Override
     public boolean apply(Game game, Ability source) {
-        Permanent creature1 = game.getPermanent(source.getFirstTarget());
-        Permanent creature2 = game.getPermanent(source.getTargets().get(0).getTargets().get(1));
+        Permanent creature1 = null;
+        Permanent creature2 = null;
+        for (UUID targetId : getTargetPointer().getTargets(game, source)) {
+            if (creature1 == null) {
+                creature1 = game.getPermanent(targetId);
+            } else {
+                creature2 = game.getPermanent(targetId);
+            }
+        }
+
         // 20110930 - 701.10
         if (creature1 != null
                 && creature2 != null) {
diff --git a/Mage/src/main/java/mage/target/common/TargetCreaturePermanentWithDifferentTypes.java b/Mage/src/main/java/mage/target/common/TargetCreaturePermanentWithDifferentTypes.java
index 396605907d2..4bbc69cabcd 100644
--- a/Mage/src/main/java/mage/target/common/TargetCreaturePermanentWithDifferentTypes.java
+++ b/Mage/src/main/java/mage/target/common/TargetCreaturePermanentWithDifferentTypes.java
@@ -35,7 +35,8 @@ public class TargetCreaturePermanentWithDifferentTypes extends TargetCreaturePer
                 for (Object object : getTargets()) {
                     UUID targetId = (UUID) object;
                     Permanent selectedCreature = game.getPermanent(targetId);
-                    if (!creature.getId().equals(selectedCreature.getId())) {
+                    if (selectedCreature != null 
+                            && !creature.getId().equals(selectedCreature.getId())) {
                         if (creature.shareSubtypes(selectedCreature, game)) {
                             return false;
                         }