Fix for setting being called before we load the settings.

cindyker · Sep 2, 2019 · 13fe5be · 13fe5be
1 parent 79386e4
commit 13fe5be
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 23 deletions.
diff --git a/src/main/java/com/MoofIT/Minecraft/Cenotaph/Cenotaph.java b/src/main/java/com/MoofIT/Minecraft/Cenotaph/Cenotaph.java
@@ -109,6 +109,8 @@ public void onEnable() {
 			log.info("Cenotaph config.yml couldn't load.");
 			onDisable();
 		}
+		if (CenotaphSettings.enableAscii())
+			CenotaphMessaging.sendSweetAsciiArt();
 
 		isSpigot = isSpigot();
 		economyEnabled = setupEconomy();

diff --git a/src/main/java/com/MoofIT/Minecraft/Cenotaph/CenotaphMessaging.java b/src/main/java/com/MoofIT/Minecraft/Cenotaph/CenotaphMessaging.java
@@ -65,27 +65,6 @@ public static void sendPrefixedAdminMessage(CommandSender sender, String string)
 	}
 
 	public static void sendEnabledMessage(String hooked) {
-		if (CenotaphSettings.enableAscii()) {
-			Cenotaph.log.info(" ");
-			Cenotaph.log.info("  C              __.....__               C");
-			Cenotaph.log.info("               .'         ':,             ");
-			Cenotaph.log.info("  E           /  __  _  __  \\\\           E");
-			Cenotaph.log.info("              | |_)) || |_))||            ");
-			Cenotaph.log.info("  N           | | \\\\ || |   ||           N");
-			Cenotaph.log.info("              |             ||   _,       ");
-			Cenotaph.log.info("  O           |             ||.-(_{}     O");
-			Cenotaph.log.info("              |             |/    `       ");
-			Cenotaph.log.info("  T           |        ,_ (\\;|/)         T");
-			Cenotaph.log.info("            \\\\|       {}_)-,||`         ");
-			Cenotaph.log.info("  A         \\\\;/,,;;;;;;;,\\\\|//,         A");
-			Cenotaph.log.info("           .;;;;;;;;;;;;;;;;,             ");
-			Cenotaph.log.info("  P       \\,;;;;;;;;;;;;;;;;,//          P");
-			Cenotaph.log.info("         \\\\;;;;;;;;;;;;;;;;,//          ");
-			Cenotaph.log.info("  H     ,\\';;;;;;;;;;;;;;;;'             H");
-			Cenotaph.log.info("       jgs;;;;;;;;;;;'''`                 ");
-			Cenotaph.log.info(" ");
-		}
-
 		if (hooked.length() > 0) {
 		    hooked = "  Cenotaph Hooked into: " + hooked.substring(0, hooked.length() - 2) + ".";
 		    sendInfoConsoleMessage(hooked);
@@ -98,7 +77,7 @@ public static void sendEnabledMessage(String hooked) {
 
 	public static void sendSevereConsoleMessage(String message) {
 	    String lineSeparator =  Ansi.ansi().fg(Ansi.Color.WHITE) + System.lineSeparator() + Ansi.ansi().fg(Ansi.Color.RED).toString()+ " ";
-	    String error = WordUtils.wrap(Ansi.ansi().fg(Ansi.Color.RED).toString() + "[Cenotaph] " + message + Ansi.ansi().fg(Ansi.Color.WHITE), 44, lineSeparator, true);
+	    String error = "  " + WordUtils.wrap(Ansi.ansi().fg(Ansi.Color.RED).toString() + "[Cenotaph] " + message + Ansi.ansi().fg(Ansi.Color.WHITE), 41, lineSeparator, true);
 	    for (String line : error.split(System.lineSeparator()))
             Cenotaph.log.severe(line);	    
 	}
@@ -108,4 +87,25 @@ public static void sendInfoConsoleMessage(String message) {
 	    for (String line : split.split(System.lineSeparator()))
             Cenotaph.log.info(line);
 	}
-}
+
+	public static void sendSweetAsciiArt() {
+		Cenotaph.log.info(" ");
+		Cenotaph.log.info("  C              __.....__               C");
+		Cenotaph.log.info("               .'         ':,             ");
+		Cenotaph.log.info("  E           /  __  _  __  \\\\           E");
+		Cenotaph.log.info("              | |_)) || |_))||            ");
+		Cenotaph.log.info("  N           | | \\\\ || |   ||           N");
+		Cenotaph.log.info("              |             ||   _,       ");
+		Cenotaph.log.info("  O           |             ||.-(_{}     O");
+		Cenotaph.log.info("              |             |/    `       ");
+		Cenotaph.log.info("  T           |        ,_ (\\;|/)         T");
+		Cenotaph.log.info("            \\\\|       {}_)-,||`         ");
+		Cenotaph.log.info("  A         \\\\;/,,;;;;;;;,\\\\|//,         A");
+		Cenotaph.log.info("           .;;;;;;;;;;;;;;;;,             ");
+		Cenotaph.log.info("  P       \\,;;;;;;;;;;;;;;;;,//          P");
+		Cenotaph.log.info("         \\\\;;;;;;;;;;;;;;;;,//          ");
+		Cenotaph.log.info("  H     ,\\';;;;;;;;;;;;;;;;'             H");
+		Cenotaph.log.info("       jgs;;;;;;;;;;;'''`                 ");
+		Cenotaph.log.info(" ");		
+	}
+}