SteamWar/BungeeCore
Archiviert
13
2

Merge branch 'master' into commoncore

Dieser Commit ist enthalten in:
yoyosource 2022-04-20 17:56:52 +02:00
Commit 8122b68540
2 geänderte Dateien mit 8 neuen und 3 gelöschten Zeilen

Datei anzeigen

@ -92,9 +92,9 @@ dependencies {
annotationProcessor 'org.projectlombok:lombok:1.18.22' annotationProcessor 'org.projectlombok:lombok:1.18.22'
testAnnotationProcessor 'org.projectlombok:lombok:1.18.22' testAnnotationProcessor 'org.projectlombok:lombok:1.18.22'
implementation files("${projectDir}/lib/BungeeCord.jar") compileOnly files("${projectDir}/lib/BungeeCord.jar")
implementation files("${projectDir}/lib/PersistentBungeeCore.jar") compileOnly files("${projectDir}/lib/PersistentBungeeCore.jar")
implementation files("${projectDir}/lib/BungeeTabListPlus.jar") compileOnly files("${projectDir}/lib/BungeeTabListPlus.jar")
implementation("net.dv8tion:JDA:4.3.0_299") { implementation("net.dv8tion:JDA:4.3.0_299") {
exclude module: 'opus-java' exclude module: 'opus-java'
} }

Datei anzeigen

@ -42,6 +42,11 @@ public class ArenaCommand extends BasicCommand {
return; return;
ProxiedPlayer player = (ProxiedPlayer) sender; ProxiedPlayer player = (ProxiedPlayer) sender;
if(CheckCommand.isChecking(player)){
Message.send("CHECK_CHECKING", player);
return;
}
SteamwarUser steamwarUser = SteamwarUser.get(player); SteamwarUser steamwarUser = SteamwarUser.get(player);
if (steamwarUser.isPunishedWithMessage(player, Punishment.PunishmentType.NoFightServer)) { if (steamwarUser.isPunishedWithMessage(player, Punishment.PunishmentType.NoFightServer)) {
return; return;