From 7b51417742b387348f2f9f75669518cbdc875936 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Fri, 8 Jan 2021 10:39:44 +1300 Subject: [PATCH] Update dependencies to not tbe transitive, fixes #537 --- pom.xml | 9 +++- .../disguise/disguisetypes/LibsEquipment.java | 48 ++++++++++++++++++- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d03364cf..6a7d52f9 100644 --- a/pom.xml +++ b/pom.xml @@ -53,7 +53,6 @@ - unknown ${maven.build.timestamp} @@ -76,26 +75,31 @@ org.ow2.asm asm ${asm.version} + true org.projectlombok lombok ${lombok.version} + true com.github.dmulloy2 ProtocolLib ${protocollib.version} + true org.spigotmc spigot-api ${spigot.version} + true org.spigotmc spigot ${spigot.version} + true @@ -103,17 +107,20 @@ junit ${junit.version} test + true com.destroystokyo.paper paper-api ${paper-api.version} provided + true net.md-5 bungeecord-chat ${bungeecord-chat.version} + true diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/LibsEquipment.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/LibsEquipment.java index 93dd9682..1b39a8e4 100644 --- a/src/main/java/me/libraryaddict/disguise/disguisetypes/LibsEquipment.java +++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/LibsEquipment.java @@ -34,8 +34,9 @@ public class LibsEquipment implements EntityEquipment { for (int i = 0; i < equipment.length; i++) { ItemStack item = equipment[i]; - if (item == null) + if (item == null) { continue; + } newEquip.equipment[i] = item.clone(); } @@ -48,8 +49,9 @@ public class LibsEquipment implements EntityEquipment { } public void setItem(EquipmentSlot slot, ItemStack item) { - if (getItem(slot) == item) + if (getItem(slot) == item) { return; + } equipment[slot.ordinal()] = item; flagWatcher.sendItemStack(slot, item); @@ -216,4 +218,46 @@ public class LibsEquipment implements EntityEquipment { public Entity getHolder() { throw new UnsupportedOperationException("This is not supported on a disguise"); } + + @Override + @Deprecated + public void setBoots(ItemStack boots, boolean silent) { + setBoots(boots); + } + + @Override + @Deprecated + public void setChestplate(ItemStack chestplate, boolean silent) { + setChestplate(chestplate); + } + + @Override + @Deprecated + public void setLeggings(ItemStack leggings, boolean silent) { + setLeggings(leggings); + } + + @Override + @Deprecated + public void setHelmet(ItemStack helmet, boolean silent) { + setHelmet(helmet); + } + + @Override + @Deprecated + public void setItem(EquipmentSlot equipmentSlot, ItemStack itemStack, boolean silent) { + setItem(equipmentSlot, itemStack); + } + + @Override + @Deprecated + public void setItemInMainHand(ItemStack itemStack, boolean silent) { + setItemInMainHand(itemStack); + } + + @Override + @Deprecated + public void setItemInOffHand(ItemStack itemStack, boolean silent) { + setItemInOffHand(itemStack); + } }