Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Added COPPER_ORE to TeamUtils

Browse Source
This commit is contained in:
Auxilor
2021-06-15 21:11:06 +01:00
parent 2acf2ee687
commit 33914ac284
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eco-api/build.gradle
View File

@@ -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'

7
eco-api/src/main/java/com/willfp/eco/internal/arrows/ArrowDataListener.java
View File

@@ -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;
}

5
eco-api/src/main/java/com/willfp/eco/util/TeamUtils.java
View File

@@ -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);
}
}
}