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

HellsBells improvements #358

Zusammengeführt
Lixfel hat 2 Commits von hbFixes nach master 2022-07-24 21:53:37 +02:00 zusammengeführt
Diskussion 1 Commits 2 Geänderte Dateien 1 +8 -6
1 geänderte Dateien mit 8 neuen und 6 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen
Nur Änderungen aus Commit 6ed091e9b4 werden angezeigt - Alle Commits anzeigen

14
FightSystem_Core/src/de/steamwar/fightsystem/event/HellsBells.java
Datei anzeigen

@ -43,8 +43,8 @@ public class HellsBells {
public static final Random random = new Random(); public static final Random random = new Random();
private final int xLength = Config.RedExtendRegion.getMaxX() - Config.RedExtendRegion.getMinX(); private final int xLength = Config.BluePasteRegion.getSizeX();
private final int zLength = Config.RedExtendRegion.getMaxZ() - Config.RedExtendRegion.getMinZ(); private final int zLength = Config.BluePasteRegion.getSizeZ();
private State current = State.PRE; private State current = State.PRE;
private int currentDrops = 0; private int currentDrops = 0;
private HellsBellsCountdown currentCountdown; private HellsBellsCountdown currentCountdown;
@ -87,11 +87,11 @@ public class HellsBells {
Point blueStart; Point blueStart;
if (direction.isNorthOrWest()) { if (direction.isNorthOrWest()) {
redStart = new Point(Config.RedExtendRegion.getMaxX() - xOffset, Config.RedExtendRegion.getMaxY() + yOffset, Config.RedExtendRegion.getMaxZ() - zOffset); redStart = new Point(Config.RedPasteRegion.getMaxX() - xOffset, Config.RedPasteRegion.getMaxY() + yOffset, Config.RedPasteRegion.getMaxZ() - zOffset);
blueStart = new Point(Config.BlueExtendRegion.getMinX() + xOffset, Config.BlueExtendRegion.getMaxY() + yOffset, Config.BlueExtendRegion.getMinZ() + zOffset); blueStart = new Point(Config.BluePasteRegion.getMinX() + xOffset, Config.BluePasteRegion.getMaxY() + yOffset, Config.BluePasteRegion.getMinZ() + zOffset);
} else { } else {
redStart = new Point(Config.RedExtendRegion.getMinX() + xOffset, Config.RedExtendRegion.getMaxY() + yOffset, Config.RedExtendRegion.getMinZ() + zOffset); redStart = new Point(Config.RedPasteRegion.getMinX() + xOffset, Config.RedPasteRegion.getMaxY() + yOffset, Config.RedPasteRegion.getMinZ() + zOffset);
blueStart = new Point(Config.BlueExtendRegion.getMaxX() - xOffset, Config.BlueExtendRegion.getMaxY() + yOffset, Config.BlueExtendRegion.getMaxZ() - zOffset); blueStart = new Point(Config.BluePasteRegion.getMaxX() - xOffset, Config.BluePasteRegion.getMaxY() + yOffset, Config.BluePasteRegion.getMaxZ() - zOffset);
} }
currentDropping = Bukkit.getScheduler().runTaskTimer(FightSystem.getPlugin(), () -> { currentDropping = Bukkit.getScheduler().runTaskTimer(FightSystem.getPlugin(), () -> {
@ -126,6 +126,8 @@ public class HellsBells {
new StateDependent(Winconditions.HELLS_BELLS, FightState.Running) { new StateDependent(Winconditions.HELLS_BELLS, FightState.Running) {
@Override @Override
public void enable() { public void enable() {
current = State.PRE;
currentDrops = 0;
startCountdown(); startCountdown();
} }