From 77ca407630c4b8e90a362a66d3065d3bf704d39a Mon Sep 17 00:00:00 2001
From: Tobias Gremeyer <angryAEon@icloud.com>
Date: Mon, 11 Feb 2019 02:29:57 +0100
Subject: [PATCH] no idea why I didn't put it before the switch statement to
 begin with; (#1538)

that would just have been too logical

#1537
---
 .../projectile/EntitySentientArrow.java       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java
index aa90eaa3..fe91c8ac 100644
--- a/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java
+++ b/src/main/java/WayofTime/bloodmagic/entity/projectile/EntitySentientArrow.java
@@ -168,6 +168,18 @@ public class EntitySentientArrow extends EntityTippedArrow {
     @Override
     public void onUpdate() {
         super.onUpdate();
+        if (this.specialArrowClass != null) {
+            if (!this.world.isRemote) {
+                this.specialEntity.posX = this.posX;
+                this.specialEntity.posY = this.posY;
+                this.specialEntity.posZ = this.posZ;
+
+                this.specialEntity.onUpdate();
+                if (this.inGround) {
+                    this.specialEntity.setDead();
+                }
+            }
+        }
         switch (type) {
             case DESTRUCTIVE:
                 if (this.potion != null) {
@@ -177,8 +189,8 @@ public class EntitySentientArrow extends EntityTippedArrow {
                     this.world.createExplosion(this, this.posX, this.posY, this.posZ, currentLevel >= 0 ? destructiveExplosionRadius[currentLevel] : 0, false);
                     if (this.potion != null && this.specialArrowClass == null) {
                         createPotionFromArrow(null);
-                        this.setDead();
                     }
+                    this.setDead();
                 }
                 break;
             case CORROSIVE:
@@ -204,19 +216,7 @@ public class EntitySentientArrow extends EntityTippedArrow {
                 break;
         }
 
-        if (this.specialArrowClass != null) {
-            if (!this.world.isRemote) {
-                this.specialEntity.posX = this.posX;
-                this.specialEntity.posY = this.posY;
-                this.specialEntity.posZ = this.posZ;
 
-                this.specialEntity.onUpdate();
-                if (this.inGround) {
-                    this.setDead();
-                    this.specialEntity.setDead();
-                }
-            }
-        }
     }
 
     //TODO: Potion splash (for destructive will fired tipped arrows) currently does not have a visual effect.