SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added a null check to deserialize & serialize method for the LocationTypeAdapter.

Browse Source
This commit is contained in:
ProSavage 2018-10-23 13:20:20 -05:00
parent 9aeb70404d
commit 558b7bcd2c
3 changed files with 93 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/massivecraft/factions/SavageFactions.java
View File

@ -215,11 +215,8 @@ public class SavageFactions extends MPlugin {
} }
this.setupPlaceholderAPI();
this.postEnable();
setupPlaceholderAPI();
postEnable();
this.loadSuccessful = true; this.loadSuccessful = true;
} }

2
src/main/java/com/massivecraft/factions/util/LazyLocation.java
View File

@ -12,7 +12,7 @@ import java.io.Serializable;
*/ */
public class LazyLocation implements Serializable { public class LazyLocation implements Serializable {
private static final long serialVersionUID = -6049901271320963314L; private static final long serialVersionUID = - 6049901271320963314L;
private transient Location location = null; private transient Location location = null;
private String worldName; private String worldName;
private double x; private double x;

18
src/main/java/com/massivecraft/factions/util/LocationTypeAdapter.java
View File

@ -1,32 +1,48 @@
package com.massivecraft.factions.util; package com.massivecraft.factions.util;
import com.google.gson.*; import com.google.gson.*;
import com.massivecraft.factions.SavageFactions;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
import java.lang.reflect.Type; import java.lang.reflect.Type;
import java.util.logging.Level;
public class LocationTypeAdapter implements JsonSerializer<Location>, JsonDeserializer<Location> { public class LocationTypeAdapter implements JsonSerializer<Location>, JsonDeserializer<Location> {
@Override @Override
public JsonElement serialize(Location location, Type type, JsonSerializationContext jsonSerializationContext) { public JsonElement serialize(Location location, Type type, JsonSerializationContext jsonSerializationContext) {
JsonObject object = new JsonObject(); JsonObject object = new JsonObject();
try {
object.add("x", new JsonPrimitive(location.getX())); object.add("x", new JsonPrimitive(location.getX()));
object.add("y", new JsonPrimitive(location.getY())); object.add("y", new JsonPrimitive(location.getY()));
object.add("z", new JsonPrimitive(location.getZ())); object.add("z", new JsonPrimitive(location.getZ()));
object.add("world", new JsonPrimitive(location.getWorld().toString())); object.add("world", new JsonPrimitive(location.getWorld().toString()));
return object; return object;
} catch (Exception ex) {
ex.printStackTrace();
SavageFactions.plugin.log(Level.WARNING, "Error encountered while serializing a Location.");
return object;
}
} }
@Override @Override
public Location deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) { public Location deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) {
JsonObject object = jsonElement.getAsJsonObject(); JsonObject object = jsonElement.getAsJsonObject();
try {
return new Location(Bukkit.getWorld(object.get("world").getAsString()), return new Location(Bukkit.getWorld(object.get("world").getAsString()),
object.get("x").getAsDouble(), object.get("x").getAsDouble(),
object.get("y").getAsDouble(), object.get("y").getAsDouble(),
object.get("z").getAsDouble()); object.get("z").getAsDouble());
} catch (Exception ex) {
ex.printStackTrace();
SavageFactions.plugin.log(Level.WARNING, "Error encountered while" +
" deserializing a Location.");
return null;
}
} }