Added better error checking when selling sellchests. Added multiverse as a softdependency so its worlds load first. Updated version.

Author: biscuut

SellChestPlugin/pom.xml

@@ -8,7 +8,7 @@
     <artifactId>SellChestPlugin</artifactId>
     <packaging>jar</packaging>
     <name>SellChestPlugin</name>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
 
     <repositories>
         <repository>

SellChestPlugin/src/main/java/codes/biscuit/sellchest/SellChest.java

@@ -26,17 +26,19 @@ public void onEnable() {
         utils = new Utils(this);
         utils.updateConfig(this);
         hookUtils =  new HookUtils(this);
-        Bukkit.getPluginManager().registerEvents(new PlayerListener(this), this);
-        configValues.setupSellChests();
-        new MetricsLite(this);
-        if (minecraftVersion == -1) {
-            minecraftVersion = Integer.valueOf(Bukkit.getBukkitVersion().split(Pattern.quote("-"))[0].split(Pattern.quote("."))[1]);
+        if (isEnabled()) {
+            Bukkit.getPluginManager().registerEvents(new PlayerListener(this), this);
+            configValues.setupSellChests();
+            new MetricsLite(this);
+            if (minecraftVersion == -1) {
+                minecraftVersion = Integer.valueOf(Bukkit.getBukkitVersion().split(Pattern.quote("-"))[0].split(Pattern.quote("."))[1]);
+            }
         }
     }
 
     @Override
     public void onDisable() {
-        getLogger().info("Saved sellchest locations!");
+        getLogger().info("Saving sellchest locations!");
         utils.saveChestLocations();
     }
 

SellChestPlugin/src/main/java/codes/biscuit/sellchest/hooks/HookUtils.java

@@ -1,19 +1,21 @@
 package codes.biscuit.sellchest.hooks;
 
 import codes.biscuit.sellchest.SellChest;
-import com.sun.org.apache.regexp.internal.RE;
 import net.milkbowl.vault.economy.Economy;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
-import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.plugin.PluginManager;
+import org.bukkit.plugin.RegisteredServiceProvider;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.bukkit.Bukkit.getServer;
+
 public class HookUtils {
 
     private SellChest main;
@@ -23,7 +25,11 @@ public class HookUtils {
 
     public HookUtils(SellChest main) {
         this.main = main;
-        economy = main.getServer().getServicesManager().getRegistration(Economy.class).getProvider();
+        boolean foundEconomy = setupEconomy();
+        if (!foundEconomy) {
+            main.getLogger().severe("Didn't get the economy registration!");
+            main.getPluginLoader().disablePlugin(main);
+        }
         PluginManager pm = main.getServer().getPluginManager();
         if (pm.getPlugin("MassiveCore") != null &&
                 pm.getPlugin("Factions") != null) {
@@ -58,6 +64,19 @@ public HookUtils(SellChest main) {
         }
     }
 
+    private boolean setupEconomy() {
+        if (Bukkit.getPluginManager().getPlugin("Vault") == null) {
+            return false;
+        }
+
+        RegisteredServiceProvider<Economy> rsp = getServer().getServicesManager().getRegistration(Economy.class);
+        if (rsp == null) {
+            return false;
+        }
+        economy = rsp.getProvider();
+        return economy != null;
+    }
+
     public double getValue(ItemStack sellItem, Player p) {
         if (main.getConfigValues().essentialsHookEnabled() && enabledHooks.containsKey(Hooks.ESSENTIALS)) {
             return ((EssentialsHook) enabledHooks.get(Hooks.ESSENTIALS)).getSellPrice(sellItem);

SellChestPlugin/src/main/java/codes/biscuit/sellchest/utils/Utils.java

@@ -73,15 +73,16 @@ public void runSellTimer() {
             while (entryIterator.hasNext()) {
                 Map.Entry<Location, UUID> locationEntry = entryIterator.next();
                 OfflinePlayer offlineP = main.getServer().getOfflinePlayer(locationEntry.getValue());
-                Location loc = locationEntry.getKey();
-                if (loc == null) {
+                Location loc;
+                Block block;
+                try {
+                    loc = locationEntry.getKey();
+                    block = loc.getBlock();
+                } catch (NullPointerException ex) {
+                    ex.printStackTrace();
                     entryIterator.remove();
                     continue;
                 }
-                Block block = loc.getBlock();
-                if (block == null) {
-                    continue;
-                }
                 if (block.getType() == Material.CHEST) {
                     Chest voidChest = (Chest)block.getState();
                     Inventory voidChestInventory = voidChest.getInventory();
@@ -124,11 +125,13 @@ public void saveChestLocations() {
             for (Map.Entry<Location, UUID> entry : chestLocations.entrySet()) {
                 Location loc = entry.getKey();
                 UUID uuid = entry.getValue();
-                String serializedLoc = loc.getWorld().getName() + "|" + loc.getBlockX() + "|" + loc.getBlockY() + "|" + loc.getBlockZ();
-                String uuidString = uuid.toString();
-                List<String> locationList = main.getConfigValues().getLocationsConfig().getStringList("locations." + uuidString);
-                locationList.add(serializedLoc);
-                main.getConfigValues().getLocationsConfig().set("locations." + uuidString, locationList);
+                if (loc != null && uuid != null) {
+                    String serializedLoc = loc.getWorld().getName() + "|" + loc.getBlockX() + "|" + loc.getBlockY() + "|" + loc.getBlockZ();
+                    String uuidString = uuid.toString();
+                    List<String> locationList = main.getConfigValues().getLocationsConfig().getStringList("locations." + uuidString);
+                    locationList.add(serializedLoc);
+                    main.getConfigValues().getLocationsConfig().set("locations." + uuidString, locationList);
+                }
             }
             main.getConfigValues().getLocationsConfig().save(main.getConfigValues().getLocationsFile());
             main.getConfigValues().getLocationsConfig().set("locations", null);

SellChestPlugin/src/main/resources/plugin.yml

@@ -5,7 +5,7 @@ main: codes.biscuit.sellchest.SellChest
 author: Biscut
 description: Automatically sells all items that enter a sellchest.
 depend: [Vault]
-softdepend: [ShopGUIPlus, PlotSquared, Factions, MassiveCore, Essentials, ASkyBlock]
+softdepend: [Multiverse-Core, Vault, ShopGUIPlus, PlotSquared, Factions, MassiveCore, Essentials, ASkyBlock]
 commands:
   sellchest:
     description: The main sellchest command.