Upstream/UltimateStacker
1
0
Fork 0
mirror of https://github.com/songoda/UltimateStacker.git synced 2024-11-23 18:45:39 +01:00
Code Issues Projects Releases Wiki Activity

Added support for colored llamas and horses with equipment.

Browse Source
This commit is contained in:
Brianna 2019-04-23 11:14:38 -04:00
parent 506179739d
commit 768986a50c
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/songoda/ultimatestacker/utils/Methods.java
View File

@ -99,6 +99,8 @@ public class Methods {
newEntity.setVelocity(killed.getVelocity()); newEntity.setVelocity(killed.getVelocity());
if (killed instanceof Ageable && !((Ageable) killed).isAdult()) { if (killed instanceof Ageable && !((Ageable) killed).isAdult()) {
((Ageable) newEntity).setBaby(); ((Ageable) newEntity).setBaby();
} else if (killed instanceof Llama) {
((Llama) newEntity).setColor(((Llama) killed).getColor());
} else if (killed instanceof Sheep) { } else if (killed instanceof Sheep) {
((Sheep) newEntity).setColor(((Sheep) killed).getColor()); ((Sheep) newEntity).setColor(((Sheep) killed).getColor());
} else if (killed instanceof Villager) { } else if (killed instanceof Villager) {
@ -138,12 +140,19 @@ public class Methods {
entityList.removeIf(entity -> ((Sheep) entity).isSheared()); entityList.removeIf(entity -> ((Sheep) entity).isSheared());
} }
entityList.removeIf(entity -> ((Sheep) entity).getColor() != sheep.getColor()); entityList.removeIf(entity -> ((Sheep) entity).getColor() != sheep.getColor());
} else if (UltimateStacker.getInstance().isServerVersionAtLeast(ServerVersion.V1_11) && initalEntity instanceof Llama) {
Llama llama = ((Llama) initalEntity);
entityList.removeIf(entity -> ((Llama) entity).getColor() != llama.getColor());
} else if (initalEntity instanceof Villager) { } else if (initalEntity instanceof Villager) {
Villager villager = ((Villager) initalEntity); Villager villager = ((Villager) initalEntity);
entityList.removeIf(entity -> ((Villager) entity).getProfession() != villager.getProfession()); entityList.removeIf(entity -> ((Villager) entity).getProfession() != villager.getProfession());
} else if (initalEntity instanceof Slime) { } else if (initalEntity instanceof Slime) {
Slime slime = ((Slime) initalEntity); Slime slime = ((Slime) initalEntity);
entityList.removeIf(entity -> ((Slime)entity).getSize() != slime.getSize()); entityList.removeIf(entity -> ((Slime)entity).getSize() != slime.getSize());
} else if (initalEntity instanceof Horse) {
entityList.removeIf(entity -> ((Horse) entity).getInventory().getSaddle() != null
|| ((Horse) entity).getInventory().getArmor() != null);
//ToDo: Should be triple checked
} }
if (initalEntity.hasMetadata("breedCooldown")) { if (initalEntity.hasMetadata("breedCooldown")) {