EpicKnarvik97/Factions3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Soon to be used JarLoader.

Browse Source
This commit is contained in:
Olof Larsson
2011-07-27 22:56:45 +02:00
parent 71922b7be3
commit 6e9fd72612
100 changed files with 107 additions and 12326 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/massivecraft/factions/Board.java
View File

@ -12,11 +12,11 @@ import java.util.TreeMap;
import org.bukkit.ChatColor;
import com.massivecraft.factions.gson.JsonArray;
import com.massivecraft.factions.gson.JsonElement;
import com.massivecraft.factions.gson.JsonObject;
import com.massivecraft.factions.gson.JsonParser;
import com.massivecraft.factions.gson.reflect.TypeToken;
import com.google.gson.JsonArray;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import com.google.gson.reflect.TypeToken;
import com.massivecraft.factions.util.AsciiCompass;
import com.massivecraft.factions.util.DiscUtil;
import com.massivecraft.factions.util.TextUtil;
@ -248,7 +248,7 @@ public class Board {
//Factions.log("Saving board to disk");
try {
DiscUtil.write(file, Factions.gson.toJson(dumpAsSaveFormat()));
DiscUtil.write(file, Factions.instance.gson.toJson(dumpAsSaveFormat()));
} catch (Exception e) {
e.printStackTrace();
Factions.log("Failed to save the board to disk.");
@ -270,7 +270,7 @@ public class Board {
try {
Type type = new TypeToken<Map<String,Map<String,Integer>>>(){}.getType();
Map<String,Map<String,Integer>> worldCoordIds = Factions.gson.fromJson(DiscUtil.read(file), type);
Map<String,Map<String,Integer>> worldCoordIds = Factions.instance.gson.fromJson(DiscUtil.read(file), type);
loadFromSaveFormat(worldCoordIds);
} catch (Exception e) {
e.printStackTrace();