greg6775/Hadder
1
0
Fork 0
Code Issues 9 Pull requests 5 Projects Releases 54 Packages Wiki Activity Actions

Merge pull request #395 from BigBotNetwork/greg-dev

Browse source 
v1.1.3
This commit is contained in:
Skidder 2020-03-09 19:32:59 +01:00 • committed by GitHub
commit 5ccb9dbdfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pom.xml
View file

@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>Hadder</groupId>
<artifactId>Hadder</artifactId>
<version>1.1.1</version>
<version>1.1.3</version>
<name>Hadder</name>
<inceptionYear>2019</inceptionYear>
<description>Hadder is a multi-purpose Discord bot.</description>

1
src/main/java/com/bbn/hadder/audio/AudioManager.java
View file

@ -162,5 +162,4 @@ public class AudioManager {
s = s - (minutes * 60);
return (hours == 0 ? "" : hours + ":") + String.format("%02d", minutes) + ":" + String.format("%02d", s);
}
}

4
src/main/java/com/bbn/hadder/commands/fun/ClydeCommand.java
View file

@ -66,9 +66,7 @@ public class ClydeCommand implements Command {
}
webhook.delete().queue();
e.getMessage().delete().queue();
} else {
e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
}
} else e.getTextChannel().sendMessage(e.getMessageEditor().getMessage(MessageEditor.MessageType.NO_SELF_PERMISSION).build()).queue();
} else e.getHelpCommand().sendHelp(this, e);
}

6
src/main/java/com/bbn/hadder/commands/misc/GitHubCommand.java
View file

@ -54,12 +54,10 @@ public class GitHubCommand implements Command {
String website = "None";
try {
bio = json.getString("bio");
} catch (JSONException ignored) {
}
} catch (JSONException ignored) {}
try {
location = json.getString("location");
} catch (JSONException ignored) {
}
} catch (JSONException ignored) {}
if (!json.getString("blog").equals("")) website = json.getString("blog");

2
src/main/java/com/bbn/hadder/listener/MentionListener.java
View file

@ -50,7 +50,7 @@ public class MentionListener extends ListenerAdapter {
MavenXpp3Reader reader = new MavenXpp3Reader();
Model model = null;
try {
model = reader.read(this.getClass().getClassLoader().getResourceAsStream("pom.xml"));
model = reader.read(getClass().getResourceAsStream("pom.xml"));
} catch (IOException | XmlPullParserException ex) {
ex.printStackTrace();
}