From 83aadadec44ecb67af31068bf7d33be78190dd95 Mon Sep 17 00:00:00 2001
From: xenohedron <xenohedron@users.noreply.github.com>
Date: Thu, 4 Apr 2024 22:19:03 -0400
Subject: [PATCH] null check fixes

---
 Mage.Sets/src/mage/cards/m/MindbladeRender.java  | 7 ++-----
 Mage.Sets/src/mage/cards/t/TheRavensWarning.java | 6 ++++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/m/MindbladeRender.java b/Mage.Sets/src/mage/cards/m/MindbladeRender.java
index d0ef08950bc..cd23225d419 100644
--- a/Mage.Sets/src/mage/cards/m/MindbladeRender.java
+++ b/Mage.Sets/src/mage/cards/m/MindbladeRender.java
@@ -68,19 +68,16 @@ class MindbladeRenderTriggeredAbility extends TriggeredAbilityImpl {
 
     @Override
     public boolean checkTrigger(GameEvent event, Game game) {
-
         Player controller = game.getPlayer(getControllerId());
         if (controller == null) {
             return false;
         }
-
         DamagedBatchForOnePlayerEvent dEvent = (DamagedBatchForOnePlayerEvent) event;
 
         if (!controller.hasOpponent(dEvent.getTargetId(), game)){
             return false;
         }
-
-        if (!dEvent.isCombatDamage()){
+        if (!dEvent.isCombatDamage()) {
             return false;
         }
 
@@ -88,7 +85,7 @@ class MindbladeRenderTriggeredAbility extends TriggeredAbilityImpl {
                 .stream()
                 .filter(ev -> {
                     Permanent attacker = game.getPermanentOrLKIBattlefield(ev.getSourceId());
-                    return attacker.hasSubtype(SubType.WARRIOR, game);
+                    return attacker != null && attacker.hasSubtype(SubType.WARRIOR, game);
                 })
                 .mapToInt(GameEvent::getAmount)
                 .sum();
diff --git a/Mage.Sets/src/mage/cards/t/TheRavensWarning.java b/Mage.Sets/src/mage/cards/t/TheRavensWarning.java
index 3c051472725..658baa15a57 100644
--- a/Mage.Sets/src/mage/cards/t/TheRavensWarning.java
+++ b/Mage.Sets/src/mage/cards/t/TheRavensWarning.java
@@ -91,10 +91,12 @@ class TheRavensWarningTriggeredAbility extends DelayedTriggeredAbility {
 
         int flyingDamage = dEvent.getEvents()
                 .stream()
-                .filter(ev -> ev.getSourceId().equals(controllerId))
                 .filter(ev -> {
+                    if (!ev.getSourceId().equals(controllerId)) {
+                        return false;
+                    }
                     Permanent permanent = game.getPermanentOrLKIBattlefield(ev.getSourceId());
-                    return permanent.isCreature() && permanent.hasAbility(FlyingAbility.getInstance(), game);
+                    return permanent != null && permanent.isCreature() && permanent.hasAbility(FlyingAbility.getInstance(), game);
                 })
                 .mapToInt(GameEvent::getAmount)
                 .sum();