From adb50bd02015b3b5794284b5a9b1073c8b8b579d Mon Sep 17 00:00:00 2001
From: Luke100000 <jonas.peche@aon.at>
Date: Thu, 16 May 2024 18:58:56 +0200
Subject: [PATCH] fixed cobblemon again

---
 changelog.md                                          | 4 ++++
 common/src/main/java/net/mca/resources/Dialogues.java | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/changelog.md b/changelog.md
index 4b21178181..c163b023f3 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,7 @@
+# 7.5.17
+
+* Now its compatible with Cobblemon!
+
 # 7.5.16
 
 * Fixed issues with building jars
diff --git a/common/src/main/java/net/mca/resources/Dialogues.java b/common/src/main/java/net/mca/resources/Dialogues.java
index 909762cf31..75703e5989 100644
--- a/common/src/main/java/net/mca/resources/Dialogues.java
+++ b/common/src/main/java/net/mca/resources/Dialogues.java
@@ -46,7 +46,9 @@ private void loadDialogue(Identifier identifier, JsonElement element) {
         String id = identifier.getPath().substring(identifier.getPath().lastIndexOf('/') + 1);
         if (!this.checkIsMcaDialogue(element)) {
             MCA.LOGGER.warn("Dialogue {} is not properly formatted, not loading", identifier);
+            return;
         }
+
         Question q = Question.fromJson(id, element.getAsJsonObject());
 
         // Merge questions to allow injections