Skip to content

Commit

Permalink
fixed cobblemon again
Browse files Browse the repository at this point in the history
  • Loading branch information
Luke100000 committed May 16, 2024
1 parent 3c15bce commit adb50bd
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 7.5.17

* Now its compatible with Cobblemon!

# 7.5.16

* Fixed issues with building jars
Expand Down
2 changes: 2 additions & 0 deletions common/src/main/java/net/mca/resources/Dialogues.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit adb50bd

Please sign in to comment.