Rx3/MassiveCore
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Say what entity load failed and why in a nicer manner.

Browse Source
This commit is contained in:
Olof Larsson 2013-08-29 08:37:31 +02:00
parent 5a2ef78d58
commit 6810d92b68
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/com/massivecraft/mcore/store/Coll.java
View File

@ -18,8 +18,10 @@ import com.massivecraft.mcore.MPlugin;
import com.massivecraft.mcore.NaturalOrderComparator; import com.massivecraft.mcore.NaturalOrderComparator;
import com.massivecraft.mcore.Predictate; import com.massivecraft.mcore.Predictate;
import com.massivecraft.mcore.store.accessor.Accessor; import com.massivecraft.mcore.store.accessor.Accessor;
import com.massivecraft.mcore.util.Txt;
import com.massivecraft.mcore.xlib.gson.Gson; import com.massivecraft.mcore.xlib.gson.Gson;
import com.massivecraft.mcore.xlib.gson.JsonElement; import com.massivecraft.mcore.xlib.gson.JsonElement;
import com.massivecraft.mcore.xlib.gson.JsonSyntaxException;
public class Coll<E> implements CollInterface<E> public class Coll<E> implements CollInterface<E>
{ {
@ -498,7 +500,19 @@ public class Coll<E> implements CollInterface<E>
this.clearIdentifiedChanges(id); this.clearIdentifiedChanges(id);
Entry<JsonElement, Long> entry = this.getDriver().load(this, id); Entry<JsonElement, Long> entry = null;
try
{
entry = this.getDriver().load(this, id);
}
catch (JsonSyntaxException e)
{
MCore.get().log(Txt.parse("<b>Database could not load entity. Invalid JSON syntax. You edited a file manually and did it wrong?"));
MCore.get().log(Txt.parse("<k>Error: <v>%s", e.getMessage()));
MCore.get().log(Txt.parse("<k>Entity: <v>%s", id));
MCore.get().log(Txt.parse("<k>Collection: <v>%s", this.getName()));
return;
}
if (entry == null) return; if (entry == null) return;
JsonElement raw = entry.getKey(); JsonElement raw = entry.getKey();