From 7adec100020b407156efe59155ebc9132c1c200c Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Thu, 22 Dec 2016 15:54:45 +0100 Subject: [PATCH] fixed possible NPE --- .../java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java b/src/main/java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java index 5e00b45..b1d49af 100644 --- a/src/main/java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java +++ b/src/main/java/com/sosnitzka/taiga/world/MeteorWorldSaveData.java @@ -1,5 +1,6 @@ package com.sosnitzka.taiga.world; +import com.google.common.reflect.TypeToken; import com.google.gson.Gson; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.math.BlockPos; @@ -53,8 +54,8 @@ public class MeteorWorldSaveData extends WorldSavedData { @Override public void readFromNBT(NBTTagCompound nbt) { - if (nbt.hasKey("posData")) { - posList = new Gson().fromJson(nbt.getString("posData"), posList.getClass()); + if (nbt.hasKey("posData") && !nbt.getString("posData").isEmpty()) { + posList = new Gson().fromJson(nbt.getString("posData"), new TypeToken>(){}.getType()); } }