From 081502b64c20c7d6b9f2109711c44ce918698d2d Mon Sep 17 00:00:00 2001 From: Xander Date: Sat, 21 Sep 2024 21:25:12 +0200 Subject: [PATCH] update kill best surviving team event --- .../catalog/KillSurvivingTeamEvent.java | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/KillSurvivingTeamEvent.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/KillSurvivingTeamEvent.java index b9e0be9..2d8e55c 100644 --- a/src/main/java/gent/zeus/mc13dtl/events/catalog/KillSurvivingTeamEvent.java +++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/KillSurvivingTeamEvent.java @@ -5,8 +5,10 @@ import gent.zeus.mc13dtl.events.Difficulty; import gent.zeus.mc13dtl.events.Event; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; +import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.PlayerDeathEvent; +import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.scoreboard.Team; public class KillSurvivingTeamEvent extends Event { @@ -28,10 +30,28 @@ public class KillSurvivingTeamEvent extends Event { @EventHandler @Override public void onPlayerDeath(PlayerDeathEvent event) { - if (MC13DTL.board.getPlayers(team).contains(event.getPlayer())) { - eventFailed(); - } else if (MC13DTL.board.getPlayers(huntingTeam).contains(event.getPlayer())) { + if (MC13DTL.board.getPlayers(huntingTeam).contains(event.getPlayer())) { + if (team.getName().equals(huntingTeam.getName())) { + eventFailed(); + } else { + eventSuccess(); + } + } + } + + @Override + public void eventTimeEnded() { + if (team.getName().equals(huntingTeam.getName())) { eventSuccess(); + } else { + eventFailed(); + } + } + + @EventHandler + public void onPlayerQuit(PlayerQuitEvent event) { + if (team.getName().equals(huntingTeam.getName()) && MC13DTL.board.getPlayers(team).contains(event.getPlayer())) { + eventFailed(); } }