From 1d071b1a395f9b05f33fb03a5c4faf1c0014d972 Mon Sep 17 00:00:00 2001 From: Flemmli97 Date: Fri, 10 Mar 2023 23:13:07 +0100 Subject: [PATCH] add nullcheck for claimblocks reading (e.g. caused by editing offline data) fix #226 --- .../io/github/flemmli97/flan/player/PlayerClaimData.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java b/common/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java index 73b82c9..9581b93 100644 --- a/common/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java +++ b/common/src/main/java/io/github/flemmli97/flan/player/PlayerClaimData.java @@ -1,5 +1,6 @@ package io.github.flemmli97.flan.player; +import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.stream.JsonReader; import com.google.gson.stream.JsonWriter; @@ -449,7 +450,9 @@ public class PlayerClaimData implements IPlayerData { JsonObject obj = ConfigHandler.GSON.fromJson(reader, JsonObject.class); reader.close(); 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(); JsonObject defP = ConfigHandler.fromJson(obj, "DefaultGroups"); defP.entrySet().forEach(e -> {