From 24cc4a1d135e6edf604c7803856176c70c1518b9 Mon Sep 17 00:00:00 2001 From: games647 Date: Wed, 6 Jul 2016 12:20:22 +0200 Subject: [PATCH] A class could be settingsdependent and reloadable --- .../authme/initialization/AuthMeServiceInitializer.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/xephi/authme/initialization/AuthMeServiceInitializer.java b/src/main/java/fr/xephi/authme/initialization/AuthMeServiceInitializer.java index 33df29d0..c2db4418 100644 --- a/src/main/java/fr/xephi/authme/initialization/AuthMeServiceInitializer.java +++ b/src/main/java/fr/xephi/authme/initialization/AuthMeServiceInitializer.java @@ -148,11 +148,13 @@ public class AuthMeServiceInitializer { throw new IllegalStateException("Settings instance is null"); } for (Object object : objects.values()) { - if (object instanceof Reloadable) { - ((Reloadable) object).reload(); - } else if (object instanceof SettingsDependent) { + if (object instanceof SettingsDependent) { ((SettingsDependent) object).loadSettings(settings); } + + if (object instanceof Reloadable) { + ((Reloadable) object).reload(); + } } }