SteamWar/TowerRun
Archiviert
13
0
Fork 0
Code Issues Pull-Requests Pakete Projekte Releases Wiki Aktivität

Merge branch 'master' into tower-generator

Quellcode durchsuchen 
# Conflicts:
#	src/de/steamwar/towerrun/countdowns/LobbyCountdown.java
Dieser Commit ist enthalten in:
yoyosource 2023-08-19 11:58:07 +02:00
Commit bbaefaac8f
2 geänderte Dateien mit 8 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

10
src/de/steamwar/towerrun/TowerRun.java
Datei anzeigen

@ -33,6 +33,7 @@ import de.steamwar.towerrun.listener.NotLobbyListener;
import lombok.Getter; import lombok.Getter;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.plugin.java.annotation.dependency.Dependency; import org.bukkit.plugin.java.annotation.dependency.Dependency;
import org.bukkit.plugin.java.annotation.plugin.ApiVersion;
import org.bukkit.plugin.java.annotation.plugin.Description; import org.bukkit.plugin.java.annotation.plugin.Description;
import org.bukkit.plugin.java.annotation.plugin.Plugin; import org.bukkit.plugin.java.annotation.plugin.Plugin;
import org.bukkit.plugin.java.annotation.plugin.author.Author; import org.bukkit.plugin.java.annotation.plugin.author.Author;
@ -40,10 +41,11 @@ import org.bukkit.plugin.java.annotation.plugin.author.Author;
import java.util.Optional; import java.util.Optional;
@Plugin(name = "TowerRun", version = "1.0.0") @Plugin(name = "TowerRun", version = "1.0.0")
@Dependency(value = "SpigotCore") @Dependency("SpigotCore")
@Author(value = "YoyoNow") @Author("YoyoNow")
@Author(value = "Chaoscaot") @Author("Chaoscaot")
@Description(value = "SteamWar TowerRun Plugin") @Description("SteamWar TowerRun Plugin")
@ApiVersion(ApiVersion.Target.v1_19)
public class TowerRun extends JavaPlugin { public class TowerRun extends JavaPlugin {
@Getter @Getter

3
src/de/steamwar/towerrun/winconditions/LastOutsideWincondition.java
Datei anzeigen

@ -23,6 +23,7 @@ import de.steamwar.towerrun.game.TowerRunGame;
import de.steamwar.towerrun.game.TowerRunPlayer; import de.steamwar.towerrun.game.TowerRunPlayer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
import org.bukkit.event.entity.PlayerDeathEvent; import org.bukkit.event.entity.PlayerDeathEvent;
public class LastOutsideWincondition extends OutsideWincondition{ public class LastOutsideWincondition extends OutsideWincondition{
@ -39,7 +40,7 @@ public class LastOutsideWincondition extends OutsideWincondition{
} }
} }
@EventHandler @EventHandler(priority = EventPriority.LOW)
public void onPlayerDeath(PlayerDeathEvent event) { public void onPlayerDeath(PlayerDeathEvent event) {
if(TowerRunGame.PLAYERS_ALIVE.isEmpty()) { if(TowerRunGame.PLAYERS_ALIVE.isEmpty()) {
if(TowerRunGame.PLAYERS_ESCAPED.isEmpty()) { if(TowerRunGame.PLAYERS_ESCAPED.isEmpty()) {