Fixed Arrays again

fixed bug in data collection
Arctic-Gaming-LLC · Jun 30, 2022 · 01409cb · 01409cb
1 parent 668f5f2
commit 01409cb
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 47 deletions.
diff --git a/src/main/java/net/pentlock/thunderdataengine/listeners/PlayerLogoutListener.java b/src/main/java/net/pentlock/thunderdataengine/listeners/PlayerLogoutListener.java
@@ -37,29 +37,30 @@ public void onPlayerQuit(PlayerQuitEvent event) {
             Map<String, double[]> sessionStats = thunderPlayer.getSessionStats();
 
             // Handles averages at session close
+
             double pvpDamageAverage = runAverage(sessionStats, "pvpDamage");
             if (!Double.isNaN(pvpDamageAverage)) {
-                thunderPlayer.setDataPvpDamage(ArrayUtil.addToArray(sessionStats.get("pvpDamage"), pvpDamageAverage));
+                thunderPlayer.setDataPvpDamage(ArrayUtil.addToArray(thunderPlayer.getDataPvpDamage(), pvpDamageAverage));
             }
             double pvpDefenseDamage = runAverage(sessionStats, "pvpDefenseDamage");
             if (!Double.isNaN(pvpDefenseDamage)) {
-                thunderPlayer.setDataPvpDefenseDamage(ArrayUtil.addToArray(sessionStats.get("pvpDefenseDamage"), pvpDefenseDamage));
+                thunderPlayer.setDataPvpDefenseDamage(ArrayUtil.addToArray(thunderPlayer.getDataPvpDefenseDamage(), pvpDefenseDamage));
             }
             double pveDamageAverage = runAverage(sessionStats, "pveDamage");
             if (!Double.isNaN(pveDamageAverage)) {
-                thunderPlayer.setDataPveDamage(ArrayUtil.addToArray(sessionStats.get("pveDamage"), pveDamageAverage));
+                thunderPlayer.setDataPveDamage(ArrayUtil.addToArray(thunderPlayer.getDataPveDamage(), pveDamageAverage));
             }
             double pveDefenseDamage = runAverage(sessionStats, "pveDefenseDamage");
             if (!Double.isNaN(pveDefenseDamage)) {
-                thunderPlayer.setDataPveDefenseDamage(ArrayUtil.addToArray(sessionStats.get("pveDefenseDamage"), pveDefenseDamage));
+                thunderPlayer.setDataPveDefenseDamage(ArrayUtil.addToArray(thunderPlayer.getDataPveDefenseDamage(), pveDefenseDamage));
             }
             double wealthGainTotal = runTotal(sessionStats, "wealthGain");
             if (!Double.isNaN(wealthGainTotal)) {
-                thunderPlayer.setDataWealthGain(ArrayUtil.addToArray(sessionStats.get("wealthGain"), wealthGainTotal));
+                thunderPlayer.setDataWealthGain(ArrayUtil.addToArray(thunderPlayer.getDataWealthGain(), wealthGainTotal));
             }
             double moneyDropsTotal = runTotal(sessionStats, "moneyDrops");
             if (!Double.isNaN(moneyDropsTotal)) {
-                thunderPlayer.setDataMoneyDrops(ArrayUtil.addToArray(sessionStats.get("moneyDrops"), moneyDropsTotal));
+                thunderPlayer.setDataMoneyDrops(ArrayUtil.addToArray(thunderPlayer.getDataMoneyDrops(), moneyDropsTotal));
             }
 
             //Updates the list of online Guild Members - important for Chat System
@@ -137,7 +138,14 @@ private double runAverage(Map<String, double[]> sessionStats, String type) {
             i++;
         }
         sessionStats.put(type, new double[0]);
-        return totalStat / stats.length;
+        if (sessionStats.get(type + "Ave").length >= 1) {
+            double currentAverage = totalStat / stats.length;
+            double[] aveStat = sessionStats.get(type + "Ave");
+            sessionStats.put(type + "Ave", new double[0]);
+            return (aveStat[0] + currentAverage) / 2;
+        } else {
+            return totalStat / stats.length;
+        }
     }
 
     private double runTotal(Map<String, double[]> sessionStats, String type) {

diff --git a/src/main/java/net/pentlock/thunderdataengine/utilities/ArrayUtil.java b/src/main/java/net/pentlock/thunderdataengine/utilities/ArrayUtil.java
@@ -17,20 +17,14 @@ public class ArrayUtil {
 
     public static String[] addToArray(String[] oldArray, String value) {
 
-        int length;
-        String[] newArray;
-        if (oldArray.length >= 50) {
-            newArray = new String[50];
-            length = 50;
-        } else {
-            length = oldArray.length + 1;
-            newArray = new String[length + 1];
-        }
+        String[] newArray = new String[oldArray.length + 1];
+
         newArray[0] = value;
-        for (int i = 0; i < length;) {
+        for (int i = 0; i < oldArray.length;) {
             newArray[i + 1] = oldArray[i];
             i++;
         }
+
         return newArray;
     }
 
@@ -45,18 +39,10 @@ public static String[] addToArray(String[] oldArray, String value) {
      */
     public static long[] addToArray(long[] oldArray, long value) {
 
-        int length;
-        long[] newArray;
-        if (oldArray.length >= 50) {
-            newArray = new long[50];
-            length = 49;
+        long[] newArray = new long[oldArray.length + 1];
 
-        } else {
-            length = oldArray.length;
-            newArray = new long[length + 1];
-        }
         newArray[0] = value;
-        for (int i = 0; i < length;) {
+        for (int i = 0; i < oldArray.length;) {
             newArray[i + 1] = oldArray[i];
             i++;
         }
@@ -160,17 +146,10 @@ public static double[] addToArraySessionAverage(double[] oldArray, double value,
      */
     public static double[] addToArray(double[] oldArray, double value) {
 
-        int length;
-        double[] newArray;
-        if (oldArray.length >= 50) {
-            newArray = new double[50];
-            length = 49;
-        } else {
-            length = oldArray.length;
-            newArray = new double[length + 1];
-        }
+        double[] newArray = new double[oldArray.length + 1];
+
         newArray[0] = value;
-        for (int i = 0; i < length;) {
+        for (int i = 0; i < oldArray.length;) {
             newArray[i + 1] = oldArray[i];
             i++;
         }
@@ -189,17 +168,10 @@ public static double[] addToArray(double[] oldArray, double value) {
      */
     public static UUID[] addToArray(UUID[] oldArray, UUID value) {
 
-        int length;
-        UUID[] newArray;
-        if (oldArray.length >= 50) {
-            newArray = new UUID[50];
-            length = 49;
-        } else {
-            length = oldArray.length;
-            newArray = new UUID[length + 1];
-        }
+        UUID[] newArray = new UUID[oldArray.length + 1];
+
         newArray[0] = value;
-        for (int i = 0; i < length;) {
+        for (int i = 0; i < oldArray.length;) {
             newArray[i + 1] = oldArray[i];
             i++;
         }

diff --git a/target/classes/net/pentlock/thunderdataengine/utilities/ArrayUtil.class b/target/classes/net/pentlock/thunderdataengine/utilities/ArrayUtil.class