Merge branch 'dev' into feature/optimize-loading-times

# Conflicts: # src/main/java/com/bgsoftware/superiorskyblock/database/serialization/IslandsDeserializer.java
BG-Software-LLC · Jan 20, 2022 · 34c570c · 34c570c
2 parents d2afbce + da68bc4
commit 34c570c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/...main/java/com/bgsoftware/superiorskyblock/database/serialization/IslandsDeserializer.java b/...main/java/com/bgsoftware/superiorskyblock/database/serialization/IslandsDeserializer.java
@@ -7,6 +7,8 @@
 import com.bgsoftware.superiorskyblock.api.island.IslandPrivilege;
 import com.bgsoftware.superiorskyblock.api.island.PlayerRole;
 import com.bgsoftware.superiorskyblock.api.island.algorithms.IslandBlocksTrackerAlgorithm;
+import com.bgsoftware.superiorskyblock.api.island.warps.IslandWarp;
+import com.bgsoftware.superiorskyblock.api.island.warps.WarpCategory;
 import com.bgsoftware.superiorskyblock.api.missions.Mission;
 import com.bgsoftware.superiorskyblock.api.objects.Pair;
 import com.bgsoftware.superiorskyblock.api.wrappers.SuperiorPlayer;
@@ -281,7 +283,7 @@ public static void deserializeWarps(DatabaseBridge databaseBridge, DatabaseCache
         });
     }
 
-    public static void deserializeBlockCounts(@Nullable String blocks, IslandBlocksTrackerAlgorithm blocksTrackerAlgorithm) {
+    public static void deserializeBlockCounts(String blocks, Island island) {
         if (blocks == null || blocks.isEmpty())
             return;
 
@@ -297,7 +299,7 @@ public static void deserializeBlockCounts(@Nullable String blocks, IslandBlocksT
             JsonObject blockCountObject = blockCountElement.getAsJsonObject();
             Key blockKey = Key.of(blockCountObject.get("id").getAsString());
             BigInteger amount = new BigInteger(blockCountObject.get("amount").getAsString());
-            blocksTrackerAlgorithm.trackBlock(blockKey, amount);
+            island.handleBlockPlace(blockKey, amount, false, false);
         });
     }
 

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/island/SIsland.java b/src/main/java/com/bgsoftware/superiorskyblock/island/SIsland.java
@@ -3225,7 +3225,7 @@ private void assignIslandChest() {
     private void deserializeBlockCounts(@Nullable String blockCounts) {
         try {
             this.blocksTracker.setLoadingDataMode(true);
-            IslandsDeserializer.deserializeBlockCounts(blockCounts, this.blocksTracker);
+            IslandsDeserializer.deserializeBlockCounts(blockCounts, this);
         } finally {
             this.blocksTracker.setLoadingDataMode(false);
         }