diff --git a/.gitignore b/.gitignore index c45e2d7..a9a7413 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,5 @@ rP\.txt *.log cloc\.exe + +beanImage.png diff --git a/src/core/ObjectBuilder.java b/src/core/ObjectBuilder.java index 28054a4..b452a63 100644 --- a/src/core/ObjectBuilder.java +++ b/src/core/ObjectBuilder.java @@ -188,8 +188,8 @@ public class ObjectBuilder // the guild if not, they're assumed to be // allowed to use the bot at a general level. KittyRole role = KittyRole.General; - - if(event.getAuthor().getId() == event.getGuild().getOwner().getUser().getId()) + + if(event.getAuthor().getId() == event.getGuild().getOwnerId()) { role = KittyRole.Admin; } diff --git a/src/utils/GlobalLog.java b/src/utils/GlobalLog.java index e1c43aa..aee0ff0 100644 --- a/src/utils/GlobalLog.java +++ b/src/utils/GlobalLog.java @@ -36,11 +36,13 @@ public class GlobalLog System.out.println(logLine); } + public static void log(LogFilter filter, Object obj) { write(log, filter, obj.toString()); } public static void log(LogFilter filter, String msg) { write(log, filter, msg); } public static void warn(LogFilter filter, String msg) { write(warn, filter, msg); } public static void error(LogFilter filter, String msg) { write(error, filter, msg); System.err.println(msg); System.err.flush(); } public static void fatal(LogFilter filter, String msg) throws Exception { write(fatal, filter, msg); throw new Exception(msg); } + public static void log(Object obj) { log(LogFilter.Debug, obj); } public static void log(String msg) { log(LogFilter.Debug, msg); } public static void warn(String msg) { warn(LogFilter.Debug, msg); } public static void error(String msg) { error(LogFilter.Debug, msg); }