From ff7e93fcebc172551c6c050ec9ef430e5846e8cd Mon Sep 17 00:00:00 2001
From: Mathieu Strypsteen <mathieu@strypsteen.me>
Date: Mon, 23 Sep 2024 08:07:55 +0200
Subject: [PATCH] Refactor

---
 .../java/gent/zeus/mc13dtl/events/catalog/ClimbEvent.java    | 2 +-
 src/main/java/gent/zeus/mc13dtl/events/catalog/EndEvent.java | 2 +-
 .../java/gent/zeus/mc13dtl/events/catalog/FallEvent.java     | 2 +-
 .../gent/zeus/mc13dtl/events/catalog/LightningEvent.java     | 2 +-
 src/main/java/gent/zeus/mc13dtl/group/SurvivalHandler.java   | 2 +-
 src/main/java/gent/zeus/mc13dtl/group/SurvivalRunner.java    | 5 ++---
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/ClimbEvent.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/ClimbEvent.java
index cd2c2fe..e764d33 100644
--- a/src/main/java/gent/zeus/mc13dtl/events/catalog/ClimbEvent.java
+++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/ClimbEvent.java
@@ -27,7 +27,7 @@ public class ClimbEvent extends Event {
 
     @Override
     public void start() {
-        if (MC13DTL.board.getPlayers(team).size() == 0) {
+        if (MC13DTL.board.getPlayers(team).isEmpty()) {
             return;
         }
         Player player = MC13DTL.board.getPlayers(team).getFirst();
diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/EndEvent.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/EndEvent.java
index 0db14e8..33e4170 100644
--- a/src/main/java/gent/zeus/mc13dtl/events/catalog/EndEvent.java
+++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/EndEvent.java
@@ -60,7 +60,7 @@ public class EndEvent extends Event {
   @EventHandler
   public void onEntityDeath(EntityDeathEvent event) {
     if (event.getEntityType() == EntityType.ENDER_DRAGON) {
-      if (MC13DTL.board.getPlayers(team).size() > 0) {
+      if (!MC13DTL.board.getPlayers(team).isEmpty()) {
         eventSuccess();
       }
     }
diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/FallEvent.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/FallEvent.java
index 1bf944c..7c3186e 100644
--- a/src/main/java/gent/zeus/mc13dtl/events/catalog/FallEvent.java
+++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/FallEvent.java
@@ -30,7 +30,7 @@ public class FallEvent extends Event {
 
     @Override
     public void start() {
-        if (MC13DTL.board.getPlayers(team).size() == 0) {
+        if (MC13DTL.board.getPlayers(team).isEmpty()) {
             return;
         }
         Player player = MC13DTL.board.getPlayers(team).getFirst();
diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/LightningEvent.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/LightningEvent.java
index 12e5337..c8acaff 100644
--- a/src/main/java/gent/zeus/mc13dtl/events/catalog/LightningEvent.java
+++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/LightningEvent.java
@@ -37,7 +37,7 @@ public class LightningEvent extends Event {
 
     @Override
     public void run() {
-        if (MC13DTL.board.getPlayers(team).size() == 0) {
+        if (MC13DTL.board.getPlayers(team).isEmpty()) {
             return;
         }
         World world = Bukkit.getWorld("world");
diff --git a/src/main/java/gent/zeus/mc13dtl/group/SurvivalHandler.java b/src/main/java/gent/zeus/mc13dtl/group/SurvivalHandler.java
index b1bdc48..3a74f54 100644
--- a/src/main/java/gent/zeus/mc13dtl/group/SurvivalHandler.java
+++ b/src/main/java/gent/zeus/mc13dtl/group/SurvivalHandler.java
@@ -10,7 +10,7 @@ import gent.zeus.mc13dtl.MC13DTL;
 public class SurvivalHandler implements Listener {
   @EventHandler
   public void onPlayerDeath(PlayerDeathEvent event) {
-    for (Team team : MC13DTL.board.getTeams().stream().toList()) {
+    for (Team team : MC13DTL.board.getTeams()) {
       if (MC13DTL.board.getPlayers(team).contains(event.getPlayer())) {
         MC13DTL.board.setDaysAlive(team, 0);
       }
diff --git a/src/main/java/gent/zeus/mc13dtl/group/SurvivalRunner.java b/src/main/java/gent/zeus/mc13dtl/group/SurvivalRunner.java
index f00d0b3..19630ff 100644
--- a/src/main/java/gent/zeus/mc13dtl/group/SurvivalRunner.java
+++ b/src/main/java/gent/zeus/mc13dtl/group/SurvivalRunner.java
@@ -24,7 +24,7 @@ public class SurvivalRunner implements Runnable {
         long day = Bukkit.getWorld("world").getFullTime() / 24000;
         if (day > lastRunDay) {
             List<Pair<Team, Integer>> grantedScores = new ArrayList<>();
-            for (Team team : MC13DTL.board.getTeams().stream().toList()) {
+            for (Team team : MC13DTL.board.getTeams()) {
                 if (!MC13DTL.board.getPlayers(team).isEmpty()) {
                     int currentDays = MC13DTL.board.getDaysAlive(team) + 1;
                     int score = (int) Math.pow(2, currentDays);
@@ -39,8 +39,7 @@ public class SurvivalRunner implements Runnable {
             for (Pair<Team, Integer> p : grantedScores) {
                 MC13DTL.instance.getServer().broadcast(
                         Component.text("Team " + p.getFirst().getName()).color(p.getFirst().color()).append(
-                                Component.text(" survived " + MC13DTL.board.getDaysAlive(p.getFirst()) + " days and was given " + p.getSecond() + " points").color(NamedTextColor.WHITE)
-                        ));
+                                Component.text(" survived " + MC13DTL.board.getDaysAlive(p.getFirst()) + " days and was given " + p.getSecond() + " points").color(NamedTextColor.WHITE)));
             }
         }
         world.getPersistentDataContainer().set(eventKey, PersistentDataType.LONG, day);