Merge branch 'master' of github.com:AppleDash/SaneEconomy

AppleDash · Jan 17, 2017 · 96ee933 · 96ee933
2 parents 3695d13 + b81d64c
commit 96ee933
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 8 deletions.
diff --git a/.../main/java/org/appledash/saneeconomy/economy/backend/type/EconomyStorageBackendMySQL.java b/.../main/java/org/appledash/saneeconomy/economy/backend/type/EconomyStorageBackendMySQL.java
@@ -98,6 +98,7 @@ private boolean checkTableExists(String tableName) {
 
     @Override
     public synchronized void reloadDatabase() {
+        waitUntilFlushed();
         createTables();
         try (Connection conn = dbConn.openConnection()) {
             PreparedStatement ps = conn.prepareStatement(String.format("SELECT * FROM `%s`", dbConn.getTable("saneeconomy_balances")));

diff --git a/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/listeners/JoinQuitListener.java b/SaneEconomyCore/src/main/java/org/appledash/saneeconomy/listeners/JoinQuitListener.java
@@ -6,6 +6,7 @@
 import org.appledash.saneeconomy.economy.transaction.TransactionReason;
 import org.appledash.saneeconomy.updates.GithubVersionChecker;
 import org.appledash.saneeconomy.utils.MessageUtils;
+import org.bukkit.Bukkit;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -48,6 +49,8 @@ public void onPlayerJoin(PlayerJoinEvent evt) {
 
     @EventHandler
     public void onPlayerLogin(AsyncPlayerPreLoginEvent evt) {
-        plugin.getEconomyManager().getBackend().reloadDatabase(); // TODO: If servers start to lag when lots of people join, this is why.
+        Bukkit.getServer().getScheduler().scheduleAsyncDelayedTask(plugin, () -> {
+            plugin.getEconomyManager().getBackend().reloadDatabase(); // TODO: If servers start to lag when lots of people join, this is why.
+        }, 0);
     }
 }
diff --git a/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/SaneEconomySignShop.java b/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/SaneEconomySignShop.java
@@ -40,6 +40,9 @@ public void onEnable() {
         saveDefaultConfig();
 
         signShopManager.loadSignShops();
+
+        getServer().getScheduler().scheduleSyncRepeatingTask(this, limitManager::incrementLimitsHourly, 0, 20 * 60 * 60);
+
         getServer().getPluginManager().registerEvents(new SignChangeListener(this), this);
         getServer().getPluginManager().registerEvents(new InteractListener(this), this);
         getServer().getPluginManager().registerEvents(new BreakListener(this), this);

diff --git a/...ignShop/src/main/java/org/appledash/saneeconomysignshop/listeners/SignChangeListener.java b/...ignShop/src/main/java/org/appledash/saneeconomysignshop/listeners/SignChangeListener.java
@@ -53,7 +53,7 @@ public void onSignChange(SignChangeEvent evt) {
         MessageUtils.sendMessage(evt.getPlayer(), "Item: {1} x {2}", signShop.getQuantity(), signShop.getItemStack());
 
         if (signShop.canBuy()) { // The player be buying from the shop, not the other way around.
-            MessageUtils.sendMessage(evt.getPlayer(), "Will sell to players for {!}.",
+            MessageUtils.sendMessage(evt.getPlayer(), "Will sell to players for {1}.",
                     plugin.getSaneEconomy().getEconomyManager().getCurrency().formatAmount(signShop.getBuyPrice())
             );
         }

diff --git a/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/util/DefaultHashMap.java b/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/util/DefaultHashMap.java
@@ -8,25 +8,29 @@
  * Blackjack is still best pony.
  */
 public class DefaultHashMap<K, V> extends HashMap<K, V> {
-    private final Supplier<V> defaultSupplier;
+    private final KeyBasedSupplier<K, V> defaultSupplier;
 
     public DefaultHashMap(Supplier<V> defaultSupplier) {
-        if (defaultSupplier == null) {
-            throw new NullPointerException("defaultSupplier is null");
-        }
+        this((k) -> defaultSupplier.get());
+    }
 
-        this.defaultSupplier = defaultSupplier;
+    public DefaultHashMap(KeyBasedSupplier<K, V> supplier) {
+        this.defaultSupplier = supplier;
     }
 
     @Override
     public V get(Object k) {
         V v = super.get(k);
 
         if (v == null) {
-            v = defaultSupplier.get();
+            v = defaultSupplier.get((K)k);
             this.put((K) k, v);
         }
 
         return v;
     }
+
+    public interface KeyBasedSupplier<K, V> {
+        V get(K k);
+    }
 }
diff --git a/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/util/LimitManager.java b/SaneEconomySignShop/src/main/java/org/appledash/saneeconomysignshop/util/LimitManager.java
@@ -2,10 +2,13 @@
 
 import org.appledash.saneeconomysignshop.signshop.ShopTransaction;
 import org.appledash.saneeconomysignshop.signshop.ShopTransaction.TransactionDirection;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 
 /**
@@ -58,4 +61,22 @@ public void incrementLimitsHourly() {
         });
     }
 
+    public void loadLimits(ConfigurationSection config) {
+        for (Map<?, ?> map : config.getMapList("")) {
+            String itemName = String.valueOf(map.get("item"));
+            int sellLimit = Integer.valueOf(String.valueOf(map.get("buyLimit")));
+            int hourlyGain = Integer.valueOf(String.valueOf(map.get("gain")));
+
+            Optional<ItemDatabase.Pair<Integer, Short>> pair = ItemDatabase.getIDAndDamageForName(itemName);
+
+            if (!pair.isPresent()) {
+                continue;
+            }
+
+            ItemInfo itemInfo = new ItemInfo(new ItemStack(pair.get().getLeft(), pair.get().getRight()));
+
+            itemLimits.get(TransactionDirection.SELL).put(itemInfo, new ItemLimits(sellLimit, hourlyGain));
+        }
+    }
+
 }