SteamWar/FightSystem
Archiviert
13
1

Merge remote-tracking branch 'origin/Meteor' into Meteor
Alle Prüfungen waren erfolgreich
SteamWarCI Build successful

Dieser Commit ist enthalten in:
yoyosource 2022-02-10 18:37:09 +01:00
Commit b294457641

Datei anzeigen

@ -106,8 +106,7 @@ public class PercentWincondition extends Wincondition implements PrintableWincon
@EventHandler
public void onEntityExplode(EntityExplodeEvent event) {
if (event.getEntityType() != EntityType.FIREBALL) {
if (explosionFilter.getAsBoolean() || !team.getExtendRegion().inRegion(event.getEntity().getLocation())) {
if (event.getEntityType() == EntityType.FIREBALL || explosionFilter.getAsBoolean() || !team.getExtendRegion().inRegion(event.getEntity().getLocation())) {
return;
}
@ -119,7 +118,6 @@ public class PercentWincondition extends Wincondition implements PrintableWincon
checkWin.accept(team);
}
}
private void enable() {
totalBlocks = totalBlockCalc.applyAsInt(team);