From a8140f8cb0a433c1d782dc2173fa0d0a47e212c4 Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Sun, 15 Nov 2015 20:52:32 +1100 Subject: [PATCH] Check if no metadata is set. --- .../plot/object/PlotPlayer.java | 2 +- target/PlotSquared-Bukkit.jar | Bin 1374420 -> 1374436 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java b/src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java index 8ac62a051..bf6804dfe 100644 --- a/src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java +++ b/src/main/java/com/intellectualcrafters/plot/object/PlotPlayer.java @@ -81,7 +81,7 @@ public abstract class PlotPlayer implements CommandCaller { * @param key */ public Object deleteMeta(final String key) { - return meta.remove(key); + return meta == null ? null : meta.remove(key); } /** diff --git a/target/PlotSquared-Bukkit.jar b/target/PlotSquared-Bukkit.jar index e530ba5c135202b110d9ceaa51cbb44638ab59e5..feca0c367693cae8ccdd4ab50425b0547b1e5b1c 100644 GIT binary patch delta 7987 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 ?4aJ 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