SteamWar/BungeeCore
Archiviert
13
2

Merge pull request 'Fix NoFight punishment for EventCommand' (#465) from FixNoFightServerPunishmentForEventCommand into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Reviewed-on: #465
Reviewed-by: Lixfel <lixfel@steamwar.de>
Dieser Commit ist enthalten in:
Lixfel 2023-03-13 16:38:28 +01:00
Commit 630ee612e0

Datei anzeigen

@ -20,11 +20,8 @@
package de.steamwar.bungeecore.commands; package de.steamwar.bungeecore.commands;
import de.steamwar.bungeecore.*; import de.steamwar.bungeecore.*;
import de.steamwar.sql.EventFight; import de.steamwar.messages.ChatSender;
import de.steamwar.sql.SchematicType; import de.steamwar.sql.*;
import de.steamwar.sql.Team;
import de.steamwar.sql.TeamTeilnahme;
import de.steamwar.sql.Event;
import de.steamwar.command.SWCommand; import de.steamwar.command.SWCommand;
import de.steamwar.command.SWCommandUtils; import de.steamwar.command.SWCommandUtils;
import de.steamwar.command.TypeMapper; import de.steamwar.command.TypeMapper;
@ -121,8 +118,11 @@ public class EventCommand extends SWCommand {
Message.send("EVENT_NO_FIGHT_TEAM", player); Message.send("EVENT_NO_FIGHT_TEAM", player);
return; return;
} }
ChatSender sender = ChatSender.of(player);
if (!PunishmentCommand.isPunishedWithMessage(sender, Punishment.PunishmentType.NoFightServer)) {
SubserverSystem.sendPlayer(eventArena, player); SubserverSystem.sendPlayer(eventArena, player);
} }
}
@ClassMapper(Team.class) @ClassMapper(Team.class)
@Cached(cacheDuration = 10, global = true) @Cached(cacheDuration = 10, global = true)