Fixed small error and NullPointerException

Commit for sync purposes

src/main/java/netneutrality/command/message/BlacklistCommand.java

@@ -63,14 +63,14 @@ public class BlacklistCommand extends AbstractCommand {
 				event.getTextChannel().sendMessage("Retreiving list, please wait...").queue(t -> {
                     String out = "";
 
-                    ArrayList<MBlacklist> blacklist = null;
+                    ArrayList<MBlacklist> blacklist = new ArrayList<>();
                     try {
                         blacklist = ((DBBlacklist) DBController.get("blacklist")).getBlacklistFromServer(event.getGuild().getId());
                         for (MBlacklist bl : blacklist) {
                             out += bl.getWord() + " -> " + (bl.isEnabled() ? "enabled" : "disabled") + "\n";
                         }
                     } catch (RuntimeException e) {
-                        e.printStackTrace();
+
                     }
                     t.editMessage("List of blacklisted words for this server [" + event.getGuild().getName() + "] :\n" + (blacklist.isEmpty() ? "No word found" : out)).queue();
 
@@ -87,7 +87,7 @@ public class BlacklistCommand extends AbstractCommand {
 						event.getTextChannel().sendMessage("Error adding \"" + word + "\" to the blacklist. It's already blacklisted!").queue();
 						LogHandler.log(e);
 					}
-				
+
 				break;
 				
 			case "remove":

src/main/java/netneutrality/db/AbstractController.java

@@ -5,7 +5,7 @@ import java.sql.SQLException;
 public abstract class AbstractController {
 
 	protected MysqlDatabase database;
-	
+
 	/**
 	 * The controller name to be used in {@link DBController} get(String controller) method
 	 * 
@@ -13,7 +13,7 @@ public abstract class AbstractController {
 	 */
 	public abstract String getControllerName();
 	
-	public void reconnect() throws SQLException {
+	public void reconnect() {
 		database.reconnect();
 	}
 	

src/main/java/netneutrality/db/MysqlDatabase.java

@@ -152,6 +152,7 @@ public class MysqlDatabase {
 	 * @throws SQLException
 	 */
 	public void close() throws SQLException {
+        System.out.println("Closing database...");
 		connection.close();
 	}
 	
@@ -160,9 +161,17 @@ public class MysqlDatabase {
 	 * 
 	 * @throws SQLException
 	 */
-	public void reconnect() throws SQLException {
+	public void reconnect() {
-		connection = new MysqlConnector(dbName, "root", "localhost", "").connect().getConnection();
+
-	}
+        try {
+            System.out.println("Reconnecting to database...");
+            connection = new MysqlConnector(dbName, "root", "localhost", "").connect().getConnection();
+        } catch (SQLException e) {
+            System.err.println("Error connecting to database. Shutting down..");
+            MusicBot.disconnect();
+            System.exit(0);
+        }
+    }
 	
 	/**
 	 * Check if the database is closed.

src/main/java/netneutrality/db/controllers/DBMessage.java

@@ -23,16 +23,14 @@ public class DBMessage extends AbstractController {
 		return database;
 	}
 	
-	public int log(String servername, String channelname, String username, String datesent, String messageId, String message) {
+	public void log(String servername, String channelname, String username, String datesent, String messageId, String message) {
-		
+
 		try {
-			return database.insert("INSERT INTO log_message VALUES(?,?,?,?,?,?,?)", servername, channelname, username, datesent, messageId, message, null);
+			database.insert("INSERT INTO log_message VALUES(?,?,?,?,?,?,?)", servername, channelname, username, datesent, messageId, message, null);
 		} catch (SQLException e) {
 			LogHandler.log(e);
 		}
-		
+
-		return -1;
-		
 	}
 	
 	public int logEdit(String messageId, String newMessage) {

src/main/java/netneutrality/handler/NewCommandListener.java

@@ -45,11 +45,14 @@ public class NewCommandListener extends ListenerAdapter {
 		if (MessageRateLimit.check(event)) return;
 
 
-		if (event.isFromType(ChannelType.TEXT))
+		if (event.isFromType(ChannelType.TEXT)) {
 			((DBMessage) DBController.get("message")).log(event.getGuild().getName(), event.getTextChannel().getName(),
-				event.getMember().getUser().getName(),
+					event.getMember().getUser().getName(),
-				event.getMessage().getCreationTime().format(DateTimeFormatter.ofPattern(Settings.DATETIMEFORMAT)), event.getMessage().getId(),
+					event.getMessage().getCreationTime().format(DateTimeFormatter.ofPattern(Settings.DATETIMEFORMAT)), event.getMessage().getId(),
-				event.getMessage().getContentDisplay().trim());
+					event.getMessage().getContentDisplay().trim());
+
+		}
+
 		
 		Message message = event.getMessage();
 		String msg = message.getContentDisplay().trim();
@@ -81,6 +84,8 @@ public class NewCommandListener extends ListenerAdapter {
 
 			}
 		} else {
+
+			String finalMsg = msg;
 			ArrayList<MBlacklist> blacklist = new ArrayList<>();
 
 			try {
@@ -91,7 +96,7 @@ public class NewCommandListener extends ListenerAdapter {
 
 				boolean found = false;
 				for (int i = 0; i < blacklist.size(); i++) {
-					if (msg.toLowerCase().contains(blacklist.get(i).getWord()))
+					if (finalMsg.toLowerCase().contains(blacklist.get(i).getWord()))
 						found = true;
 				}
 
@@ -99,7 +104,6 @@ public class NewCommandListener extends ListenerAdapter {
 					event.getMessage().delete().queue();
 					event.getTextChannel().sendMessage("Not in my christian server").queue();
 				}
-
 			}
 		}
 	}