From 91f9ec7c0c7d9a11a35db905be520f5cf6b6743e Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Sun, 15 Sep 2013 10:06:14 +0200 Subject: [PATCH] JSON errors are sometimes IllegalStateExceptions. Fixes #43 --- src/com/massivecraft/mcore/store/Coll.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/massivecraft/mcore/store/Coll.java b/src/com/massivecraft/mcore/store/Coll.java index b91ed21d..ba18cb29 100644 --- a/src/com/massivecraft/mcore/store/Coll.java +++ b/src/com/massivecraft/mcore/store/Coll.java @@ -518,9 +518,9 @@ public class Coll implements CollInterface { entry = this.getDriver().load(this, id); } - catch (JsonSyntaxException e) + catch (Exception e) { - MCore.get().log(Txt.parse("Database could not load entity. Invalid JSON syntax. You edited a file manually and did it wrong?")); + MCore.get().log(Txt.parse("Database could not load entity. You edited a file manually and made wrong JSON?")); MCore.get().log(Txt.parse("Error: %s", e.getMessage())); MCore.get().log(Txt.parse("Entity: %s", id)); MCore.get().log(Txt.parse("Collection: %s", this.getName()));