Vitania/W-rfel-Bot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'serenity' of ssh://ocame.de/~/GIT/DiscordAtlasBot into serenity

Browse Source
This commit is contained in:
Ocame
2019-06-25 20:15:28 +02:00
parent eb9d6d609c 13b48fa453
commit dc037e0d1e
5 changed files with 341 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/Shadowrun/dice.java
View File

@ -27,6 +27,8 @@ public class dice extends ListenerAdapter {
private language activLang;
private db_connect db;
private Map<String, String> channelList = new HashMap<>();
@ -36,6 +38,7 @@ public class dice extends ListenerAdapter {
this.prefixIni = "/ini";
this.prefixTest = "/rollTest";
this.prefixZitat = "/zitat";
this.db = new db_connect();
}
@Override
@ -160,10 +163,20 @@ public class dice extends ListenerAdapter {
boolean edge = false;
try {
if(event.getMessage().getContentRaw().startsWith(this.prefixSr+"+")) {
// Prüfen ob Edge wurf
if(event.getMessage().getContentRaw().startsWith(this.prefixSr+"+") || event.getMessage().getContentRaw().startsWith(this.prefixSr+" +")) {
edge = true;
}
String[] MsgParts = event.getMessage().getContentRaw().split(" ", 2);
// korrikiert Edge eingabe von /sr + zu /sr+
String ContentRaw = event.getMessage().getContentRaw();
if(event.getMessage().getContentRaw().startsWith(this.prefixSr+" +")) {
ContentRaw = ContentRaw.replace(this.prefixSr+" +", this.prefixSr+"+ ").replace(" ", " ");
}
// Prüfen ob Leerer Command gesendet wird
String[] MsgParts = ContentRaw.split(" ", 2);
if(MsgParts.length < 2) {
String message = activLang.emptyCommand;
message = message.replace("%command%", this.prefixSr);
@ -282,7 +295,7 @@ public class dice extends ListenerAdapter {
}
event.getChannel().sendMessage(outputBox.build()).queue();
db.insertDice(event.getMember().getEffectiveName(), event.getMember().getUser().getId(),event.getMessage().getContentRaw(),result.toString().trim(), event.getChannel().getId());
}
catch (NumberFormatException e) {
event.getChannel().sendMessage("Nope").queue();