From 861c1ddd69b21f900d531566fa0f390d7cda17d8 Mon Sep 17 00:00:00 2001 From: Luck Date: Fri, 2 Sep 2016 19:19:22 +0100 Subject: [PATCH] remove #childInit --- .../luckperms/storage/methods/FlatfileDatastore.java | 9 --------- .../lucko/luckperms/storage/methods/JSONDatastore.java | 5 ----- .../lucko/luckperms/storage/methods/YAMLDatastore.java | 8 +------- 3 files changed, 1 insertion(+), 21 deletions(-) diff --git a/common/src/main/java/me/lucko/luckperms/storage/methods/FlatfileDatastore.java b/common/src/main/java/me/lucko/luckperms/storage/methods/FlatfileDatastore.java index 4bb62d098..2522bacd3 100644 --- a/common/src/main/java/me/lucko/luckperms/storage/methods/FlatfileDatastore.java +++ b/common/src/main/java/me/lucko/luckperms/storage/methods/FlatfileDatastore.java @@ -81,18 +81,9 @@ abstract class FlatfileDatastore extends Datastore { } cleanupUsers(); - - try { - childInit(); - } catch (Exception e) { - return; - } - setAcceptingLogins(true); } - protected abstract void childInit() throws Exception; - private void makeFiles() throws IOException { File data = new File(pluginDir, "data"); data.mkdirs(); diff --git a/common/src/main/java/me/lucko/luckperms/storage/methods/JSONDatastore.java b/common/src/main/java/me/lucko/luckperms/storage/methods/JSONDatastore.java index 2c00477a8..b84ae58f7 100644 --- a/common/src/main/java/me/lucko/luckperms/storage/methods/JSONDatastore.java +++ b/common/src/main/java/me/lucko/luckperms/storage/methods/JSONDatastore.java @@ -78,11 +78,6 @@ public class JSONDatastore extends FlatfileDatastore { return success; } - @Override - protected void childInit() throws Exception { - - } - @Override public boolean loadUser(UUID uuid, String username) { User user = plugin.getUserManager().make(uuid, username); diff --git a/common/src/main/java/me/lucko/luckperms/storage/methods/YAMLDatastore.java b/common/src/main/java/me/lucko/luckperms/storage/methods/YAMLDatastore.java index 305b6545d..3dd36c4f5 100644 --- a/common/src/main/java/me/lucko/luckperms/storage/methods/YAMLDatastore.java +++ b/common/src/main/java/me/lucko/luckperms/storage/methods/YAMLDatastore.java @@ -30,7 +30,6 @@ import me.lucko.luckperms.users.User; import me.lucko.luckperms.utils.Node; import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; -import org.yaml.snakeyaml.constructor.BaseConstructor; import java.io.*; import java.util.*; @@ -44,7 +43,7 @@ public class YAMLDatastore extends FlatfileDatastore { super(plugin, "Flatfile - YAML", pluginDir); } - private Yaml getYaml() { + private static Yaml getYaml() { DumperOptions options = new DumperOptions(); options.setDefaultFlowStyle(DumperOptions.FlowStyle.BLOCK); return new Yaml(options); @@ -75,11 +74,6 @@ public class YAMLDatastore extends FlatfileDatastore { } } - @Override - protected void childInit() throws Exception { - - } - @Override public boolean loadUser(UUID uuid, String username) { User user = plugin.getUserManager().make(uuid, username);