Fixed price calculation for items with discounts

Leonidius20 · Aug 11, 2018 · 3b2f714 · 3b2f714
1 parent 9086e94
commit 3b2f714
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/main/java/ua/leonidius/trading/buy/Buy.java b/src/main/java/ua/leonidius/trading/buy/Buy.java
@@ -74,14 +74,18 @@ public static double getPrice (Item item) {
         int id = item.getId();
         int meta = item.getDamage();
         String key = "b-"+id+"-"+meta;
+
         double priceWithoutDiscount = Main.buycfg.getDouble(key);
-        double priceWithDiscount = priceWithoutDiscount;
+
         String discountKey = "d-"+id+"-"+meta;
+
         if (Main.discountCfg.exists(discountKey)) {
-            double discountModifier = Main.discountCfg.getDouble(discountKey)/100;
-            priceWithDiscount = priceWithoutDiscount*discountModifier;
+            double discountPercent = Main.discountCfg.getDouble(discountKey);
+            double discount = (priceWithoutDiscount * discountPercent) / 100;
+            return priceWithoutDiscount - discount;
         }
-        return priceWithDiscount;
+
+        return priceWithoutDiscount;
     }
 
     private static int getMaxByMoney(Player player, Item item){

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
 name: Trading Commands
 main: ua.leonidius.trading.Main
-version: 1.0.2
+version: 1.0.3
 author: Leonidius20
 api: ["1.0.0"]
 description: Shop and auction system, based on commands.