From e1656423c1c19ebcff668ce5de95a143eebe7b2c Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Wed, 25 Sep 2019 13:48:37 -0700
Subject: [PATCH] Static Abuse Removal - Various Chunklet classes

---
 .../blockmeta/ChunkletManagerFactory.java     | 22 +++++++++++++------
 .../util/blockmeta/HashChunkletManager.java   |  6 +++++
 .../conversion/BlockStoreConversionMain.java  |  2 +-
 .../BlockStoreConversionZDirectory.java       |  2 +-
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java b/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java
index 9a92da0a4..938e2cfb0 100755
--- a/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java
+++ b/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java
@@ -1,7 +1,15 @@
-package com.gmail.nossr50.util.blockmeta;
-
-public class ChunkletManagerFactory {
-    public static ChunkletManager getChunkletManager() {
-        return new HashChunkletManager();
-    }
-}
+//package com.gmail.nossr50.util.blockmeta;
+//
+//import com.gmail.nossr50.mcMMO;
+//
+//public class ChunkletManagerFactory {
+//    private final mcMMO pluginRef;
+//
+//    public ChunkletManagerFactory(mcMMO pluginRef) {
+//        this.pluginRef = pluginRef;
+//    }
+//
+//    public ChunkletManager getChunkletManager() {
+//        return new HashChunkletManager(pluginRef);
+//    }
+//}
diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java b/src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java
index 093da6243..c090f93fa 100755
--- a/src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java
+++ b/src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java
@@ -1,5 +1,6 @@
 package com.gmail.nossr50.util.blockmeta;
 
+import com.gmail.nossr50.mcMMO;
 import org.bukkit.World;
 import org.bukkit.block.Block;
 
@@ -7,8 +8,13 @@ import java.io.*;
 import java.util.HashMap;
 
 public class HashChunkletManager implements ChunkletManager {
+    private final mcMMO pluginRef;
     public HashMap<String, ChunkletStore> store = new HashMap<>();
 
+    public HashChunkletManager(mcMMO pluginRef) {
+        this.pluginRef = pluginRef;
+    }
+
     @Override
     public void loadChunklet(int cx, int cy, int cz, World world) {
         File dataDir = new File(world.getWorldFolder(), "mcmmo_data");
diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java b/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java
index cd9af7e04..65ae647e5 100755
--- a/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java
+++ b/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java
@@ -55,7 +55,7 @@ public class BlockStoreConversionMain implements Runnable {
 
         for (int i = 0; (i < ChunkConversionOptions.getConversionRate()) && (i < this.xDirs.length); i++) {
             if (this.converters[i] == null) {
-                this.converters[i] = new BlockStoreConversionXDirectory();
+                this.converters[i] = new BlockStoreConversionXDirectory(pluginRef);
             }
 
             this.converters[i].start(this.world, this.xDirs[i]);
diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java b/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java
index 96b0a5593..6e897c6d2 100755
--- a/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java
+++ b/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java
@@ -33,7 +33,7 @@ public class BlockStoreConversionZDirectory implements Runnable {
     public void start(org.bukkit.World world, File xDir, File dataDir) {
         this.world = world;
         this.scheduler = pluginRef.getServer().getScheduler();
-        this.manager = new HashChunkletManager();
+        this.manager = new HashChunkletManager(pluginRef);
         this.newManager = (HashChunkManager) pluginRef.getPlaceStore();
         this.dataDir = dataDir;
         this.xDir = xDir;