From df3a3569f59879c8a5ea563c3637e30a2cdfacea Mon Sep 17 00:00:00 2001 From: Magnus Ulf Date: Sat, 12 Oct 2019 22:39:34 +0200 Subject: [PATCH] Add null check --- src/com/massivecraft/massivecore/store/Coll.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/massivecraft/massivecore/store/Coll.java b/src/com/massivecraft/massivecore/store/Coll.java index ca633f89..620f0ca2 100644 --- a/src/com/massivecraft/massivecore/store/Coll.java +++ b/src/com/massivecraft/massivecore/store/Coll.java @@ -6,14 +6,15 @@ import com.google.gson.JsonObject; import com.google.gson.JsonSyntaxException; import com.massivecraft.massivecore.ConfServer; import com.massivecraft.massivecore.MassiveCore; -import com.massivecraft.massivecore.entity.MassiveCoreMConf; import com.massivecraft.massivecore.MassivePlugin; import com.massivecraft.massivecore.collections.MassiveList; import com.massivecraft.massivecore.comparator.ComparatorNaturalOrder; +import com.massivecraft.massivecore.entity.MassiveCoreMConf; import com.massivecraft.massivecore.mixin.MixinModification; import com.massivecraft.massivecore.store.migrator.MigratorUtil; import com.massivecraft.massivecore.util.MUtil; import com.massivecraft.massivecore.util.Txt; +import com.mongodb.DB; import org.apache.commons.lang.StringUtils; import org.bukkit.Bukkit; import org.bukkit.plugin.Plugin; @@ -906,7 +907,9 @@ public class Coll> extends CollAbstract public Db calculateDb() { - return MStore.getDb(); + Db db = MStore.getDb(); + if (db == null) throw new NullPointerException("db"); + return db; } @Override