From 33914ac2844a2f6f4bbd56b660b03acf45597f9a Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Tue, 15 Jun 2021 21:11:06 +0100
Subject: [PATCH] Added COPPER_ORE to TeamUtils

---
 eco-api/build.gradle                                       | 2 +-
 .../com/willfp/eco/internal/arrows/ArrowDataListener.java  | 7 ++-----
 eco-api/src/main/java/com/willfp/eco/util/TeamUtils.java   | 5 +++++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/eco-api/build.gradle b/eco-api/build.gradle
index 943f317c..1f440e13 100644
--- a/eco-api/build.gradle
+++ b/eco-api/build.gradle
@@ -6,7 +6,7 @@ group 'com.willfp'
 version rootProject.version
 
 dependencies {
-    compileOnly 'org.spigotmc:spigot:1.16.4-R0.1-SNAPSHOT'
+    compileOnly 'org.spigotmc:spigot:1.17-R0.1-SNAPSHOT'
     compileOnly 'org.apache.maven:maven-artifact:3.0.3'
     compileOnly 'org.bstats:bstats-bukkit:1.7'
     compileOnly 'com.comphenix.protocol:ProtocolLib:4.6.0-SNAPSHOT'
diff --git a/eco-api/src/main/java/com/willfp/eco/internal/arrows/ArrowDataListener.java b/eco-api/src/main/java/com/willfp/eco/internal/arrows/ArrowDataListener.java
index bd2097dc..d1cb48bc 100644
--- a/eco-api/src/main/java/com/willfp/eco/internal/arrows/ArrowDataListener.java
+++ b/eco-api/src/main/java/com/willfp/eco/internal/arrows/ArrowDataListener.java
@@ -31,16 +31,13 @@ public class ArrowDataListener extends PluginDependent implements Listener {
      */
     @EventHandler(priority = EventPriority.LOWEST)
     public void onLaunch(final ProjectileLaunchEvent event) {
-        if (!(event.getEntity() instanceof Arrow)) {
+        if (!(event.getEntity() instanceof Arrow arrow)) {
             return;
         }
-        if (!(event.getEntity().getShooter() instanceof LivingEntity)) {
+        if (!(event.getEntity().getShooter() instanceof LivingEntity entity)) {
             return;
         }
 
-        Arrow arrow = (Arrow) event.getEntity();
-        LivingEntity entity = (LivingEntity) arrow.getShooter();
-
         if (entity.getEquipment() == null) {
             return;
         }
diff --git a/eco-api/src/main/java/com/willfp/eco/util/TeamUtils.java b/eco-api/src/main/java/com/willfp/eco/util/TeamUtils.java
index 09e8b9a3..74e826e7 100644
--- a/eco-api/src/main/java/com/willfp/eco/util/TeamUtils.java
+++ b/eco-api/src/main/java/com/willfp/eco/util/TeamUtils.java
@@ -2,6 +2,7 @@ package com.willfp.eco.util;
 
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
+import com.willfp.eco.core.Prerequisite;
 import lombok.experimental.UtilityClass;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -81,5 +82,9 @@ public class TeamUtils {
         MATERIAL_COLORS.forcePut(Material.DIAMOND_ORE, ChatColor.AQUA);
         MATERIAL_COLORS.forcePut(Material.EMERALD_ORE, ChatColor.GREEN);
         MATERIAL_COLORS.forcePut(Material.ANCIENT_DEBRIS, ChatColor.DARK_RED);
+
+        if (Prerequisite.v1_17.isMet()) {
+            MATERIAL_COLORS.forcePut(Material.COPPER_ORE, ChatColor.GOLD);
+        }
     }
 }