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

Add saddleable horses, carpetable llamas.

Browse Source
This commit is contained in:
libraryaddict
2019-11-14 15:25:26 +13:00
parent 8015db68f6
commit 2b7c295d2c
4 changed files with 123 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,16 +14,15 @@ import me.libraryaddict.disguise.disguisetypes.AnimalColor;
import me.libraryaddict.disguise.disguisetypes.Disguise;
import me.libraryaddict.disguise.disguisetypes.DisguiseType;
import me.libraryaddict.disguise.disguisetypes.TargetedDisguise;
import me.libraryaddict.disguise.disguisetypes.watchers.CatWatcher;
import me.libraryaddict.disguise.disguisetypes.watchers.OcelotWatcher;
import me.libraryaddict.disguise.disguisetypes.watchers.SheepWatcher;
import me.libraryaddict.disguise.disguisetypes.watchers.WolfWatcher;
import me.libraryaddict.disguise.disguisetypes.watchers.*;
import me.libraryaddict.disguise.events.DisguiseInteractEvent;
import me.libraryaddict.disguise.utilities.DisguiseUtilities;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.*;
import org.bukkit.inventory.EquipmentSlot;
import org.bukkit.inventory.ItemStack;
import org.bukkit.material.Wool;
import org.bukkit.scheduler.BukkitRunnable;
public class PacketListenerClientInteract extends PacketAdapter {
@@ -86,11 +85,84 @@ public class PacketListenerClientInteract extends PacketAdapter {
}
}
if (disguise.getType() != DisguiseType.SHEEP && disguise.getType() != DisguiseType.WOLF &&
disguise.getType() != DisguiseType.CAT) {
return;
}
switch (disguise.getType()) {
case CAT:
case WOLF:
case SHEEP:
doDyeable(observer, disguise);
break;
case MULE:
case DONKEY:
case HORSE:
case ZOMBIE_HORSE:
case SKELETON_HORSE:
if (DisguiseConfig.isHorseSaddleable()) {
doSaddleable(observer, disguise);
}
break;
case LLAMA:
case TRADER_LLAMA:
if (DisguiseConfig.isLlamaCarpetable()) {
doCarpetable(observer, disguise);
}
break;
default:
break;
}
}
private void doSaddleable(Player observer, Disguise disguise) {
new BukkitRunnable() {
@Override
public void run() {
// If this is something the player can dye the disguise with
for (ItemStack item : new ItemStack[]{observer.getInventory().getItemInMainHand(),
observer.getInventory().getItemInOffHand()}) {
if (item == null || item.getType() != Material.SADDLE) {
continue;
}
AbstractHorseWatcher watcher = (TraderLlamaWatcher) disguise.getWatcher();
watcher.setSaddled(true);
break;
}
}
}.runTask(LibsDisguises.getInstance());
}
private void doCarpetable(Player observer, Disguise disguise) {
new BukkitRunnable() {
@Override
public void run() {
// If this is something the player can dye the disguise with
for (ItemStack item : new ItemStack[]{observer.getInventory().getItemInMainHand(),
observer.getInventory().getItemInOffHand()}) {
if (item == null || !item.getType().name().endsWith("_CARPET")) {
continue;
}
AnimalColor color = AnimalColor.getColorByWool(item.getType());
if (color == null) {
continue;
}
LlamaWatcher llamaWatcher = (LlamaWatcher) disguise.getWatcher();
llamaWatcher.setSaddled(true);
llamaWatcher.setCarpet(color);
break;
}
}
}.runTask(LibsDisguises.getInstance());
}
private void doDyeable(Player observer, Disguise disguise) {
new BukkitRunnable() {
@Override
public void run() {