SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Read entire file to string, check for null before returning. #315

Browse Source
This commit is contained in:
libraryaddict 2018-11-19 16:55:32 +13:00
parent e6752903b4
commit dcff07e5bb
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java
View File

@ -24,6 +24,7 @@ import me.libraryaddict.disguise.disguisetypes.watchers.PlayerWatcher;
import me.libraryaddict.disguise.disguisetypes.watchers.ZombieWatcher; import me.libraryaddict.disguise.disguisetypes.watchers.ZombieWatcher;
import me.libraryaddict.disguise.utilities.PacketsManager.LibsPackets; import me.libraryaddict.disguise.utilities.PacketsManager.LibsPackets;
import me.libraryaddict.disguise.utilities.json.*; import me.libraryaddict.disguise.utilities.json.*;
import org.apache.commons.io.FileUtils;
import org.apache.logging.log4j.util.Strings; import org.apache.logging.log4j.util.Strings;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Location; import org.bukkit.Location;
@ -216,11 +217,13 @@ public class DisguiseUtilities {
} }
public static Disguise[] getSavedDisguises(UUID entityUUID, boolean remove) { public static Disguise[] getSavedDisguises(UUID entityUUID, boolean remove) {
if (!isSavedDisguise(entityUUID) || !LibsPremium.isPremium()) if (!isSavedDisguise(entityUUID) || !LibsPremium.isPremium()) {
return new Disguise[0]; return new Disguise[0];
}
if (!savedDisguises.exists()) if (!savedDisguises.exists()) {
savedDisguises.mkdirs(); savedDisguises.mkdirs();
}
File disguiseFile = new File(savedDisguises, entityUUID.toString()); File disguiseFile = new File(savedDisguises, entityUUID.toString());
@ -230,15 +233,19 @@ public class DisguiseUtilities {
} }
try { try {
BufferedReader reader = new BufferedReader(new FileReader(disguiseFile)); String cached = FileUtils.readFileToString(disguiseFile, "UTF-8");
String cached = reader.readLine();
reader.close();
if (remove) { if (remove) {
removeSavedDisguise(entityUUID); removeSavedDisguise(entityUUID);
} }
return gson.fromJson(cached, Disguise[].class); Disguise[] disguises = gson.fromJson(cached, Disguise[].class);
if (disguises == null) {
return new Disguise[0];
}
return disguises;
} }
catch (Exception e) { catch (Exception e) {
getLogger().severe("Malformed disguise for " + entityUUID); getLogger().severe("Malformed disguise for " + entityUUID);