From 57c6955d6a82f1d9b701029590a2f6966c257be2 Mon Sep 17 00:00:00 2001
From: Eric <biederteric.eb@gmail.com>
Date: Fri, 1 Jul 2016 14:33:13 +0200
Subject: [PATCH] Creation price should only be withdrawn if the shop is
 created successfully

---
 src/de/epiceric/shopchest/Commands.java                  | 9 +--------
 .../shopchest/listeners/ShopInteractListener.java        | 7 +++++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/de/epiceric/shopchest/Commands.java b/src/de/epiceric/shopchest/Commands.java
index 1b4efea..0996ee8 100644
--- a/src/de/epiceric/shopchest/Commands.java
+++ b/src/de/epiceric/shopchest/Commands.java
@@ -13,7 +13,6 @@ import de.epiceric.shopchest.utils.ShopUtils;
 import de.epiceric.shopchest.utils.UpdateChecker;
 import de.epiceric.shopchest.utils.UpdateChecker.UpdateCheckerResult;
 import de.epiceric.shopchest.utils.Utils;
-import net.milkbowl.vault.economy.EconomyResponse;
 import net.milkbowl.vault.permission.Permission;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -316,13 +315,7 @@ public class Commands extends BukkitCommand {
 
         double creationPrice = (shopType == ShopType.NORMAL) ? Config.shop_creation_price_normal : Config.shop_creation_price_admin;
         if (creationPrice > 0) {
-            if (plugin.getEconomy().getBalance(p) >= creationPrice) {
-                EconomyResponse r = plugin.getEconomy().withdrawPlayer(p, creationPrice);
-                if (!r.transactionSuccess()) {
-                    p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.ERROR_OCCURRED, new LocalizedMessage.ReplacedRegex(Regex.ERROR, r.errorMessage)));
-                    return;
-                }
-            } else {
+            if (plugin.getEconomy().getBalance(p) < creationPrice) {
                 p.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.SHOP_CREATE_NOT_ENOUGH_MONEY, new LocalizedMessage.ReplacedRegex(Regex.CREATION_PRICE, String.valueOf(creationPrice))));
                 return;
             }
diff --git a/src/de/epiceric/shopchest/listeners/ShopInteractListener.java b/src/de/epiceric/shopchest/listeners/ShopInteractListener.java
index 9118da5..536b3fc 100644
--- a/src/de/epiceric/shopchest/listeners/ShopInteractListener.java
+++ b/src/de/epiceric/shopchest/listeners/ShopInteractListener.java
@@ -242,6 +242,13 @@ public class ShopInteractListener implements Listener {
             return;
         }
 
+        double creationPrice = (shopType == ShopType.NORMAL) ? Config.shop_creation_price_normal : Config.shop_creation_price_admin;
+        EconomyResponse r = plugin.getEconomy().withdrawPlayer(executor, creationPrice);
+        if (!r.transactionSuccess()) {
+            executor.sendMessage(LanguageUtils.getMessage(LocalizedMessage.Message.ERROR_OCCURRED, new LocalizedMessage.ReplacedRegex(Regex.ERROR, r.errorMessage)));
+            return;
+        }
+
         Shop shop = new Shop(id, plugin, executor, product, location, buyPrice, sellPrice, shopType);
 
         ShopUtils.addShop(shop, true);