Fixes

Author: shaunluedeke

pom.xml

@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>de.chaosschwein</groupId>
-    <artifactId>AutoCrafter</artifactId>
+    <artifactId>NoAutoCrafter</artifactId>
     <version>1.3.0</version>
     <packaging>jar</packaging>
 
-    <name>AutoCrafter</name>
+    <name>NoAutoCrafter</name>
     <description>Minecraft AutoCrafter Plugin</description>
 
     <properties>

src/main/java/de/chaosschwein/autocrafter/main/AutoMain.java

@@ -7,6 +7,7 @@
 import de.chaosschwein.autocrafter.listener.*;
 import de.chaosschwein.autocrafter.manager.ChunkManager;
 import de.chaosschwein.autocrafter.manager.file.*;
+import de.chaosschwein.autocrafter.types.ChunkLoader;
 import de.chaosschwein.autocrafter.utils.Message;
 import de.chaosschwein.autocrafter.utils.Metrics;
 import org.bukkit.Bukkit;
@@ -81,13 +82,13 @@ public void onEnable() {
         if (Bukkit.getPluginManager().isPluginEnabled(instance)) {
             Bukkit.getConsoleSender().sendMessage(config.prefix + "§a--------------------------");
             Bukkit.getConsoleSender().sendMessage(config.prefix + "§a");
-            Bukkit.getConsoleSender().sendMessage(config.prefix + "§aAutoCraft enabled!");
+            Bukkit.getConsoleSender().sendMessage(config.prefix + "§aNoAutoCraft enabled!");
             Bukkit.getConsoleSender().sendMessage(config.prefix + "§a");
             Bukkit.getConsoleSender().sendMessage(config.prefix + "§a--------------------------");
         } else {
             Bukkit.getConsoleSender().sendMessage(config.prefix + "§c--------------------------");
             Bukkit.getConsoleSender().sendMessage(config.prefix + "§c");
-            Bukkit.getConsoleSender().sendMessage(config.prefix + "§cAutoCraft failed to enable!");
+            Bukkit.getConsoleSender().sendMessage(config.prefix + "§cNoAutoCraft failed to enable!");
             Bukkit.getConsoleSender().sendMessage(config.prefix + "§c");
             Bukkit.getConsoleSender().sendMessage(config.prefix + "§c--------------------------");
         }
@@ -101,14 +102,18 @@ public void onEnable() {
         });
         new Metrics(this, 22302);
         transporter = new Transporter();
+
+        for (ChunkLoader chunk : chunkLoaderFile.getChunks()) {
+            chunk.enableChunkLoader();
+        }
     }
 
     @Override
     public void onDisable() {
         if (Bukkit.getPluginManager().isPluginEnabled(instance)) {
             Bukkit.getConsoleSender().sendMessage(config.prefix + "§c--------------------------");
             Bukkit.getConsoleSender().sendMessage(config.prefix + "§c");
-            Bukkit.getConsoleSender().sendMessage(config.prefix + "§cAutoCraft disabled!");
+            Bukkit.getConsoleSender().sendMessage(config.prefix + "§cNoAutoCraft disabled!");
             Bukkit.getConsoleSender().sendMessage(config.prefix + "§c");
             Bukkit.getConsoleSender().sendMessage(config.prefix + "§c--------------------------");
             chunkManager.disableChunkLoad();

src/main/java/de/chaosschwein/autocrafter/manager/file/ChunkLoaderFile.java

@@ -46,26 +46,25 @@ public void addChunk(ChunkLoader chunk) {
     }
 
     public void removeChunk(ChunkLoader chunk) {
-        chunks.remove(chunk);
+        for (ChunkLoader c : chunks) {
+            if (c.equals(chunk)) {
+                chunks.remove(c);
+                break;
+            }
+        }
         save();
     }
 
     public boolean containsChunk(ChunkLoader chunk) {
-        return chunks.contains(chunk);
-    }
-
-    public void clearChunks() {
-        chunks.clear();
-        save();
+        for (ChunkLoader c : chunks) {
+            if (c.equals(chunk)) {
+                return true;
+            }
+        }
+        return false;
     }
 
     public List<ChunkLoader> getChunks() {
         return chunks;
     }
-
-    public void loadChunks(List<ChunkLoader> chunks) {
-        this.chunks.clear();
-        this.chunks.addAll(chunks);
-        save();
-    }
 }

src/main/java/de/chaosschwein/autocrafter/manager/file/Config.java

@@ -39,7 +39,7 @@ public Config() {
 
     public void setDefaults() {
         config.writeDefault(new HashMap<>() {{
-            put("prefix", "&8[&aAutoCrafter§8] &7");
+            put("prefix", "&8[&aNoAutoCrafter§8] &7");
             put("crafter", true);
             put("breaker", true);
             put("placer", true);

src/main/java/de/chaosschwein/autocrafter/manager/file/CrafterFile.java

@@ -6,6 +6,7 @@
 import de.chaosschwein.autocrafter.utils.DataCache;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
+import org.bukkit.block.Block;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 
@@ -31,7 +32,11 @@ public void save(Player p, Crafter crafter, CraftingRezept rezept) {
     }
 
     public CraftingRezept getRezept(Crafter crafter) {
-        Location loc = crafter.dispenser.getLocation();
+        Block dis = crafter.dispenser;
+        if (dis == null) {
+            return null;
+        }
+        Location loc = dis.getLocation();
         if (loc.getWorld() == null) {
             return null;
         }

src/main/java/de/chaosschwein/autocrafter/types/ChunkLoader.java

@@ -96,6 +96,10 @@ public String toString() {
         return Beacon.getWorld().getName() + ";" + Beacon.getX() + ";" + Beacon.getY() + ";" + Beacon.getZ();
     }
 
+    public boolean equals(ChunkLoader obj) {
+        return this.toString().equals(obj.toString());
+    }
+
     public static ChunkLoader fromString(String s) {
         String[] split = s.split(";");
         if (split.length != 4) {