Even more broken database suggestions. Fixes Factions#685.
This commit is contained in:
parent
8fda66ff8c
commit
6e669d376f
@ -556,19 +556,34 @@ public class Coll<E> implements CollInterface<E>
|
|||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
MassiveCore.get().log(Txt.parse("<b>Database could not load entity. You edited a file manually and made wrong JSON?"));
|
logLoadError(id, e.getMessage());
|
||||||
MassiveCore.get().log(Txt.parse("<k>Error: <v>%s", e.getMessage()));
|
return;
|
||||||
MassiveCore.get().log(Txt.parse("<k>Entity: <v>%s", id));
|
}
|
||||||
MassiveCore.get().log(Txt.parse("<k>Collection: <v>%s", this.getName()));
|
|
||||||
|
if (entry == null)
|
||||||
|
{
|
||||||
|
logLoadError(id, "MStore driver could not load data entry. The file might not be readable or simply not exist.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (entry == null) return;
|
|
||||||
|
|
||||||
JsonElement raw = entry.getKey();
|
JsonElement raw = entry.getKey();
|
||||||
if (raw == null) return;
|
if (raw == null)
|
||||||
|
{
|
||||||
|
logLoadError(id, "Raw data was null. Is the file completely empty?");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (raw.isJsonNull())
|
||||||
|
{
|
||||||
|
logLoadError(id, "Raw data was JSON null. It seems you have a file containing just the word \"null\". Why would you do this?");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
Long mtime = entry.getValue();
|
Long mtime = entry.getValue();
|
||||||
if (mtime == null) return;
|
if (mtime == null)
|
||||||
|
{
|
||||||
|
logLoadError(id, "Last modification time (mtime) was null.");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Calculate temp but handle raw cases.
|
// Calculate temp but handle raw cases.
|
||||||
E temp = null;
|
E temp = null;
|
||||||
@ -603,6 +618,14 @@ public class Coll<E> implements CollInterface<E>
|
|||||||
this.lastDefault.remove(id);
|
this.lastDefault.remove(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void logLoadError(String entityId, String error)
|
||||||
|
{
|
||||||
|
MassiveCore.get().log(Txt.parse("<b>Database could not load entity. You edited a file manually and made wrong JSON?"));
|
||||||
|
MassiveCore.get().log(Txt.parse("<k>Entity: <v>%s", entityId));
|
||||||
|
MassiveCore.get().log(Txt.parse("<k>Collection: <v>%s", this.getName()));
|
||||||
|
MassiveCore.get().log(Txt.parse("<k>Error: <v>%s", error));
|
||||||
|
}
|
||||||
|
|
||||||
// -------------------------------------------- //
|
// -------------------------------------------- //
|
||||||
// SYNC DECIDE AND BASIC DO
|
// SYNC DECIDE AND BASIC DO
|
||||||
// -------------------------------------------- //
|
// -------------------------------------------- //
|
||||||
|
Loading…
Reference in New Issue
Block a user