diff --git a/pom.xml b/pom.xml index c7daa0ec..484d5924 100644 --- a/pom.xml +++ b/pom.xml @@ -118,6 +118,9 @@ org.apache.maven.plugins maven-jar-plugin 2.3.1 + + C:\Users\Arte\Desktop\Server\plugins + diff --git a/src/main/java/com/gamingmesh/jobs/config/YmlMaker.java b/src/main/java/com/gamingmesh/jobs/config/YmlMaker.java index 185847af..51277adf 100644 --- a/src/main/java/com/gamingmesh/jobs/config/YmlMaker.java +++ b/src/main/java/com/gamingmesh/jobs/config/YmlMaker.java @@ -50,18 +50,6 @@ public class YmlMaker { } this.Configuration = YamlConfiguration.loadConfiguration(f); - - InputStream defConfigStream = this.plugin.getResource(this.fileName); - if (defConfigStream != null) { - YamlConfiguration defConfig = YamlConfiguration.loadConfiguration(f); - this.Configuration.setDefaults(defConfig); - } - if (defConfigStream != null) - try { - defConfigStream.close(); - } catch (IOException e) { - e.printStackTrace(); - } if (f != null) try { f.close(); diff --git a/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java b/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java index 3451b21a..3b350846 100644 --- a/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java +++ b/src/main/java/com/gamingmesh/jobs/dao/JobsDAO.java @@ -1137,7 +1137,8 @@ public abstract class JobsDAO { for (Entry>> regions : worlds.getValue().entrySet()) { for (Entry> chunks : regions.getValue().entrySet()) { for (Entry block : chunks.getValue().entrySet()) { - + if (block.getValue() == null) + continue; switch (block.getValue().getAction()) { case DELETE: delete.setInt(1, block.getValue().getId());