fix custom armor effect crash

the crash occurred while wearing a mob head and 3 custom armor pieces. bug fix: catch exception when this event happens and return false
aleganza · Mar 26, 2023 · fe37382 · fe37382
1 parent 7aea42d
commit fe37382
Show file tree

Hide file tree

Showing 17 changed files with 257 additions and 122 deletions.
diff --git a/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorAmethyst.java b/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorAmethyst.java
@@ -81,17 +81,25 @@ private boolean hasFullSuitOfArmorOn(PlayerEntity player) {
                 && !leggings.isEmpty() && !boots.isEmpty();
     }
 
-    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
-        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
-        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
+    private boolean doesArmorHaveMaterial(ArmorMaterial material, PlayerEntity player) {
+        for (int i=0; i<4; i++) {
+            try{
+                ((ArmorItem)player.getInventory().getArmorStack(i).getItem()).getMaterial();
+            }catch(Exception e){
+                return false;
+            }
+        }
 
-        // elytra bug fix
-        try{
-            ((ArmorItem)player.getInventory().getArmorStack(2).getItem()).getMaterial();
-        }catch(Exception e){
+        return true;
+    }
+
+    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
+        if (!doesArmorHaveMaterial(material, player)) {
             return false;
         }
 
+        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
+        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
         ArmorItem breastplate = ((ArmorItem)player.getInventory().getArmorStack(2).getItem());
         ArmorItem helmet = ((ArmorItem)player.getInventory().getArmorStack(3).getItem());
 

diff --git a/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorBrick.java b/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorBrick.java
@@ -81,17 +81,25 @@ private boolean hasFullSuitOfArmorOn(PlayerEntity player) {
                 && !leggings.isEmpty() && !boots.isEmpty();
     }
 
-    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
-        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
-        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
+    private boolean doesArmorHaveMaterial(ArmorMaterial material, PlayerEntity player) {
+        for (int i=0; i<4; i++) {
+            try{
+                ((ArmorItem)player.getInventory().getArmorStack(i).getItem()).getMaterial();
+            }catch(Exception e){
+                return false;
+            }
+        }
 
-        // elytra bug fix
-        try{
-            ((ArmorItem)player.getInventory().getArmorStack(2).getItem()).getMaterial();
-        }catch(Exception e){
+        return true;
+    }
+
+    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
+        if (!doesArmorHaveMaterial(material, player)) {
             return false;
         }
 
+        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
+        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
         ArmorItem breastplate = ((ArmorItem)player.getInventory().getArmorStack(2).getItem());
         ArmorItem helmet = ((ArmorItem)player.getInventory().getArmorStack(3).getItem());
 

diff --git a/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorCactus.java b/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorCactus.java
@@ -83,17 +83,25 @@ private boolean hasFullSuitOfArmorOn(PlayerEntity player) {
                 && !leggings.isEmpty() && !boots.isEmpty();
     }
 
-    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
-        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
-        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
+    private boolean doesArmorHaveMaterial(ArmorMaterial material, PlayerEntity player) {
+        for (int i=0; i<4; i++) {
+            try{
+                ((ArmorItem)player.getInventory().getArmorStack(i).getItem()).getMaterial();
+            }catch(Exception e){
+                return false;
+            }
+        }
 
-        // elytra bug fix
-        try{
-            ((ArmorItem)player.getInventory().getArmorStack(2).getItem()).getMaterial();
-        }catch(Exception e){
+        return true;
+    }
+
+    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
+        if (!doesArmorHaveMaterial(material, player)) {
             return false;
         }
 
+        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
+        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
         ArmorItem breastplate = ((ArmorItem)player.getInventory().getArmorStack(2).getItem());
         ArmorItem helmet = ((ArmorItem)player.getInventory().getArmorStack(3).getItem());
 

diff --git a/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorCrimson.java b/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorCrimson.java
@@ -81,17 +81,25 @@ private boolean hasFullSuitOfArmorOn(PlayerEntity player) {
                 && !leggings.isEmpty() && !boots.isEmpty();
     }
 
-    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
-        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
-        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
+    private boolean doesArmorHaveMaterial(ArmorMaterial material, PlayerEntity player) {
+        for (int i=0; i<4; i++) {
+            try{
+                ((ArmorItem)player.getInventory().getArmorStack(i).getItem()).getMaterial();
+            }catch(Exception e){
+                return false;
+            }
+        }
 
-        // elytra bug fix
-        try{
-            ((ArmorItem)player.getInventory().getArmorStack(2).getItem()).getMaterial();
-        }catch(Exception e){
+        return true;
+    }
+
+    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
+        if (!doesArmorHaveMaterial(material, player)) {
             return false;
         }
 
+        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
+        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
         ArmorItem breastplate = ((ArmorItem)player.getInventory().getArmorStack(2).getItem());
         ArmorItem helmet = ((ArmorItem)player.getInventory().getArmorStack(3).getItem());
 

diff --git a/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorEmerald.java b/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorEmerald.java
@@ -81,17 +81,25 @@ private boolean hasFullSuitOfArmorOn(PlayerEntity player) {
                 && !leggings.isEmpty() && !boots.isEmpty();
     }
 
-    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
-        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
-        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
+    private boolean doesArmorHaveMaterial(ArmorMaterial material, PlayerEntity player) {
+        for (int i=0; i<4; i++) {
+            try{
+                ((ArmorItem)player.getInventory().getArmorStack(i).getItem()).getMaterial();
+            }catch(Exception e){
+                return false;
+            }
+        }
 
-        // elytra bug fix
-        try{
-            ((ArmorItem)player.getInventory().getArmorStack(2).getItem()).getMaterial();
-        }catch(Exception e){
+        return true;
+    }
+
+    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
+        if (!doesArmorHaveMaterial(material, player)) {
             return false;
         }
 
+        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
+        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
         ArmorItem breastplate = ((ArmorItem)player.getInventory().getArmorStack(2).getItem());
         ArmorItem helmet = ((ArmorItem)player.getInventory().getArmorStack(3).getItem());
 

diff --git a/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorEnder.java b/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorEnder.java
@@ -81,17 +81,25 @@ private boolean hasFullSuitOfArmorOn(PlayerEntity player) {
                 && !leggings.isEmpty() && !boots.isEmpty();
     }
 
-    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
-        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
-        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
+    private boolean doesArmorHaveMaterial(ArmorMaterial material, PlayerEntity player) {
+        for (int i=0; i<4; i++) {
+            try{
+                ((ArmorItem)player.getInventory().getArmorStack(i).getItem()).getMaterial();
+            }catch(Exception e){
+                return false;
+            }
+        }
 
-        // elytra bug fix
-        try{
-            ((ArmorItem)player.getInventory().getArmorStack(2).getItem()).getMaterial();
-        }catch(Exception e){
+        return true;
+    }
+
+    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
+        if (!doesArmorHaveMaterial(material, player)) {
             return false;
         }
 
+        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
+        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
         ArmorItem breastplate = ((ArmorItem)player.getInventory().getArmorStack(2).getItem());
         ArmorItem helmet = ((ArmorItem)player.getInventory().getArmorStack(3).getItem());
 

diff --git a/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorEnderNetherite1.java b/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorEnderNetherite1.java
@@ -81,17 +81,25 @@ private boolean hasFullSuitOfArmorOn(PlayerEntity player) {
                 && !leggings.isEmpty() && !boots.isEmpty();
     }
 
-    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
-        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
-        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
+    private boolean doesArmorHaveMaterial(ArmorMaterial material, PlayerEntity player) {
+        for (int i=0; i<4; i++) {
+            try{
+                ((ArmorItem)player.getInventory().getArmorStack(i).getItem()).getMaterial();
+            }catch(Exception e){
+                return false;
+            }
+        }
 
-        // elytra bug fix
-        try{
-            ((ArmorItem)player.getInventory().getArmorStack(2).getItem()).getMaterial();
-        }catch(Exception e){
+        return true;
+    }
+
+    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
+        if (!doesArmorHaveMaterial(material, player)) {
             return false;
         }
 
+        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
+        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
         ArmorItem breastplate = ((ArmorItem)player.getInventory().getArmorStack(2).getItem());
         ArmorItem helmet = ((ArmorItem)player.getInventory().getArmorStack(3).getItem());
 

diff --git a/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorEnderNetherite2.java b/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorEnderNetherite2.java
@@ -81,17 +81,25 @@ private boolean hasFullSuitOfArmorOn(PlayerEntity player) {
                 && !leggings.isEmpty() && !boots.isEmpty();
     }
 
-    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
-        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
-        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
+    private boolean doesArmorHaveMaterial(ArmorMaterial material, PlayerEntity player) {
+        for (int i=0; i<4; i++) {
+            try{
+                ((ArmorItem)player.getInventory().getArmorStack(i).getItem()).getMaterial();
+            }catch(Exception e){
+                return false;
+            }
+        }
 
-        // elytra bug fix
-        try{
-            ((ArmorItem)player.getInventory().getArmorStack(2).getItem()).getMaterial();
-        }catch(Exception e){
+        return true;
+    }
+
+    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
+        if (!doesArmorHaveMaterial(material, player)) {
             return false;
         }
 
+        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
+        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
         ArmorItem breastplate = ((ArmorItem)player.getInventory().getArmorStack(2).getItem());
         ArmorItem helmet = ((ArmorItem)player.getInventory().getArmorStack(3).getItem());
 

diff --git a/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorFrozenDiamond.java b/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorFrozenDiamond.java
@@ -83,17 +83,25 @@ private boolean hasFullSuitOfArmorOn(PlayerEntity player) {
                 && !leggings.isEmpty() && !boots.isEmpty();
     }
 
-    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
-        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
-        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
+    private boolean doesArmorHaveMaterial(ArmorMaterial material, PlayerEntity player) {
+        for (int i=0; i<4; i++) {
+            try{
+                ((ArmorItem)player.getInventory().getArmorStack(i).getItem()).getMaterial();
+            }catch(Exception e){
+                return false;
+            }
+        }
 
-        // elytra bug fix
-        try{
-            ((ArmorItem)player.getInventory().getArmorStack(2).getItem()).getMaterial();
-        }catch(Exception e){
+        return true;
+    }
+
+    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
+        if (!doesArmorHaveMaterial(material, player)) {
             return false;
         }
 
+        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
+        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
         ArmorItem breastplate = ((ArmorItem)player.getInventory().getArmorStack(2).getItem());
         ArmorItem helmet = ((ArmorItem)player.getInventory().getArmorStack(3).getItem());
 

diff --git a/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorHardenedIce.java b/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorHardenedIce.java
@@ -83,17 +83,25 @@ private boolean hasFullSuitOfArmorOn(PlayerEntity player) {
                 && !leggings.isEmpty() && !boots.isEmpty();
     }
 
-    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
-        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
-        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
+    private boolean doesArmorHaveMaterial(ArmorMaterial material, PlayerEntity player) {
+        for (int i=0; i<4; i++) {
+            try{
+                ((ArmorItem)player.getInventory().getArmorStack(i).getItem()).getMaterial();
+            }catch(Exception e){
+                return false;
+            }
+        }
 
-        // elytra bug fix
-        try{
-            ((ArmorItem)player.getInventory().getArmorStack(2).getItem()).getMaterial();
-        }catch(Exception e){
+        return true;
+    }
+
+    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
+        if (!doesArmorHaveMaterial(material, player)) {
             return false;
         }
 
+        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
+        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
         ArmorItem breastplate = ((ArmorItem)player.getInventory().getArmorStack(2).getItem());
         ArmorItem helmet = ((ArmorItem)player.getInventory().getArmorStack(3).getItem());
 

diff --git a/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorMarineDiamond.java b/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorMarineDiamond.java
@@ -82,17 +82,25 @@ private boolean hasFullSuitOfArmorOn(PlayerEntity player) {
                 && !leggings.isEmpty() && !boots.isEmpty();
     }
 
-    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
-        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
-        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
+    private boolean doesArmorHaveMaterial(ArmorMaterial material, PlayerEntity player) {
+        for (int i=0; i<4; i++) {
+            try{
+                ((ArmorItem)player.getInventory().getArmorStack(i).getItem()).getMaterial();
+            }catch(Exception e){
+                return false;
+            }
+        }
 
-        // elytra bug fix
-        try{
-            ((ArmorItem)player.getInventory().getArmorStack(2).getItem()).getMaterial();
-        }catch(Exception e){
+        return true;
+    }
+
+    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
+        if (!doesArmorHaveMaterial(material, player)) {
             return false;
         }
 
+        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
+        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
         ArmorItem breastplate = ((ArmorItem)player.getInventory().getArmorStack(2).getItem());
         ArmorItem helmet = ((ArmorItem)player.getInventory().getArmorStack(3).getItem());
 

diff --git a/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorNetherBrick.java b/src/main/java/net/aleganza/plentyofarmors/item/custom/ModArmorNetherBrick.java
@@ -81,17 +81,25 @@ private boolean hasFullSuitOfArmorOn(PlayerEntity player) {
                 && !leggings.isEmpty() && !boots.isEmpty();
     }
 
-    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
-        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
-        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
+    private boolean doesArmorHaveMaterial(ArmorMaterial material, PlayerEntity player) {
+        for (int i=0; i<4; i++) {
+            try{
+                ((ArmorItem)player.getInventory().getArmorStack(i).getItem()).getMaterial();
+            }catch(Exception e){
+                return false;
+            }
+        }
 
-        // elytra bug fix
-        try{
-            ((ArmorItem)player.getInventory().getArmorStack(2).getItem()).getMaterial();
-        }catch(Exception e){
+        return true;
+    }
+
+    private boolean hasCorrectArmorOn(ArmorMaterial material, PlayerEntity player) {
+        if (!doesArmorHaveMaterial(material, player)) {
             return false;
         }
 
+        ArmorItem boots = ((ArmorItem)player.getInventory().getArmorStack(0).getItem());
+        ArmorItem leggings = ((ArmorItem)player.getInventory().getArmorStack(1).getItem());
         ArmorItem breastplate = ((ArmorItem)player.getInventory().getArmorStack(2).getItem());
         ArmorItem helmet = ((ArmorItem)player.getInventory().getArmorStack(3).getItem());