SteamWar/FightSystem
Archiviert
13
1

RedstoneWincondition #274

Geschlossen
YoyoNow möchte 18 Commits von RedstoneWincondition nach master mergen
Nur Änderungen aus Commit 08ef10a3d8 werden angezeigt - Alle Commits anzeigen

Datei anzeigen

@ -62,7 +62,7 @@ public class WinconditionRelativeRedstonePercent extends Wincondition implements
private int currentBlocks;
public TeamPercent(FightTeam team) {
super(Winconditions.RELATIVE_PERCENT, FightState.Running);
super(Winconditions.RELATIVE_REDSTONE_PERCENT, FightState.Running);
this.team = team;
this.currentBlocks = 1;
register();
@ -71,7 +71,7 @@ public class WinconditionRelativeRedstonePercent extends Wincondition implements
@Override
public void enable() {
blockCount = currentBlocks();
task = Bukkit.getScheduler().runTaskTimer(FightSystem.getPlugin(), this::check, 400, 400);
task = Bukkit.getScheduler().runTaskTimer(FightSystem.getPlugin(), this::check, 100, 100);
}
@Override
@ -97,10 +97,6 @@ public class WinconditionRelativeRedstonePercent extends Wincondition implements
return (blockCount - currentBlocks) * 100 / (double) blockCount;
}
public int getBlockCount() {
return blockCount;
}
private int currentBlocks() {
// Entern active
if (!Config.EnterStages.isEmpty() && Config.EnterStages.get(0) >= Wincondition.getTimeOverCountdown().getTimeLeft())
@ -125,14 +121,10 @@ public class WinconditionRelativeRedstonePercent extends Wincondition implements
case NOTE_BLOCK:
case REDSTONE_BLOCK:
case REDSTONE:
case REPEATER:
case COMPARATOR:
case OBSERVER:
case HOPPER:
case REDSTONE_LAMP:
case REDSTONE_TORCH:
case REDSTONE_WALL_TORCH:
case REDSTONE_WIRE:
currentBlocks++;
break;
default: