From 3bccd6ce5ac4c28797af7f067a7af70e277cc305 Mon Sep 17 00:00:00 2001 From: anthorob Date: Tue, 4 Jan 2022 18:38:13 -0500 Subject: [PATCH] Add check to prevent null exceptions to isAdmin function --- src/main/java/netneutrality/db/MysqlDatabase.java | 1 - src/main/java/netneutrality/utils/UserFunction.java | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/netneutrality/db/MysqlDatabase.java b/src/main/java/netneutrality/db/MysqlDatabase.java index ba7aab7..43592de 100644 --- a/src/main/java/netneutrality/db/MysqlDatabase.java +++ b/src/main/java/netneutrality/db/MysqlDatabase.java @@ -138,7 +138,6 @@ public class MysqlDatabase { * @return a ResultSet object, which can be converted to a model using {@link MysqlDatabase#convertToTableModel(ResultSet, String)} */ protected synchronized ResultSet prepareAndExecute(String sql, Object... params) { - logger.debug(sql); try { PreparedStatement query = connection.prepareStatement(sql); diff --git a/src/main/java/netneutrality/utils/UserFunction.java b/src/main/java/netneutrality/utils/UserFunction.java index 5d46d3c..e61777b 100644 --- a/src/main/java/netneutrality/utils/UserFunction.java +++ b/src/main/java/netneutrality/utils/UserFunction.java @@ -3,13 +3,15 @@ package netneutrality.utils; import net.dv8tion.jda.api.Permission; import net.dv8tion.jda.api.entities.Member; import net.dv8tion.jda.api.entities.Role; +import net.dv8tion.jda.api.entities.User; public class UserFunction { public static boolean isAdmin(Member user) { // This check will only be present during the development of the bot - if (user.getUser().getId().equals(Settings.getInstance().getCreator().getId())) { + User creator = Settings.getInstance().getCreator(); + if (creator != null && user.getId().equals(creator.getId())) { return true; }