Removed GridHandler from SIsland's parameters

BG-Software-LLC · Jan 3, 2022 · 88a86da · 88a86da
1 parent dd40235
commit 88a86da
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/com/bgsoftware/superiorskyblock/factory/FactoriesHandler.java b/src/main/java/com/bgsoftware/superiorskyblock/factory/FactoriesHandler.java
@@ -55,8 +55,8 @@ public void registerDatabaseBridgeFactory(DatabaseBridgeFactory databaseBridgeFa
         this.databaseBridgeFactory = databaseBridgeFactory;
     }
 
-    public Island createIsland(GridHandler grid, DatabaseResult resultSet) {
-        SIsland island = new SIsland(grid, resultSet);
+    public Island createIsland(DatabaseResult resultSet) {
+        SIsland island = new SIsland(resultSet);
         return islandsFactory == null ? island : islandsFactory.createIsland(island);
     }
 

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/island/SIsland.java b/src/main/java/com/bgsoftware/superiorskyblock/island/SIsland.java
@@ -190,7 +190,7 @@ public final class SIsland implements Island {
     private UpgradeValue<Double> mobDrops = UpgradeValue.NEGATIVE_DOUBLE;
     private UpgradeValue<BigDecimal> bankLimit = new UpgradeValue<>(new BigDecimal(-2), true);
 
-    public SIsland(GridHandler grid, DatabaseResult resultSet) {
+    public SIsland(DatabaseResult resultSet) {
         this.uuid = UUID.fromString(resultSet.getString("uuid"));
         this.owner = plugin.getPlayers().getSuperiorPlayer(UUID.fromString(resultSet.getString("owner")));
 
@@ -215,7 +215,7 @@ public SIsland(GridHandler grid, DatabaseResult resultSet) {
         this.unlockedWorlds.set(resultSet.getInt("unlocked_worlds"));
         this.lastTimeUpdate = resultSet.getLong("last_time_updated");
 
-        ChunksTracker.deserialize(grid, this, resultSet.getString("dirty_chunks"));
+        ChunksTracker.deserialize(plugin.getGrid(), this, resultSet.getString("dirty_chunks"));
         String blockCountsString = resultSet.getString("block_counts");
         Executor.sync(() -> deserializeBlockCounts(blockCountsString), 5L);
 

diff --git a/src/main/java/com/bgsoftware/superiorskyblock/world/GridHandler.java b/src/main/java/com/bgsoftware/superiorskyblock/world/GridHandler.java
@@ -100,7 +100,7 @@ public void syncUpgrades() {
 
     public void createIsland(DatabaseResult resultSet) {
         UUID owner = UUID.fromString(resultSet.getString("owner"));
-        Island island = plugin.getFactory().createIsland(this, resultSet);
+        Island island = plugin.getFactory().createIsland(resultSet);
         this.islandsContainer.addIsland(island);
     }