Merge branch 'master' into tower-generator

# Conflicts:
#	src/de/steamwar/towerrun/countdowns/LobbyCountdown.java

src/de/steamwar/towerrun/TowerRun.java

@@ -33,6 +33,7 @@ import de.steamwar.towerrun.listener.NotLobbyListener;
 import lombok.Getter;
 import org.bukkit.plugin.java.JavaPlugin;
 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.Plugin;
 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;
 
 @Plugin(name = "TowerRun", version = "1.0.0")
-@Dependency(value = "SpigotCore")
-@Author(value = "YoyoNow")
-@Author(value = "Chaoscaot")
-@Description(value = "SteamWar TowerRun Plugin")
+@Dependency("SpigotCore")
+@Author("YoyoNow")
+@Author("Chaoscaot")
+@Description("SteamWar TowerRun Plugin")
+@ApiVersion(ApiVersion.Target.v1_19)
 public class TowerRun extends JavaPlugin {
 
     @Getter

src/de/steamwar/towerrun/winconditions/LastOutsideWincondition.java

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