From a387b825f92c22af72f3d2140fdf10fe238faae4 Mon Sep 17 00:00:00 2001
From: 3D_MAMA <34866314+arvitus@users.noreply.github.com>
Date: Thu, 10 Aug 2023 14:37:01 +0200
Subject: [PATCH 1/2] update bukkit dependency

---
 pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8a0458e..1572526 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,7 +91,7 @@
         <dependency>
             <groupId>org.bukkit</groupId>
             <artifactId>bukkit</artifactId>
-            <version>1.12-R0.1-SNAPSHOT</version>
+            <version>1.12.2-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
@@ -108,6 +108,11 @@
             <version>2.9.2</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.18-R0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <repositories>

From 5ca3c9b3afef1ce2e8aeb998bfab3f637f2d6dd4 Mon Sep 17 00:00:00 2001
From: 3D_MAMA <34866314+arvitus@users.noreply.github.com>
Date: Thu, 10 Aug 2023 14:54:16 +0200
Subject: [PATCH 2/2] fix team getting only selected when teamName ==
 playerName

---
 .../extracontexts/calculators/TeamCalculator.java    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/main/java/me/lucko/extracontexts/calculators/TeamCalculator.java b/src/main/java/me/lucko/extracontexts/calculators/TeamCalculator.java
index 074350e..4c9a93a 100644
--- a/src/main/java/me/lucko/extracontexts/calculators/TeamCalculator.java
+++ b/src/main/java/me/lucko/extracontexts/calculators/TeamCalculator.java
@@ -13,9 +13,15 @@ public class TeamCalculator implements ContextCalculator<Player> {
 
     @Override
     public void calculate(Player target, ContextConsumer consumer) {
-        Team team = Bukkit.getScoreboardManager().getMainScoreboard().getTeam(target.getName());
-        if (team != null) {
-            consumer.accept(KEY, team.getName());
+        String teamName = null;
+        for (Team team : Bukkit.getScoreboardManager().getMainScoreboard().getTeams()) {
+            if (team.hasEntry(target.getName())) {
+                teamName = team.getName();
+                break;
+            }
+        }
+        if (teamName != null) {
+            consumer.accept(KEY, teamName);
         }
     }