Use deprecated TippedArrow interface

CitizensDev · Jun 5, 2020 · 2a1ce46 · 2a1ce46
1 parent fd14197
commit 2a1ce46
Showing 1 changed file with 18 additions and 19 deletions.
diff --git a/...1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java b/...1/src/main/java/net/citizensnpcs/nms/v1_15_R1/entity/nonliving/TippedArrowController.java
@@ -1,17 +1,16 @@
 package net.citizensnpcs.nms.v1_15_R1.entity.nonliving;
 
-import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
-import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
-
 import org.bukkit.Bukkit;
 import org.bukkit.craftbukkit.v1_15_R1.CraftServer;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftArrow;
 import org.bukkit.craftbukkit.v1_15_R1.entity.CraftEntity;
-import org.bukkit.entity.Arrow;
+import org.bukkit.entity.TippedArrow;
 import org.bukkit.util.Vector;
 
 import net.citizensnpcs.api.event.NPCPushEvent;
 import net.citizensnpcs.api.npc.NPC;
+import net.citizensnpcs.nms.v1_15_R1.entity.MobEntityController;
+import net.citizensnpcs.nms.v1_15_R1.util.NMSImpl;
 import net.citizensnpcs.npc.CitizensNPC;
 import net.citizensnpcs.npc.ai.NPCHolder;
 import net.citizensnpcs.util.Util;
@@ -26,8 +25,8 @@ public TippedArrowController() {
     }
 
     @Override
-    public Arrow getBukkitEntity() {
-        return (Arrow) super.getBukkitEntity();
+    public TippedArrow getBukkitEntity() {
+        return (TippedArrow) super.getBukkitEntity();
     }
 
     public static class EntityTippedArrowNPC extends EntityTippedArrow implements NPCHolder {
@@ -57,6 +56,19 @@ public boolean d(NBTTagCompound save) {
             return npc == null ? super.d(save) : false;
         }
 
+        @Override
+        public CraftEntity getBukkitEntity() {
+            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
+                NMSImpl.setBukkitEntity(this, new TippedArrowNPC(this));
+            }
+            return super.getBukkitEntity();
+        }
+
+        @Override
+        public NPC getNPC() {
+            return npc;
+        }
+
         @Override
         public void h(double x, double y, double z) {
             if (npc == null) {
@@ -79,19 +91,6 @@ public void h(double x, double y, double z) {
             // cancelled.
         }
 
-        @Override
-        public CraftEntity getBukkitEntity() {
-            if (npc != null && !(super.getBukkitEntity() instanceof NPCHolder)) {
-                NMSImpl.setBukkitEntity(this, new TippedArrowNPC(this));
-            }
-            return super.getBukkitEntity();
-        }
-
-        @Override
-        public NPC getNPC() {
-            return npc;
-        }
-
         @Override
         public void tick() {
             if (npc != null) {