Chaoscaot/VelocityCore
Archiviert
1
0
Fork 0
geforkt von SteamWar/BungeeCore
Code Pull-Requests Aktivität

Fixing...

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Chaoscaot 2020-10-20 22:16:47 +02:00
Ursprung a959b20370
Commit 25ed4e7f00
2 geänderte Dateien mit 10 neuen und 22 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

23
src/de/steamwar/bungeecore/commands/BanCommand.java
Datei anzeigen

@ -37,8 +37,8 @@ public class BanCommand extends BasicCommand {
@Override @Override
public void execute(CommandSender sender, String[] args) { public void execute(CommandSender sender, String[] args) {
if(args.length < 4){ if(args.length < 3){
BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "/ban [Spieler] [dd.mm.yyyy oder perma] {hh:mm} [Grund]"); BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "/ban [Spieler] [dd.mm.yyyy oder dd.mm.yyyy_hh:mm oder perma] [Grund]");
return; return;
} }
@ -46,13 +46,12 @@ public class BanCommand extends BasicCommand {
if(target == null) if(target == null)
return; return;
Timestamp banTime = parseTime(sender, String.join(args[1], args[2])); Timestamp banTime = parseTime(sender, args[1]);
if(banTime == null) if(banTime == null)
return; return;
StringBuilder banReason = new StringBuilder(); StringBuilder banReason = new StringBuilder();
int start = hasTimestamp(args[2])?2:3; for (int i = 2; i < args.length; i++){
for (int i = start; i < args.length; i++){
banReason.append(args[i]).append(" "); banReason.append(args[i]).append(" ");
} }
String msg = banReason.toString(); String msg = banReason.toString();
@ -64,14 +63,14 @@ public class BanCommand extends BasicCommand {
if(arg.equalsIgnoreCase("perma")) { if(arg.equalsIgnoreCase("perma")) {
return Timestamp.from(Instant.ofEpochSecond(946674800)); return Timestamp.from(Instant.ofEpochSecond(946674800));
}else{ }else{
SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy HH:mm"); SimpleDateFormat dateFormat = new SimpleDateFormat("dd.MM.yyyy_HH:mm");
try{ try{
Date parsedDate = dateFormat.parse(arg); Date parsedDate = dateFormat.parse(arg);
return new java.sql.Timestamp(parsedDate.getTime()); return new java.sql.Timestamp(parsedDate.getTime());
}catch(ParseException e){ }catch(ParseException e){
dateFormat = new SimpleDateFormat("dd.MM.yyyy"); dateFormat = new SimpleDateFormat("dd.MM.yyyy");
try{ try{
Date parsedDate = dateFormat.parse(arg.split(" ")[0]); Date parsedDate = dateFormat.parse(arg.split("_")[0]);
return new java.sql.Timestamp(parsedDate.getTime()); return new java.sql.Timestamp(parsedDate.getTime());
}catch(ParseException exception){ }catch(ParseException exception){
BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "§cUngültige Zeitangabe."); BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "§cUngültige Zeitangabe.");
@ -80,14 +79,4 @@ public class BanCommand extends BasicCommand {
} }
} }
} }
public static boolean hasTimestamp(String time) {
SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm");
try{
dateFormat.parse(time);
return true;
}catch(ParseException exception){
return false;
}
}
} }

9
src/de/steamwar/bungeecore/commands/MuteCommand.java
Datei anzeigen

@ -33,8 +33,8 @@ public class MuteCommand extends BasicCommand {
@Override @Override
public void execute(CommandSender sender, String[] args) { public void execute(CommandSender sender, String[] args) {
if(args.length < 4){ if(args.length < 3){
BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "/mute [Spieler] [dd.mm.yyyy oder perma] {hh:mm} [Grund]"); BungeeCore.send(sender, BungeeCore.CHAT_PREFIX + "/mute [Spieler] [dd.mm.yyyy oder dd.mm.yyyy_hh:mm oder perma] [Grund]");
return; return;
} }
@ -42,13 +42,12 @@ public class MuteCommand extends BasicCommand {
if(target == null) if(target == null)
return; return;
Timestamp muteTime = BanCommand.parseTime(sender, String.join(args[1], args[2])); Timestamp muteTime = BanCommand.parseTime(sender, args[1]);
if(muteTime == null) if(muteTime == null)
return; return;
StringBuilder muteReason = new StringBuilder(); StringBuilder muteReason = new StringBuilder();
int start = BanCommand.hasTimestamp(args[2])?2:3; for (int i = 2; i < args.length; i++){
for (int i = start; i < args.length; i++){
muteReason.append(args[i]).append(" "); muteReason.append(args[i]).append(" ");
} }
String msg = muteReason.toString(); String msg = muteReason.toString();