Merge pull request #37 from Sinthorion/master

Project cleanup; remove repo size
IANetworks · Dec 5, 2017 · 9756128 · 9756128
2 parents 984852e + 37e4a51
commit 9756128
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 22 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ config.properties
 /out
 /.idea
 /bin
+/src/javascript/bot/*.jar
diff --git a/.idea/dictionaries/AbbyTheRat.xml b/.idea/dictionaries/AbbyTheRat.xml
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/src/bot/CommandStructure/SetPrefixCS.java b/src/bot/CommandStructure/SetPrefixCS.java
@@ -29,11 +29,8 @@ public SetPrefixCS(SharedContainer container, String commandName, int commandID,
     @Override
     public void execute(Member author, User authorUser, MessageChannel channel, Message message, String parameters, Map<String, CommandStructure> commandList) {
         //Check to see if we're either botAdminOwner or guild Owner
-        String curGuildPrefix = "!";
         Long guildID = author.getGuild().getIdLong();
-        if (dbMan.getPrefix(guildID) != null) {
-            curGuildPrefix = dbMan.getPrefix(guildID);
-        }
+        String curGuildPrefix = dbMan.getPrefix(guildID);
 
         if (hasPermission(author)) {
             //if we don't have any parameters, we're resetting to default

diff --git a/src/javascript/bot/Ducky-Mc-Duckerson.jar b/src/javascript/bot/Ducky-Mc-Duckerson.jar
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,3 +4,4 @@ config.properties @@
     /out
     /.idea
     /bin
+    /src/javascript/bot/*.jar