Upstream/UltimateStacker
1
0
Fork 0
mirror of https://github.com/songoda/UltimateStacker.git synced 2025-02-17 11:51:22 +01:00
Code Issues Projects Releases Wiki Activity

Clean up.

Browse Source
This commit is contained in:
Brianna 2019-07-08 15:42:19 -04:00
parent 442334d898
commit 00423da2ef
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/songoda/ultimatestacker/listeners/DeathListeners.java
View File

@ -2,7 +2,9 @@ package com.songoda.ultimatestacker.listeners;
import com.songoda.ultimatestacker.UltimateStacker; import com.songoda.ultimatestacker.UltimateStacker;
import com.songoda.ultimatestacker.utils.settings.Setting; import com.songoda.ultimatestacker.utils.settings.Setting;
import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.entity.Llama;
import org.bukkit.entity.Pig; import org.bukkit.entity.Pig;
import org.bukkit.event.EventHandler; import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority; import org.bukkit.event.EventPriority;
@ -10,6 +12,7 @@ import org.bukkit.event.Listener;
import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.entity.EntityDeathEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import java.util.ArrayList;
import java.util.List; import java.util.List;
public class DeathListeners implements Listener { public class DeathListeners implements Listener {
@ -23,21 +26,18 @@ public class DeathListeners implements Listener {
@EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
public void onEntityDeath(EntityDeathEvent event) { public void onEntityDeath(EntityDeathEvent event) {
List<ItemStack> items = Setting.CUSTOM_DROPS.getBoolean() List<ItemStack> items = Setting.CUSTOM_DROPS.getBoolean()
? instance.getLootManager().getDrops(event.getEntity()) : event.getDrops(); ? instance.getLootManager().getDrops(event.getEntity()) : new ArrayList<>();
if (items.size() != 0) { if (items.size() != 0) {
if (event.getEntity() instanceof Pig && ((Pig) event.getEntity()).hasSaddle())
event.getEntity().getWorld().dropItemNaturally(event.getEntity().getLocation(),
new ItemStack(Material.SADDLE));
event.getDrops().clear(); event.getDrops().clear();
} else
items = event.getDrops();
for (ItemStack item : items) { for (ItemStack item : items) {
if (item == null) continue; if (item == null) continue;
event.getEntity().getWorld().dropItemNaturally(event.getEntity().getLocation(), item); event.getEntity().getWorld().dropItemNaturally(event.getEntity().getLocation(), item);
} }
} else
items = event.getDrops();
if (instance.getEntityStackManager().isStacked(event.getEntity())) if (instance.getEntityStackManager().isStacked(event.getEntity()))
instance.getEntityStackManager().getStack(event.getEntity()) instance.getEntityStackManager().getStack(event.getEntity())

7
src/main/java/com/songoda/ultimatestacker/lootables/LootManager.java
View File

@ -312,6 +312,13 @@ public class LootManager {
.setAllowLootingEnchant(false).build()) .setAllowLootingEnchant(false).build())
.build())); .build()));
// Add Llama.
addLootable(new Lootable(EntityType.LLAMA,
new LootBuilder()
.setMaterial(Material.LEATHER)
.setMin(0)
.setMax(2).build()));
// Add Zombie Horse. // Add Zombie Horse.
addLootable(new Lootable(EntityType.ZOMBIE_HORSE, addLootable(new Lootable(EntityType.ZOMBIE_HORSE,
new LootBuilder() new LootBuilder()