Various fixes
Signed-off-by: Lixfel <agga-games@gmx.de>
Dieser Commit ist enthalten in:
Ursprung
f018ba0afd
Commit
0a0bf3ff11
@ -30,7 +30,7 @@ import org.bukkit.entity.Player;
|
||||
public class SkipCommand implements CommandExecutor {
|
||||
|
||||
public SkipCommand() {
|
||||
new StateDependentCommand(ArenaMode.AntiPrepare, FightState.Ingame, "skip", this);
|
||||
new StateDependentCommand(ArenaMode.AntiPrepare, FightState.TeamFix, "skip", this);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
@ -332,6 +332,8 @@ public class FightTeam implements IFightTeam{
|
||||
if(skip){
|
||||
broadcast(FightSystem.PREFIX + "§aEuer Team ist nun bereit, zum nächsten Event zu beschleunigen!");
|
||||
if(Fight.getOpposite(this).skip || Config.test()){
|
||||
skip = false;
|
||||
Fight.getOpposite(this).skip = false;
|
||||
Countdown.skip();
|
||||
}
|
||||
}else{
|
||||
|
@ -40,6 +40,7 @@ public enum FightState {
|
||||
|
||||
public static final Set<FightState> Setup = Collections.unmodifiableSet(EnumSet.of(PRE_LEADER_SETUP, PRE_SCHEM_SETUP, POST_SCHEM_SETUP));
|
||||
public static final Set<FightState> Ingame = Collections.unmodifiableSet(EnumSet.of(PRE_RUNNING, RUNNING));
|
||||
public static final Set<FightState> TeamFix = Collections.unmodifiableSet(EnumSet.of(PRE_RUNNING, RUNNING, SPECTATE));
|
||||
public static final Set<FightState> Schem = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(PRE_LEADER_SETUP, PRE_SCHEM_SETUP)));
|
||||
public static final Set<FightState> AntiRunning = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(RUNNING)));
|
||||
|
||||
|
@ -123,10 +123,10 @@ public class WinconditionPoints extends Wincondition implements PrintableWincond
|
||||
TeamPoints(FightTeam team){
|
||||
this.team = team;
|
||||
this.percent = new WinconditionRelativePercent.TeamPercent(team);
|
||||
this.points = 0;
|
||||
}
|
||||
|
||||
public void enable() {
|
||||
this.points = 0;
|
||||
percent.enable();
|
||||
int ownBlocks = percent.getBlockCount();
|
||||
int enemyBlocks = teamMap.get(Fight.getOpposite(team)).percent.getBlockCount();
|
||||
|
In neuem Issue referenzieren
Einen Benutzer sperren