From a59b55db572a4037e5b664d8a3c402f9e11b3e0f Mon Sep 17 00:00:00 2001
From: P0nk <ponkcode@gmail.com>
Date: Mon, 12 Apr 2021 21:44:47 +0200
Subject: [PATCH] Load cash items async on startup

---
 src/main/java/net/server/Server.java |  7 +----
 src/main/java/server/CashShop.java   | 43 ++++++++++++++++------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/main/java/net/server/Server.java b/src/main/java/net/server/Server.java
index f0b0e96ff1..44333c1d38 100644
--- a/src/main/java/net/server/Server.java
+++ b/src/main/java/net/server/Server.java
@@ -855,17 +855,12 @@ public class Server {
 
         final List<Future<?>> futures = new ArrayList<>();
         futures.add(initExecutor.submit(() -> SkillFactory.loadAllSkills()));
+        futures.add(initExecutor.submit(() -> CashItemFactory.loadAllCashItems()));
 
         ThreadManager.getInstance().start();
         initializeTimelyTasks();    // aggregated method for timely tasks thanks to lxconan
 
         long timeToTake = System.currentTimeMillis();
-
-        CashItemFactory.getSpecialCashItems();
-        final double itemLoadTime = (System.currentTimeMillis() - timeToTake) / 1000.0;
-        log.info("Items loaded in {} seconds", itemLoadTime);
-
-        timeToTake = System.currentTimeMillis();
         MapleQuest.loadAllQuest();
         final double questLoadTime = (System.currentTimeMillis() - timeToTake) / 1000.0;
         log.info("Quest loaded in {} seconds", questLoadTime);
diff --git a/src/main/java/server/CashShop.java b/src/main/java/server/CashShop.java
index cdf024f316..a05942aa55 100644
--- a/src/main/java/server/CashShop.java
+++ b/src/main/java/server/CashShop.java
@@ -40,7 +40,6 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.*;
-import java.util.Map.Entry;
 import java.util.concurrent.locks.Lock;
 
 /*
@@ -144,15 +143,16 @@ public class CashShop {
     }
 
     public static class CashItemFactory {
+        private static volatile Map<Integer, CashItem> items = new HashMap<>();
+        private static volatile List<Integer> randomitemsns = new ArrayList<>();
+        private static volatile Map<Integer, List<Integer>> packages = new HashMap<>();
+        private static volatile List<SpecialCashItem> specialcashitems = new ArrayList<>();
 
-        private static final Map<Integer, CashItem> items = new HashMap<>();
-        private static final Map<Integer, List<Integer>> packages = new HashMap<>();
-        private static final List<SpecialCashItem> specialcashitems = new ArrayList<>();
-        private static final List<Integer> randomitemsns = new ArrayList<>();
-
-        static {
+        public static void loadAllCashItems() {
             MapleDataProvider etc = MapleDataProviderFactory.getDataProvider(new File("wz/Etc.wz"));
 
+            Map<Integer, CashItem> loadedItems = new HashMap<>();
+            List<Integer> onSaleItems = new ArrayList<>();
             for (MapleData item : etc.getData("Commodity.img").getChildren()) {
                 int sn = MapleDataTool.getIntConvert("SN", item);
                 int itemId = MapleDataTool.getIntConvert("ItemId", item);
@@ -160,9 +160,16 @@ public class CashShop {
                 long period = MapleDataTool.getIntConvert("Period", item, 1);
                 short count = (short) MapleDataTool.getIntConvert("Count", item, 1);
                 boolean onSale = MapleDataTool.getIntConvert("OnSale", item, 0) == 1;
-                items.put(sn, new CashItem(sn, itemId, price, period, count, onSale));
-            }
+                loadedItems.put(sn, new CashItem(sn, itemId, price, period, count, onSale));
 
+                if (onSale) {
+                    onSaleItems.add(sn);
+                }
+            }
+            CashItemFactory.items = loadedItems;
+            CashItemFactory.randomitemsns = onSaleItems;
+
+            Map<Integer, List<Integer>> loadedPackages = new HashMap<>();
             for (MapleData cashPackage : etc.getData("CashPackage.img").getChildren()) {
                 List<Integer> cPackage = new ArrayList<>();
 
@@ -170,24 +177,21 @@ public class CashShop {
                     cPackage.add(Integer.parseInt(item.getData().toString()));
                 }
 
-                packages.put(Integer.parseInt(cashPackage.getName()), cPackage);
-            }
-
-            for (Entry<Integer, CashItem> e : items.entrySet()) {
-                if (e.getValue().isOnSale()) {
-                    randomitemsns.add(e.getKey());
-                }
+                loadedPackages.put(Integer.parseInt(cashPackage.getName()), cPackage);
             }
+            CashItemFactory.packages = loadedPackages;
 
+            List<SpecialCashItem> loadedSpecialItems = new ArrayList<>();
             try (Connection con = DatabaseConnection.getConnection();
                  PreparedStatement ps = con.prepareStatement("SELECT * FROM specialcashitems");
                  ResultSet rs = ps.executeQuery()) {
                 while (rs.next()) {
-                    specialcashitems.add(new SpecialCashItem(rs.getInt("sn"), rs.getInt("modifier"), rs.getByte("info")));
+                    loadedSpecialItems.add(new SpecialCashItem(rs.getInt("sn"), rs.getInt("modifier"), rs.getByte("info")));
                 }
             } catch (SQLException ex) {
                 ex.printStackTrace();
             }
+            CashItemFactory.specialcashitems = loadedSpecialItems;
         }
 
         public static CashItem getRandomCashItem() {
@@ -222,16 +226,17 @@ public class CashShop {
         }
 
         public static void reloadSpecialCashItems() {//Yay?
-            specialcashitems.clear();
+            List<SpecialCashItem> loadedSpecialItems = new ArrayList<>();
             try (Connection con = DatabaseConnection.getConnection();
                  PreparedStatement ps = con.prepareStatement("SELECT * FROM specialcashitems");
                  ResultSet rs = ps.executeQuery()) {
                 while (rs.next()) {
-                    specialcashitems.add(new SpecialCashItem(rs.getInt("sn"), rs.getInt("modifier"), rs.getByte("info")));
+                    loadedSpecialItems.add(new SpecialCashItem(rs.getInt("sn"), rs.getInt("modifier"), rs.getByte("info")));
                 }
             } catch (SQLException ex) {
                 ex.printStackTrace();
             }
+            CashItemFactory.specialcashitems = loadedSpecialItems;
         }
     }