12
1

Merge pull request 'Hotfix FightTeam' (#368) from AmongUS into master
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Reviewed-on: #368
Dieser Commit ist enthalten in:
Lixfel 2022-10-08 18:49:34 +02:00
Commit cc079c1476

Datei anzeigen

@ -32,6 +32,7 @@ import de.steamwar.fightsystem.states.FightState;
import de.steamwar.fightsystem.states.OneShotStateDependent;
import de.steamwar.fightsystem.states.StateDependent;
import de.steamwar.fightsystem.utils.*;
import de.steamwar.fightsystem.winconditions.Winconditions;
import de.steamwar.inventory.SWItem;
import de.steamwar.sql.SchematicNode;
import de.steamwar.sql.SteamwarUser;
@ -128,7 +129,9 @@ public class FightTeam {
WorldOfColorWrapper.impl.setTeamColor(team, color);
BountifulWrapper.impl.setNametagVisibility(team);
team.setNameTagVisibility(NameTagVisibility.HIDE_FOR_OTHER_TEAMS);
team.setAllowFriendlyFire(false);
if (!Config.ActiveWinconditions.contains(Winconditions.AMONG_US)) {
team.setAllowFriendlyFire(false);
}
new OneShotStateDependent(ArenaMode.Restartable, FightState.PreLeaderSetup, () -> Bukkit.getScheduler().runTask(FightSystem.getPlugin(), this::reset));
new OneShotStateDependent(Config.replayserver(), FightState.PreLeaderSetup, () -> Bukkit.getScheduler().runTask(FightSystem.getPlugin(), this::reset));