Merge branch '1.19.4-old' into trunk

DragonEggBedrockBreaking · Jun 8, 2023 · 2e45385 · 2e45385
2 parents ed6ee20 + 80d4eb5
commit 2e45385
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/uk/debb/vanilla_disable/mixin/advancement/MixinPlayerAdvancements.java b/src/main/java/uk/debb/vanilla_disable/mixin/advancement/MixinPlayerAdvancements.java
@@ -14,10 +14,12 @@ public abstract class MixinPlayerAdvancements implements Maps {
     @ModifyReturnValue(method = "getOrStartProgress", at = @At("RETURN"))
     private AdvancementProgress cancelPerformingCriterion(AdvancementProgress original, Advancement advancement) {
         if (advancement.getDisplay() != null) {
-            Gamerules gameRule = playerAdvancementsStringMap.get(advancement.getDisplay().getTitle().toString().split("'")[1]);
-            if (!Gamerules.ADVANCEMENTS_ENABLED.getBool() || (gameRule != null && !gameRule.getBool())) {
-                return new AdvancementProgress();
-            }
+            try {
+                Gamerules gameRule = playerAdvancementsStringMap.get(advancement.getDisplay().getTitle().toString().split("'")[1]);
+                if (!Gamerules.ADVANCEMENTS_ENABLED.getBool() || (gameRule != null && !gameRule.getBool())) {
+                    return new AdvancementProgress();
+                }
+            } catch (ArrayIndexOutOfBoundsException ignored) {}
         }
         return original;
     }

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "id": "vanilla_disable",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "name": "Vanilla Disable",
   "description": "Allows you to disable a lot of vanilla features.",
   "authors": [