ServerBrand: fix null instance

Flectone · Sep 1, 2023 · 10eb947 · 10eb947
1 parent 1c03087
commit 10eb947
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/main/java/net/flectone/commands/CommandFlectonechat.java b/src/main/java/net/flectone/commands/CommandFlectonechat.java
@@ -6,10 +6,10 @@
 import net.flectone.managers.FileManager;
 import net.flectone.managers.TickerManager;
 import net.flectone.messages.MessageBuilder;
+import net.flectone.misc.brand.ServerBrand;
 import net.flectone.misc.commands.FCommand;
 import net.flectone.misc.commands.FTabCompleter;
 import net.flectone.misc.files.FYamlConfiguration;
-import net.flectone.misc.brand.ServerBrand;
 import net.flectone.utils.ObjectUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
@@ -90,8 +90,9 @@ public boolean onCommand(@NotNull CommandSender commandSender, @NotNull Command
         PlayerDeathEventListener.reload();
         PlayerAdvancementDoneListener.reload();
 
-        if (config.getBoolean("server.brand.enable"))
+        if (config.getBoolean("server.brand.enable")) {
             ServerBrand.getInstance().updateEveryBrand();
+        }
 
         fCommand.sendMeMessage("command.flectonechat.message");
 

diff --git a/src/main/java/net/flectone/managers/TickerManager.java b/src/main/java/net/flectone/managers/TickerManager.java
@@ -41,7 +41,7 @@ public static void start() {
             addTicker(new PlayerPingTicker());
         } else PlayerPingTicker.unregisterPingObjective();
 
-        if (config.getBoolean("server.brand.update.enable")) {
+        if (config.getBoolean("server.brand.enable") && config.getBoolean("server.brand.update.enable")) {
             addTicker(new ServerBrandTicker());
         }
 

diff --git a/src/main/java/net/flectone/misc/brand/ServerBrand.java b/src/main/java/net/flectone/misc/brand/ServerBrand.java
@@ -41,6 +41,7 @@ public ServerBrand() {
     }
 
     public static ServerBrand getInstance() {
+        if (instance == null) new ServerBrand();
         return instance;
     }