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

attempt to handle an NPE someone has been getting in MyLocationTypeAdapter.serialize()

Browse Source
This commit is contained in:
Brettflan 2011-03-28 14:38:07 -05:00
parent 62ecceca5f
commit ebde7bcc1a
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/bukkit/mcteam/factions/Faction.java
View File

@ -332,7 +332,11 @@ public class Faction {
try { try {
DiscUtil.write(file, Factions.gson.toJson(instances)); DiscUtil.write(file, Factions.gson.toJson(instances));
} catch (IOException e) { } catch (IOException e) {
Factions.log("Failed to save the factions to disk."); Factions.log("Failed to save the factions to disk due to I/O exception.");
e.printStackTrace();
return false;
} catch (NullPointerException e) {
Factions.log("Failed to save the factions to disk due to NPE.");
e.printStackTrace(); e.printStackTrace();
return false; return false;
} }

11
src/com/bukkit/mcteam/factions/MyLocationTypeAdapter.java
View File

@ -39,6 +39,17 @@ public class MyLocationTypeAdapter implements JsonDeserializer<Location>, JsonSe
public JsonElement serialize(Location src, Type typeOfSrc, JsonSerializationContext context) { public JsonElement serialize(Location src, Type typeOfSrc, JsonSerializationContext context) {
JsonObject obj = new JsonObject(); JsonObject obj = new JsonObject();
if (src == null)
{
Factions.log("Passed location is null in MyLocationTypeAdapter.");
return obj;
}
else if (src.getWorld() == null)
{
Factions.log("Passed location's world is null in MyLocationTypeAdapter.");
return obj;
}
obj.addProperty(WORLD, src.getWorld().getName()); obj.addProperty(WORLD, src.getWorld().getName());
obj.addProperty(X, src.getX()); obj.addProperty(X, src.getX());
obj.addProperty(Y, src.getY()); obj.addProperty(Y, src.getY());