Override an ocelot method

CitizensDev · Feb 18, 2018 · d14119b · d14119b
1 parent 1bc5a47
commit d14119b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java b/v1_10_R1/src/main/java/net/citizensnpcs/nms/v1_10_R1/entity/OcelotController.java
@@ -88,6 +88,13 @@ public boolean d(NBTTagCompound save) {
             return npc == null ? super.d(save) : false;
         }
 
+        @Override
+        protected void df() {
+            if (npc == null) {
+                super.df();
+            }
+        }
+
         @Override
         public void e(float f, float f1) {
             if (npc == null || !npc.isFlyable()) {
@@ -189,6 +196,7 @@ public boolean m_() {
                 return false;
             }
         }
+
     }
 
     public static class OcelotNPC extends CraftOcelot implements NPCHolder {

diff --git a/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java b/v1_11_R1/src/main/java/net/citizensnpcs/nms/v1_11_R1/entity/OcelotController.java
@@ -88,6 +88,13 @@ public boolean d(NBTTagCompound save) {
             return npc == null ? super.d(save) : false;
         }
 
+        @Override
+        protected void di() {
+            if (npc == null) {
+                super.di();
+            }
+        }
+
         @Override
         public void e(float f, float f1) {
             if (npc == null || !npc.isFlyable()) {
@@ -190,6 +197,7 @@ public boolean m_() {
                 return false;
             }
         }
+
     }
 
     public static class OcelotNPC extends CraftOcelot implements NPCHolder {

diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/EntityHumanNPC.java
@@ -543,9 +543,7 @@ public void setSkinPersistent(String skinName, String signature, String data) {
     }
 
     private static final String[][] EMPTY_PROGRESS = new String[0][0];
-
     private static final float EPSILON = 0.005F;
-
     private static final Location LOADED_LOCATION = new Location(null, 0, 0, 0);
     private static final Field PROGRESS_TRACKER_FIELD = NMS.getField(AdvancementProgress.class, "b");
 }
diff --git a/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java b/v1_12_R1/src/main/java/net/citizensnpcs/nms/v1_12_R1/entity/OcelotController.java
@@ -98,6 +98,13 @@ public boolean d(NBTTagCompound save) {
             return npc == null ? super.d(save) : false;
         }
 
+        @Override
+        protected void dm() {
+            if (npc == null) {
+                super.dm();
+            }
+        }
+
         @Override
         public void e(float f, float f1) {
             if (npc == null || !npc.isFlyable()) {