SpigotMC/LibsDisguises
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed Silver to Gray, fixed colors sometimes being inaccurate #310

Browse Source
This commit is contained in:
libraryaddict
2018-10-24 10:09:32 +13:00
parent e4d66e36df
commit 4467075a35
6 changed files with 121 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/me/libraryaddict/disguise/utilities/packetlisteners/PacketListenerClientInteract.java
View File

@@ -13,8 +13,6 @@ import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.disguisetypes.watchers.SheepWatcher;
import me.libraryaddict.disguise.disguisetypes.watchers.WolfWatcher;
import me.libraryaddict.disguise.utilities.DisguiseUtilities;
import org.bukkit.Material;
import org.bukkit.entity.*;
import org.bukkit.inventory.ItemStack;
@@ -45,16 +43,22 @@ public class PacketListenerClientInteract extends PacketAdapter {
for (ItemStack item : new ItemStack[]{observer.getInventory().getItemInMainHand(),
observer.getInventory().getItemInOffHand()}) {
if (item == null || item.getType() != Material.INK_SAC)
if (item == null) {
continue;
}
AnimalColor color = AnimalColor.getColorByMaterial(item.getType());
if (color == null) {
continue;
}
Disguise disguise = DisguiseAPI.getDisguise(observer, entity);
if (disguise == null ||
(disguise.getType() != DisguiseType.SHEEP && disguise.getType() != DisguiseType.WOLF))
(disguise.getType() != DisguiseType.SHEEP && disguise.getType() != DisguiseType.WOLF)) {
continue;
AnimalColor color = AnimalColor.getColor(item.getDurability());
}
if (disguise.getType() == DisguiseType.SHEEP) {
SheepWatcher watcher = (SheepWatcher) disguise.getWatcher();