2.75

ChestShop-authors · Jun 5, 2011 · e25be8f · e25be8f
1 parent 7da9232
commit e25be8f
Show file tree

Hide file tree

Showing 12 changed files with 384 additions and 207 deletions.
diff --git a/com/Acrobot/iConomyChestShop/DBqueue.java b/com/Acrobot/iConomyChestShop/DBqueue.java
@@ -19,8 +19,10 @@ public static void saveQueue(){
     }
 
     public static void saveQueueOnExit(){
-        iConomyChestShop.getPlugin().getDatabase().save(queue);
-        queue.clear();
+        try{
+            iConomyChestShop.getPlugin().getDatabase().save(queue);
+            queue.clear();
+        }catch (Exception ignored){}
     }
 
     public void run(){

diff --git a/com/Acrobot/iConomyChestShop/Shop.java b/com/Acrobot/iConomyChestShop/Shop.java
@@ -2,6 +2,8 @@
 
 import com.Acrobot.iConomyChestShop.Chests.ChestObject;
 import com.Acrobot.iConomyChestShop.Chests.MinecraftChest;
+
+import org.bukkit.Location;
 import org.bukkit.block.Sign;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -71,12 +73,14 @@ public boolean buy(Player player){
             EconomyManager.add(owner, getBuyPrice());
         }else{
             String account = ConfigManager.getString("serverAccountName");
-            if(!account.equals("") && EconomyManager.hasAccount(account)){
+            if(account != null && EconomyManager.hasAccount(account)){
                 EconomyManager.add(account, getSellPrice());
             }
         }
         stock.setAmount(stockAmount);
         Basic.addItemToInventory(player.getInventory(), stock, stockAmount);
+
+        //player.getInventory().addItem(stock);
         player.updateInventory();
 
         //////////////PAYMENT////////////////
@@ -109,7 +113,7 @@ public boolean sell(Player player){
             EconomyManager.substract(owner, getSellPrice());
         }else{
             String account = ConfigManager.getString("serverAccountName");
-            if(!account.equals("") && EconomyManager.hasAccount(account)){
+            if(account != null && EconomyManager.hasAccount(account)){
                 EconomyManager.substract(account, getSellPrice());
             }
         }

diff --git a/com/Acrobot/iConomyChestShop/SignManager.java b/com/Acrobot/iConomyChestShop/SignManager.java
@@ -104,6 +104,11 @@ public void onSignChange(SignChangeEvent event) {
                     p.sendMessage(ConfigManager.getLanguage("Negative_price"));
                     return;
                 }
+                if(!priceIsOK(text[2]) && !isAdmin){
+                	p.sendMessage(ConfigManager.getLanguage("Incorrect_price"));
+                	Basic.cancelEventAndDropSign(event);
+                	return;
+                }
                 if (Integer.parseInt(text[1]) < 1) {
                     Basic.cancelEventAndDropSign(event);
                     p.sendMessage(ConfigManager.getLanguage("Incorrect_item_amount"));
@@ -172,12 +177,14 @@ public void onSignChange(SignChangeEvent event) {
         }
     }
 
-    private boolean priceIsOK(String signLine, Material item) {
-        Double maxPrice = ConfigManager.getDouble(item.getId() + ".maxPrice");
-        Double minPrice = ConfigManager.getDouble(item.getId() + ".minPrice");
+    private boolean priceIsOK(String signLine) {
+        Double maxPrice = ConfigManager.getDouble("maxPrice");
+        Double minPrice = ConfigManager.getDouble("minPrice");
         Float buyPrice = buyPrice(signLine);
         Float sellPrice = sellPrice(signLine);
-        return !(maxPrice != -1 && (buyPrice > maxPrice || sellPrice > maxPrice)) && !(minPrice != -1 && (buyPrice < maxPrice || sellPrice < maxPrice));
+
+        System.out.println(maxPrice + " " + minPrice + " " + buyPrice + " " + sellPrice);
+        return !(maxPrice != -1 && (buyPrice > maxPrice || sellPrice > maxPrice)) && !(minPrice != -1 && (buyPrice < minPrice || sellPrice < minPrice));
     }
 
 
@@ -197,13 +204,13 @@ public static boolean mySign(String text[]) {
     public static float buyPrice(String text) {
         text = text.replace(" ", "");
         text = text.toLowerCase();
-        if (!text.contains("b")) {
-            return 0;
-        }
         //text = text.replaceAll("(?!free)[A-Z,a-z]", "");
-        text = text.replace("b", "");
         String bs[] = text.split(":");
         if (bs.length == 1) {
+        	if (!text.contains("b")) {
+                return 0;
+            }
+        	text = text.replace("b", "");
             //text = text.replace("B", "");
             if (text.equals("free")) {
                 return -1;
@@ -232,12 +239,12 @@ public static float buyPrice(Sign sign) {
     public static float sellPrice(String text) {
         text = text.replace(" ", "");
         text = text.toLowerCase();
-        if (!text.contains("s")) {
-            return 0;
-        }
-        text = text.replace("s", "");
         String bs[] = text.split(":");
         if (bs.length == 1) {
+        	if (!text.contains("s")) {
+                return 0;
+            }
+        	text = text.replace("s", "");
             if (text.equals("free")) {
                 return -1;
             }
@@ -246,6 +253,7 @@ public static float sellPrice(String text) {
             }
         } else if (bs.length == 2) {
             text = bs[1];
+            text = text.replace("s", "");
             if (text.equals("free")) {
                 return -1;
             }

diff --git a/com/Acrobot/iConomyChestShop/iConomyChestShop.java b/com/Acrobot/iConomyChestShop/iConomyChestShop.java
@@ -219,10 +219,10 @@ public static iConomyChestShop getPlugin(){
     }
 
     public void onDisable() {
+        DBqueue.saveQueueOnExit();
+        this.getServer().getScheduler().cancelAllTasks();
         PluginDescriptionFile pdfFile = this.getDescription();
         System.out.println("[" + pdfFile.getName() + "]"  + " version " + pdfFile.getVersion() + " distabled!");
-
-        DBqueue.saveQueueOnExit();
     }
 }
 
diff --git a/com/nijikokun/register/payment/Method.java b/com/nijikokun/register/payment/Method.java
@@ -1,5 +1,15 @@
 package com.nijikokun.register.payment;
 
+import org.bukkit.plugin.Plugin;
+
+/**
+ * Method.java
+ * Interface for all sub-methods for payment.
+ *
+ * @author: Nijikokun<[email protected]> (@nijikokun)
+ * @copyright: Copyright (C) 2011
+ * @license: GNUv3 Affero License <http://www.gnu.org/licenses/agpl-3.0.html>
+ */
 public interface Method {
     public Object getPlugin();
     public String getName();
@@ -11,9 +21,12 @@ public interface Method {
     public boolean hasBankAccount(String bank, String name);
     public MethodAccount getAccount(String name);
     public MethodBankAccount getBankAccount(String bank, String name);
+    public boolean isCompatible(Plugin plugin);
+    public void setPlugin(Plugin plugin);
 
     public interface MethodAccount {
         public double balance();
+        public boolean set(double amount);
         public boolean add(double amount);
         public boolean subtract(double amount);
         public boolean multiply(double amount);
@@ -32,6 +45,7 @@ public interface MethodBankAccount {
         public double balance();
         public String getBankName();
         public int getBankId();
+        public boolean set(double amount);
         public boolean add(double amount);
         public boolean subtract(double amount);
         public boolean multiply(double amount);

diff --git a/com/nijikokun/register/payment/MethodEEco.java b/com/nijikokun/register/payment/MethodEEco.java