From 06da3cfac36daae9e00dab806bc2c62a8ea6e749 Mon Sep 17 00:00:00 2001
From: bconlon <aidan90803@icloud.com>
Date: Tue, 28 Jul 2020 11:40:02 -0700
Subject: [PATCH] Backport fix.

---
 .../valkyrie_queen/EntityValkyrieQueen.java   | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/legacy/aether/entities/bosses/valkyrie_queen/EntityValkyrieQueen.java b/src/main/java/com/legacy/aether/entities/bosses/valkyrie_queen/EntityValkyrieQueen.java
index 9bdf7b8..e1fdc37 100644
--- a/src/main/java/com/legacy/aether/entities/bosses/valkyrie_queen/EntityValkyrieQueen.java
+++ b/src/main/java/com/legacy/aether/entities/bosses/valkyrie_queen/EntityValkyrieQueen.java
@@ -210,27 +210,29 @@ public class EntityValkyrieQueen extends EntityBossMob implements IAetherBoss {
             this.motionY *= .5f;
             this.moveStrafing = this.moveForward = 0;
         } else {
-            if (this.getEntityToAttack() instanceof EntityPlayer) {
-                if (this.getEntityToAttack().posY > this.posY) {
-                    timeUntilTeleportToPlayer++;
+            if (this.getEntityToAttack() != null) {
+                if (this.getEntityToAttack() instanceof EntityPlayer) {
+                    if (this.getEntityToAttack().posY > this.posY) {
+                        timeUntilTeleportToPlayer++;
 
-                    if (timeUntilTeleportToPlayer >= 75 && !this.worldObj.isRemote) {
-                        this.teleportToPlayer();
-                    }
-                } else {
-                    timeUntilTeleportToPlayer = 0;
-                }
-
-                if (this.timeUntilTeleport++ >= 450) {
-                    if (this.onGround && this.rand.nextInt(5) == 0) {
-                        this.makeHomeShot(1, (EntityPlayer) this.getEntityToAttack());
+                        if (timeUntilTeleportToPlayer >= 75 && !this.worldObj.isRemote) {
+                            this.teleportToPlayer();
+                        }
                     } else {
-                        this.teleport(this.getEntityToAttack().posX, this.getEntityToAttack().posY, this.getEntityToAttack().posZ, 4);
+                        timeUntilTeleportToPlayer = 0;
+                    }
+
+                    if (this.timeUntilTeleport++ >= 450) {
+                        if (this.onGround && this.rand.nextInt(5) == 0) {
+                            this.makeHomeShot(1, (EntityPlayer) this.getEntityToAttack());
+                        } else {
+                            this.teleport(this.getEntityToAttack().posX, this.getEntityToAttack().posY, this.getEntityToAttack().posZ, 4);
+                        }
+                    } else if (this.timeUntilTeleport < 446 && (this.posY <= 0D || this.posY <= (this.safeY - 16D))) {
+                        this.timeUntilTeleport = 446;
+                    } else if ((this.timeUntilTeleport % 5) == 0 && !canEntityBeSeen(this.getEntityToAttack())) {
+                        this.timeUntilTeleport += 100;
                     }
-                } else if (this.timeUntilTeleport < 446 && (this.posY <= 0D || this.posY <= (this.safeY - 16D))) {
-                    this.timeUntilTeleport = 446;
-                } else if ((this.timeUntilTeleport % 5) == 0 && !canEntityBeSeen(this.getEntityToAttack())) {
-                    this.timeUntilTeleport += 100;
                 }
             }