From ba375e6a748bd66635164083c51b4c1ae800f57f Mon Sep 17 00:00:00 2001
From: bconlon <bconlon@gildedgames.com>
Date: Thu, 20 Aug 2020 20:50:40 -0700
Subject: [PATCH] Backport. Also fixed an NPE with darts apparently.

---
 .../the_aether/entities/bosses/slider/EntitySlider.java   | 8 ++++++++
 .../entities/projectile/darts/EntityDartBase.java         | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gildedgames/the_aether/entities/bosses/slider/EntitySlider.java b/src/main/java/com/gildedgames/the_aether/entities/bosses/slider/EntitySlider.java
index 1373aed..f1ef3b4 100644
--- a/src/main/java/com/gildedgames/the_aether/entities/bosses/slider/EntitySlider.java
+++ b/src/main/java/com/gildedgames/the_aether/entities/bosses/slider/EntitySlider.java
@@ -532,6 +532,14 @@ public class EntitySlider extends EntityFlying implements IAetherBoss {
 
         boolean isTCPickaxe = stack.getItem().getClass().getName().equals("tconstruct.items.tools.Pickaxe");
 
+
+        if (!stack.getItem().canHarvestBlock(Blocks.stone, stack))
+        {
+            this.sendMessage(player, "Hmm. Perhaps I need to attack it with a Pickaxe?");
+
+            return false;
+        }
+
         if (!isTCPickaxe) {
             if (!(stack.getItem() instanceof ItemPickaxe) && !(stack.getItem() instanceof ItemAetherTool)) {
                 this.sendMessage(player, "Hmm. Perhaps I need to attack it with a Pickaxe?");
diff --git a/src/main/java/com/gildedgames/the_aether/entities/projectile/darts/EntityDartBase.java b/src/main/java/com/gildedgames/the_aether/entities/projectile/darts/EntityDartBase.java
index 2e3e2a2..c33534e 100644
--- a/src/main/java/com/gildedgames/the_aether/entities/projectile/darts/EntityDartBase.java
+++ b/src/main/java/com/gildedgames/the_aether/entities/projectile/darts/EntityDartBase.java
@@ -393,7 +393,7 @@ public abstract class EntityDartBase extends EntityArrow implements IProjectile,
             }
         }
 
-        if (movingobjectposition.entityHit != null)
+        if (movingobjectposition.entityHit != null && movingobjectposition.typeOfHit != null && this.shootingEntity != null)
         {
             if (movingobjectposition.entityHit != this.shootingEntity && movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY && movingobjectposition.entityHit != this.shootingEntity.riddenByEntity)
             {