From 6ab689f0908531fe548469f04c2cbbbd5476427b Mon Sep 17 00:00:00 2001 From: Pepich Date: Tue, 9 May 2017 10:57:18 +0200 Subject: [PATCH] Added getOrDefault methods --- .../redstoner/modules/datamanager/DataManager.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/com/redstoner/modules/datamanager/DataManager.java b/src/com/redstoner/modules/datamanager/DataManager.java index 9293f7b..187beaf 100644 --- a/src/com/redstoner/modules/datamanager/DataManager.java +++ b/src/com/redstoner/modules/datamanager/DataManager.java @@ -21,7 +21,7 @@ import com.redstoner.misc.Utils; import com.redstoner.modules.CoreModule; @AutoRegisterListener -@Version(major = 3, minor = 0, revision = 3, compatible = 3) +@Version(major = 3, minor = 0, revision = 4, compatible = 3) public final class DataManager implements CoreModule, Listener { private static final File dataFolder = new File(Main.plugin.getDataFolder(), "data"); @@ -68,6 +68,18 @@ public final class DataManager implements CoreModule, Listener data.put(id.toString(), playerData); } + public static Object getOrDefault(CommandSender sender, String key, Object fallback) + { + Object o = getData(sender, Utils.getCaller(DataManager.class), key); + return o == null ? fallback : o; + } + + public static Object getOrDefault(CommandSender sender, String module, String key, Object fallback) + { + Object o = getData(sender, module, key); + return o == null ? fallback : o; + } + public static Object getData(CommandSender sender, String key) { return getData(sender, Utils.getCaller(DataManager.class), key);