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

Merge pull request 'Optimize TechKO detection' (#221) from cleanupTechKO into master

Quellcode durchsuchen 
Reviewed-by: YoyoNow <jwsteam@nidido.de>
Dieser Commit ist enthalten in:
Lixfel 2020-12-25 18:25:59 +01:00
Commit efd9d91ff2
2 geänderte Dateien mit 35 neuen und 58 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

5
FightSystem_Main/src/de/steamwar/fightsystem/countdown/TechKOCountdown.java
Datei anzeigen

@ -22,15 +22,14 @@ package de.steamwar.fightsystem.countdown;
import de.steamwar.fightsystem.FightSystem;
import de.steamwar.fightsystem.fight.Fight;
import de.steamwar.fightsystem.fight.FightTeam;
import de.steamwar.fightsystem.winconditions.WinconditionTechKO;
import org.bukkit.Bukkit;
public class TechKOCountdown extends Countdown {
private final FightTeam team;
public TechKOCountdown(FightTeam team) {
super(WinconditionTechKO.TECH_KO_COUNTDOWN_TIME, SWSound.BLOCK_NOTE_PLING, false);
public TechKOCountdown(FightTeam team, int countdownTime) {
super(countdownTime, SWSound.BLOCK_NOTE_PLING, false);
this.team = team;
}

80
FightSystem_Main/src/de/steamwar/fightsystem/winconditions/WinconditionTechKO.java
Datei anzeigen

@ -28,41 +28,45 @@ import de.steamwar.fightsystem.states.FightState;
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.entity.TNTPrimed;
import org.bukkit.event.EventHandler;
import org.bukkit.event.entity.EntityExplodeEvent;
import org.bukkit.scheduler.BukkitTask;
import java.util.EnumSet;
import java.util.HashMap;
import java.util.Map;
public class WinconditionTechKO extends ListenerWincondition {
private static final int TECH_KO_TIME_IN_S = 90;
private static final int TECH_KO_HALF_TIME = TECH_KO_TIME_IN_S*10;
public static final int TECH_KO_COUNTDOWN_TIME = TECH_KO_HALF_TIME/20;
private World world = Bukkit.getWorlds().get(0);
private Map<Integer, Boolean> map = new HashMap<>(400);
private double toggle = Config.SpecSpawn.getZ();
private final World world = Bukkit.getWorlds().get(0);
private final double toggle = Config.SpecSpawn.getZ();
private final FightTeam smallerZteam;
private final FightTeam biggerZteam;
private int smallerZtime = TECH_KO_HALF_TIME;
private int biggerZtime = TECH_KO_HALF_TIME;
private TechKOCountdown smallerZcountdown = null;
private TechKOCountdown biggerZcountdown = null;
private BukkitTask task;
private boolean running = false;
/**
* Works only for z-Axis fight direction for performance reasons
*/
public WinconditionTechKO(){
super(Config.TechKO, EnumSet.of(FightState.RUNNING));
if(Config.TeamBluetoReddistanceZ > 0) {
smallerZteam = Fight.getBlueTeam();
biggerZteam = Fight.getRedTeam();
}else{
smallerZteam = Fight.getRedTeam();
biggerZteam = Fight.getBlueTeam();
}
}
@Override
public void enable() {
super.enable();
task = Bukkit.getScheduler().runTaskTimerAsynchronously(FightSystem.getPlugin(), this::run, 1, 1);
task = Bukkit.getScheduler().runTaskTimer(FightSystem.getPlugin(), this::run, 1, 1);
}
@Override
@ -79,58 +83,32 @@ public class WinconditionTechKO extends ListenerWincondition {
task.cancel();
}
@EventHandler
public void onEntityDead(EntityExplodeEvent event){
map.remove(event.getEntity().getEntityId());
}
private void run(){
if(running)
return;
running = true;
for(TNTPrimed tnt : world.getEntitiesByClass(TNTPrimed.class)){
int id = tnt.getEntityId();
boolean smallerZ = tnt.getLocation().getZ() < toggle;
Boolean old = map.put(id, smallerZ);
if(old != null && old != smallerZ){
if(old)
double z = tnt.getLocation().getZ();
boolean smallerZ = z < toggle;
boolean wasSmallerZ = z - tnt.getVelocity().getZ() < toggle;
if(wasSmallerZ && !smallerZ) {
smallerZtime = TECH_KO_HALF_TIME;
else
biggerZtime = TECH_KO_HALF_TIME;
}
}
if(smallerZtime == TECH_KO_HALF_TIME && smallerZcountdown != null){
if(smallerZcountdown != null){
smallerZcountdown.disable();
smallerZcountdown = null;
}else if(smallerZtime == 0){
smallerZcountdown = new TechKOCountdown(smallerTeam());
}
if(biggerZtime == TECH_KO_HALF_TIME && biggerZcountdown != null){
}else if(!wasSmallerZ && smallerZ){
biggerZtime = TECH_KO_HALF_TIME;
if(biggerZcountdown != null){
biggerZcountdown.disable();
biggerZcountdown = null;
}else if(biggerZtime == 0){
biggerZcountdown = new TechKOCountdown(biggerTeam());
}
}
}
if(smallerZtime == 0)
smallerZcountdown = new TechKOCountdown(smallerZteam, TECH_KO_HALF_TIME / 20);
if(biggerZtime == 0)
biggerZcountdown = new TechKOCountdown(biggerZteam, TECH_KO_HALF_TIME / 20);
smallerZtime--;
biggerZtime--;
running = false;
}
private FightTeam smallerTeam(){
if(Config.TeamBluetoReddistanceZ > 0)
return Fight.getBlueTeam();
else
return Fight.getRedTeam();
}
private FightTeam biggerTeam(){
if(Config.TeamBluetoReddistanceZ < 0)
return Fight.getBlueTeam();
else
return Fight.getRedTeam();
}
}