From 8427ead097f4f690da308984ffff851b87e433d3 Mon Sep 17 00:00:00 2001 From: Jonathan Williams Date: Sat, 19 Mar 2016 15:33:16 -0500 Subject: [PATCH] Changed how currency types is initialized to avoid possible NPE --- Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java b/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java index d2fe4c26e..31a6065c9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java @@ -36,7 +36,7 @@ public abstract class ShopBase implements Listene private NautHashMap _errorThrottling; private NautHashMap _purchaseBlock; - private List _availableCurrencyTypes; + private List _availableCurrencyTypes = new ArrayList(); private PluginType _plugin; private CoreClientManager _clientManager; @@ -57,8 +57,8 @@ public abstract class ShopBase implements Listene _errorThrottling = new NautHashMap(); _purchaseBlock = new NautHashMap(); - _availableCurrencyTypes = new ArrayList(); - _availableCurrencyTypes.addAll(Arrays.asList(currencyTypes)); + if (currencyTypes != null && currencyTypes.length > 0) + _availableCurrencyTypes.addAll(Arrays.asList(currencyTypes)); _plugin.registerEvents(this); }