diff --git a/build/libs/ExplosionsControl-3.0.jar b/build/libs/ExplosionsControl-3.0.jar index 24e64f2..f3fc086 100644 Binary files a/build/libs/ExplosionsControl-3.0.jar and b/build/libs/ExplosionsControl-3.0.jar differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index de6015f..de428a1 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/src/main/java/io/github/itzispyder/explosionscontrol/data/ExplosionConfig.java b/src/main/java/io/github/itzispyder/explosionscontrol/data/ExplosionConfig.java index d53f2b4..1dc4132 100644 --- a/src/main/java/io/github/itzispyder/explosionscontrol/data/ExplosionConfig.java +++ b/src/main/java/io/github/itzispyder/explosionscontrol/data/ExplosionConfig.java @@ -134,11 +134,9 @@ public class ExplosionConfig { } public static ExplosionConfig load(World world) { - return load(getFileOf(world)); - } - - public static ExplosionConfig load(File file) { - ExplosionConfig defaultConfig = new ExplosionConfig(Bukkit.getWorlds().get(0)); + world = world != null ? world : Bukkit.getWorlds().get(0); + File file = getFileOf(world); + ExplosionConfig defaultConfig = new ExplosionConfig(world); if (FileValidationUtils.validate(file)) { try { diff --git a/src/main/java/io/github/itzispyder/explosionscontrol/data/ExplosionGui.java b/src/main/java/io/github/itzispyder/explosionscontrol/data/ExplosionGui.java index 52238a3..3bcf9c6 100644 --- a/src/main/java/io/github/itzispyder/explosionscontrol/data/ExplosionGui.java +++ b/src/main/java/io/github/itzispyder/explosionscontrol/data/ExplosionGui.java @@ -2,6 +2,7 @@ package io.github.itzispyder.explosionscontrol.data; import io.github.itzispyder.explosionscontrol.utils.ItemPresets; import io.github.itzispyder.explosionscontrol.utils.Text; +import io.github.itzispyder.explosionscontrol.utils.Timer; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.event.EventHandler; @@ -20,6 +21,7 @@ public class ExplosionGui { } public Inventory loadGui() { + Timer timer = Timer.start(); String title = Text.color(starter + config.getWorld().getName()); Inventory inv = Bukkit.createInventory(null, 54, title); ItemStack x = ItemPresets.GUI_BLANK; @@ -64,6 +66,8 @@ public class ExplosionGui { f,f,f,f,f,f,f,f,f }); + Timer.End end = timer.end(); + return inv; } diff --git a/src/main/java/io/github/itzispyder/explosionscontrol/events/InventoryListener.java b/src/main/java/io/github/itzispyder/explosionscontrol/events/InventoryListener.java index 9bfc9e0..4f5bc1a 100644 --- a/src/main/java/io/github/itzispyder/explosionscontrol/events/InventoryListener.java +++ b/src/main/java/io/github/itzispyder/explosionscontrol/events/InventoryListener.java @@ -37,7 +37,6 @@ public class InventoryListener implements Listener { if (world == null) { p.closeInventory(); - p.sendMessage("matching worlds: " + p.getWorld().getName().equals(name)); p.sendMessage(Text.ofAll("&cWorld &7\"" + name + "&7\" &cis not found!")); return; }