Fix match not cancelling on initial leave

bolt-rip · Mar 31, 2021 · 5866562 · 5866562
1 parent 4af4bdb
commit 5866562
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/main/java/rip/bolt/ingame/ranked/PlayerWatcher.java b/src/main/java/rip/bolt/ingame/ranked/PlayerWatcher.java
@@ -24,6 +24,7 @@
 import tc.oc.pgm.events.PlayerJoinMatchEvent;
 import tc.oc.pgm.events.PlayerPartyChangeEvent;
 import tc.oc.pgm.lib.net.kyori.adventure.text.format.NamedTextColor;
+import tc.oc.pgm.result.TieVictoryCondition;
 
 public class PlayerWatcher implements Listener {
 
@@ -115,13 +116,14 @@ public void onMatchEndMonitor(MatchFinishEvent event) {
     forfeitManager.clearCheckers();
   }
 
-  @EventHandler(priority = EventPriority.MONITOR)
+  @EventHandler(priority = EventPriority.HIGHEST)
   public void onMatchStart(MatchStartEvent event) {
     if (!AppData.fullTeamsRequired()) return;
     if (!playersAbandoned(getMissingPlayers(event.getMatch()))) return;
 
     // the order of these two lines should not be changed
     rankedManager.postMatchStatus(event.getMatch(), MatchStatus.CANCELLED);
+    event.getMatch().addVictoryCondition(new TieVictoryCondition());
     event.getMatch().finish();
 
     event

diff --git a/src/main/java/rip/bolt/ingame/ranked/RankedManager.java b/src/main/java/rip/bolt/ingame/ranked/RankedManager.java
@@ -19,6 +19,7 @@
 import net.md_5.bungee.api.ChatColor;
 import org.bukkit.Bukkit;
 import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import rip.bolt.ingame.Ingame;
 import rip.bolt.ingame.api.definitions.BoltMatch;
@@ -171,7 +172,7 @@ public void onMatchLoad(MatchLoadEvent event) {
     postMatchStatus(event.getMatch(), MatchStatus.LOADED);
   }
 
-  @EventHandler
+  @EventHandler(priority = EventPriority.MONITOR)
   public void onMatchStart(MatchStartEvent event) {
     postMatchStatus(event.getMatch(), MatchStatus.STARTED);
   }