SteamWar/FightSystem
SteamWar/FightSystem
Archiviert
13
1
Fork 0
Code Issues 6 Pull-Requests Releases Wiki Aktivität

Various fixes

Quellcode durchsuchen 
Signed-off-by: Lixfel <agga-games@gmx.de>
Dieser Commit ist enthalten in:
Lixfel 2021-03-31 22:16:12 +02:00
Ursprung f018ba0afd
Commit 0a0bf3ff11
4 geänderte Dateien mit 5 neuen und 2 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

2
FightSystem_Main/src/de/steamwar/fightsystem/commands/SkipCommand.java
Datei anzeigen

@ -30,7 +30,7 @@ import org.bukkit.entity.Player;
public class SkipCommand implements CommandExecutor { public class SkipCommand implements CommandExecutor {
public SkipCommand() { public SkipCommand() {
new StateDependentCommand(ArenaMode.AntiPrepare, FightState.Ingame, "skip", this); new StateDependentCommand(ArenaMode.AntiPrepare, FightState.TeamFix, "skip", this);
} }
@Override @Override

2
FightSystem_Main/src/de/steamwar/fightsystem/fight/FightTeam.java
Datei anzeigen

@ -332,6 +332,8 @@ public class FightTeam implements IFightTeam{
if(skip){ if(skip){
broadcast(FightSystem.PREFIX + "§aEuer Team ist nun bereit, zum nächsten Event zu beschleunigen!"); broadcast(FightSystem.PREFIX + "§aEuer Team ist nun bereit, zum nächsten Event zu beschleunigen!");
if(Fight.getOpposite(this).skip || Config.test()){ if(Fight.getOpposite(this).skip || Config.test()){
skip = false;
Fight.getOpposite(this).skip = false;
Countdown.skip(); Countdown.skip();
} }
}else{ }else{

1
FightSystem_Main/src/de/steamwar/fightsystem/states/FightState.java
Datei anzeigen

@ -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> 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> 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> 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))); public static final Set<FightState> AntiRunning = Collections.unmodifiableSet(EnumSet.complementOf(EnumSet.of(RUNNING)));

2
FightSystem_Main/src/de/steamwar/fightsystem/winconditions/WinconditionPoints.java
Datei anzeigen

@ -123,10 +123,10 @@ public class WinconditionPoints extends Wincondition implements PrintableWincond
TeamPoints(FightTeam team){ TeamPoints(FightTeam team){
this.team = team; this.team = team;
this.percent = new WinconditionRelativePercent.TeamPercent(team); this.percent = new WinconditionRelativePercent.TeamPercent(team);
this.points = 0;
} }
public void enable() { public void enable() {
this.points = 0;
percent.enable(); percent.enable();
int ownBlocks = percent.getBlockCount(); int ownBlocks = percent.getBlockCount();
int enemyBlocks = teamMap.get(Fight.getOpposite(team)).percent.getBlockCount(); int enemyBlocks = teamMap.get(Fight.getOpposite(team)).percent.getBlockCount();