Ensure that the pet goal selector *always* exists

DSH105 · Oct 1, 2014 · 158d0c3 · 158d0c3
1 parent 08683c6
commit 158d0c3
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 0 deletions.
diff --git a/modules/v1_6_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_6_R3/entity/EntityPet.java b/modules/v1_6_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_6_R3/entity/EntityPet.java
@@ -223,6 +223,11 @@ protected void bi() {
 
         this.getEntitySenses().a();
 
+        // If this ever happens...
+        if (this.petGoalSelector == null) {
+            this.remove(false);
+            return;
+        }
         this.petGoalSelector.updateGoals();
 
         this.getNavigation().f();

diff --git a/modules/v1_7_R1/src/main/java/com/dsh105/echopet/compat/nms/v1_7_R1/entity/EntityPet.java b/modules/v1_7_R1/src/main/java/com/dsh105/echopet/compat/nms/v1_7_R1/entity/EntityPet.java
@@ -224,6 +224,11 @@ protected void bn() {
 
         this.getEntitySenses().a();
 
+        // If this ever happens...
+        if (this.petGoalSelector == null) {
+            this.remove(false);
+            return;
+        }
         this.petGoalSelector.updateGoals();
 
         this.getNavigation().f();

diff --git a/modules/v1_7_R2/src/main/java/com/dsh105/echopet/compat/nms/v1_7_R2/entity/EntityPet.java b/modules/v1_7_R2/src/main/java/com/dsh105/echopet/compat/nms/v1_7_R2/entity/EntityPet.java
@@ -224,6 +224,11 @@ protected void bm() {
 
         this.getEntitySenses().a();
 
+        // If this ever happens...
+        if (this.petGoalSelector == null) {
+            this.remove(false);
+            return;
+        }
         this.petGoalSelector.updateGoals();
 
         this.getNavigation().f();

diff --git a/modules/v1_7_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_7_R3/entity/EntityPet.java b/modules/v1_7_R3/src/main/java/com/dsh105/echopet/compat/nms/v1_7_R3/entity/EntityPet.java
@@ -225,6 +225,11 @@ protected void bm() {
 
         this.getEntitySenses().a();
 
+        // If this ever happens...
+        if (this.petGoalSelector == null) {
+            this.remove(false);
+            return;
+        }
         this.petGoalSelector.updateGoals();
 
         this.getNavigation().f();

diff --git a/modules/v1_7_R4/src/main/java/com/dsh105/echopet/compat/nms/v1_7_R4/entity/EntityPet.java b/modules/v1_7_R4/src/main/java/com/dsh105/echopet/compat/nms/v1_7_R4/entity/EntityPet.java
@@ -225,6 +225,11 @@ protected void bn() {
 
         this.getEntitySenses().a();
 
+        // If this ever happens...
+        if (this.petGoalSelector == null) {
+            this.remove(false);
+            return;
+        }
         this.petGoalSelector.updateGoals();
 
         this.getNavigation().f();

diff --git a/...v1_8_Spigot/src/main/java/com/dsh105/echopet/compat/nms/v1_8_Spigot/entity/EntityPet.java b/...v1_8_Spigot/src/main/java/com/dsh105/echopet/compat/nms/v1_8_Spigot/entity/EntityPet.java
@@ -227,6 +227,11 @@ protected void bn() {
 
         this.getEntitySenses().a();
 
+        // If this ever happens...
+        if (this.petGoalSelector == null) {
+            this.remove(false);
+            return;
+        }
         this.petGoalSelector.updateGoals();
 
         this.getNavigation().f();