add nullcheck for claimblocks reading (e.g. caused by editing offline data) fix #226
This commit is contained in:
parent
17ee9d2355
commit
1d071b1a39
@ -1,5 +1,6 @@
|
|||||||
package io.github.flemmli97.flan.player;
|
package io.github.flemmli97.flan.player;
|
||||||
|
|
||||||
|
import com.google.gson.JsonElement;
|
||||||
import com.google.gson.JsonObject;
|
import com.google.gson.JsonObject;
|
||||||
import com.google.gson.stream.JsonReader;
|
import com.google.gson.stream.JsonReader;
|
||||||
import com.google.gson.stream.JsonWriter;
|
import com.google.gson.stream.JsonWriter;
|
||||||
@ -449,7 +450,9 @@ public class PlayerClaimData implements IPlayerData {
|
|||||||
JsonObject obj = ConfigHandler.GSON.fromJson(reader, JsonObject.class);
|
JsonObject obj = ConfigHandler.GSON.fromJson(reader, JsonObject.class);
|
||||||
reader.close();
|
reader.close();
|
||||||
Flan.debug("Read following json data {} from file {}", obj, file.getFileName());
|
Flan.debug("Read following json data {} from file {}", obj, file.getFileName());
|
||||||
this.claimBlocks = obj.get("ClaimBlocks").getAsInt();
|
JsonElement claimBlockEl = obj.get("ClaimBlocks");
|
||||||
|
if (claimBlockEl.isJsonPrimitive())
|
||||||
|
this.claimBlocks = claimBlockEl.getAsInt();
|
||||||
this.additionalClaimBlocks = obj.get("AdditionalBlocks").getAsInt();
|
this.additionalClaimBlocks = obj.get("AdditionalBlocks").getAsInt();
|
||||||
JsonObject defP = ConfigHandler.fromJson(obj, "DefaultGroups");
|
JsonObject defP = ConfigHandler.fromJson(obj, "DefaultGroups");
|
||||||
defP.entrySet().forEach(e -> {
|
defP.entrySet().forEach(e -> {
|
||||||
|
Loading…
Reference in New Issue
Block a user