From 6bc79e58f1d76498f0b7f839bc7dff041c2438f2 Mon Sep 17 00:00:00 2001
From: SeanOMik <seanomik@gmail.com>
Date: Thu, 27 Aug 2020 14:03:25 -0500
Subject: [PATCH] Fix crash when foxes run from wolfs

---
 .idea/workspace.xml                           | 52 +++++++++----------
 pom.xml                                       | 10 ++--
 .../version_1_15_R1/EntityTamableFox.java     |  2 +-
 target/classes/plugin.yml                     |  2 +-
 target/maven-archiver/pom.properties          |  4 +-
 5 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 80c82ad..71d4cd5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,14 +5,10 @@
       <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/TamableFoxes.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/TamableFoxes.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/Utils.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/versions/version_1_15_R1/EntityTamableFox.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/versions/version_1_15_R1/EntityTamableFox.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R1/EntityTamableFox.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/net/seanomik/tamablefoxes/versions/version_1_16_R1/EntityTamableFox.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/plugin.yml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/plugin.yml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/target/classes/plugin.yml" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/plugin.yml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/maven-archiver/pom.properties" beforeDir="false" afterPath="$PROJECT_DIR$/target/maven-archiver/pom.properties" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -85,7 +81,7 @@
       <recent name="E:\TamableFoxesCustomEntity\src\main\resources" />
     </key>
   </component>
-  <component name="RunManager" selected="JAR Application.Spigot-1.16.1">
+  <component name="RunManager" selected="JAR Application.Spigot-1.15.2">
     <configuration name="Spigot-1.14.4" type="JarApplication">
       <option name="JAR_PATH" value="$PROJECT_DIR$/../../_TEST_SERVER_1.14.4_/spigot-1.14.4.jar" />
       <option name="PROGRAM_PARAMETERS" value="nogui" />
@@ -205,10 +201,10 @@
     <option name="LAST_COMMIT_MESSAGE" value="New way of implementing foxes" />
   </component>
   <component name="WindowStateProjectService">
-    <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1594757119591">
+    <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1595187627084">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1594757119591" />
+    <state x="414" y="174" key="#com.intellij.execution.impl.EditConfigurationsDialog/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1595187627084" />
     <state x="765" y="229" key="#com.intellij.ide.util.MemberChooser" timestamp="1594703907165">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
@@ -225,46 +221,46 @@
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
     <state x="740" y="275" key="FileChooserDialogImpl/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1590119699228" />
-    <state width="1877" height="211" key="GridCell.Tab.0.bottom" timestamp="1594762175885">
+    <state width="1877" height="211" key="GridCell.Tab.0.bottom" timestamp="1595186032453">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="211" key="GridCell.Tab.0.bottom/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1594762175885" />
-    <state width="1877" height="211" key="GridCell.Tab.0.center" timestamp="1594762175885">
+    <state width="1877" height="211" key="GridCell.Tab.0.bottom/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1595186032453" />
+    <state width="1877" height="211" key="GridCell.Tab.0.center" timestamp="1595186032453">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="211" key="GridCell.Tab.0.center/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1594762175885" />
-    <state width="1877" height="211" key="GridCell.Tab.0.left" timestamp="1594762175885">
+    <state width="1877" height="211" key="GridCell.Tab.0.center/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1595186032453" />
+    <state width="1877" height="211" key="GridCell.Tab.0.left" timestamp="1595186032453">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="211" key="GridCell.Tab.0.left/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1594762175885" />
-    <state width="1877" height="211" key="GridCell.Tab.0.right" timestamp="1594762175885">
+    <state width="1877" height="211" key="GridCell.Tab.0.left/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1595186032453" />
+    <state width="1877" height="211" key="GridCell.Tab.0.right" timestamp="1595186032453">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="211" key="GridCell.Tab.0.right/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1594762175885" />
-    <state width="1877" height="211" key="GridCell.Tab.1.bottom" timestamp="1594762175796">
+    <state width="1877" height="211" key="GridCell.Tab.0.right/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1595186032453" />
+    <state width="1877" height="211" key="GridCell.Tab.1.bottom" timestamp="1595186032453">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="211" key="GridCell.Tab.1.bottom/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1594762175796" />
-    <state width="1877" height="211" key="GridCell.Tab.1.center" timestamp="1594762175796">
+    <state width="1877" height="211" key="GridCell.Tab.1.bottom/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1595186032453" />
+    <state width="1877" height="211" key="GridCell.Tab.1.center" timestamp="1595186032453">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="211" key="GridCell.Tab.1.center/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1594762175796" />
-    <state width="1877" height="211" key="GridCell.Tab.1.left" timestamp="1594762175795">
+    <state width="1877" height="211" key="GridCell.Tab.1.center/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1595186032453" />
+    <state width="1877" height="211" key="GridCell.Tab.1.left" timestamp="1595186032453">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="211" key="GridCell.Tab.1.left/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1594762175795" />
-    <state width="1877" height="211" key="GridCell.Tab.1.right" timestamp="1594762175796">
+    <state width="1877" height="211" key="GridCell.Tab.1.left/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1595186032453" />
+    <state width="1877" height="211" key="GridCell.Tab.1.right" timestamp="1595186032453">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state width="1877" height="211" key="GridCell.Tab.1.right/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1594762175796" />
-    <state x="461" y="162" key="SettingsEditor" timestamp="1588876397734">
+    <state width="1877" height="211" key="GridCell.Tab.1.right/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1595186032453" />
+    <state x="461" y="162" key="SettingsEditor" timestamp="1595187631542">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="461" y="162" key="SettingsEditor/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1588876397734" />
-    <state x="656" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1590119557040">
+    <state x="461" y="162" key="SettingsEditor/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1595187631542" />
+    <state x="656" y="343" key="com.intellij.ide.util.TipDialog" timestamp="1595263192782">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
-    <state x="656" y="343" key="com.intellij.ide.util.TipDialog/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1590119557040" />
+    <state x="656" y="343" key="com.intellij.ide.util.TipDialog/0.0.1920.1040/-1920.0.1920.1040@0.0.1920.1040" timestamp="1595263192782" />
     <state x="607" y="135" key="com.intellij.openapi.editor.actions.MultiplePasteAction$ClipboardContentChooser" timestamp="1594751055964">
       <screen x="0" y="0" width="1920" height="1040" />
     </state>
diff --git a/pom.xml b/pom.xml
index 76d1f4d..b5de8f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>net.seanomik</groupId>
     <artifactId>tamablefoxes</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Tamablefoxes</name>
@@ -39,9 +39,9 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.14.4_\plugins\TamableFoxes-MC-v1.14.X-v1.16.X_v${project.version}.jar</outputFile>-->
-                            <!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.15.2_\plugins\TamableFoxes-MC-v1.14.X-v1.16.X_v${project.version}.jar</outputFile>-->
-                            <outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.1_\plugins\TamableFoxes-MC-v1.14.X-v1.16.X_v${project.version}.jar</outputFile>
+                            <!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.14.4_\plugins\TamableFoxes_v${project.version}.jar</outputFile>-->
+                            <outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.15.2_\plugins\TamableFoxes_v${project.version}.jar</outputFile>
+                            <!--<outputFile>D:\Code\java\spigotPlugins\_TEST_SERVER_1.16.1_\plugins\TamableFoxes_v${project.version}.jar</outputFile>-->
                             <createDependencyReducedPom>false</createDependencyReducedPom>
                         </configuration>
                     </execution>
@@ -77,7 +77,7 @@
             <artifactId>AllSpigotNMS</artifactId>
             <version>LATEST</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/spigot-14-15-16-nms.jar</systemPath>
+            <systemPath>${project.basedir}/spigot-14-15-16_R1-16_R2.jar</systemPath>
         </dependency>
         <dependency> <!-- We need to do this so we get the spigot api without nms. -->
             <groupId>org.spigotmc</groupId>
diff --git a/src/main/java/net/seanomik/tamablefoxes/versions/version_1_15_R1/EntityTamableFox.java b/src/main/java/net/seanomik/tamablefoxes/versions/version_1_15_R1/EntityTamableFox.java
index d026e81..7b613d0 100644
--- a/src/main/java/net/seanomik/tamablefoxes/versions/version_1_15_R1/EntityTamableFox.java
+++ b/src/main/java/net/seanomik/tamablefoxes/versions/version_1_15_R1/EntityTamableFox.java
@@ -79,7 +79,7 @@ public class EntityTamableFox extends EntityFox {
                 return !isTamed() && bD.test((EntityLiving) entityliving) && !this.isDefending();
             }));
             this.goalSelector.a(4, new PathfinderGoalAvoidTarget(this, EntityWolf.class, 8.0F, 1.6D, 1.4D, (entityliving) -> {
-                return !((net.minecraft.server.v1_16_R1.EntityWolf)entityliving).isTamed() && !this.isDefending();
+                return !((EntityWolf) entityliving).isTamed() && !this.isDefending();
             }));
 
             this.goalSelector.a(5, getFoxInnerPathfinderGoal("u")); // StalkPreyGoal
diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml
index 36d00a7..1c05b71 100644
--- a/target/classes/plugin.yml
+++ b/target/classes/plugin.yml
@@ -1,5 +1,5 @@
 name: Tamablefoxes
-version: 1.7-SNAPSHOT
+version: 1.7.1-SNAPSHOT
 main: net.seanomik.tamablefoxes.TamableFoxes
 api-version: 1.14
 load: STARTUP
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
index 74dd591..3750d9b 100644
--- a/target/maven-archiver/pom.properties
+++ b/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Maven
-#Tue Jul 14 00:33:46 CDT 2020
+#Sun Jul 19 14:05:21 CDT 2020
 groupId=net.seanomik
 artifactId=tamablefoxes
-version=1.7-SNAPSHOT
+version=1.7.1-SNAPSHOT