Upstream
/
UltimateStacker
mirror of https://github.com/songoda/UltimateStacker.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Better more accurate calculations for custom drops.

This commit is contained in:
Brianna 2019-07-09 15:35:29 -04:00
parent 94cfe24ae2
commit 1b2731fd2d
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/songoda/ultimatestacker/entity/EntityStack.java
View File

@ -107,7 +107,7 @@ public class EntityStack {
return null;
}
private void handleWholeStackDeath(LivingEntity killed, List<ItemStack> items, int droppedExp) {
private void handleWholeStackDeath(LivingEntity killed, List<ItemStack> items, boolean custom, int droppedExp) {
Location killedLocation = killed.getLocation();
for (int i = 1; i < amount; i++) {
if (i == 1) {
@ -116,6 +116,8 @@ public class EntityStack {
items.removeIf(it -> it.isSimilar(item));
}
}
if (custom)
items = UltimateStacker.getInstance().getLootManager().getDrops(killed);
for (ItemStack item : items) {
killedLocation.getWorld().dropItemNaturally(killedLocation, item);
}
@ -160,13 +162,13 @@ public class EntityStack {
}
}
public void onDeath(LivingEntity killed, List<ItemStack> items, int droppedExp) {
public void onDeath(LivingEntity killed, List<ItemStack> items, boolean custom, int droppedExp) {
killed.setCustomName(null);
killed.setCustomNameVisible(true);
killed.setCustomName(Methods.formatText("&7"));
if (Setting.KILL_WHOLE_STACK_ON_DEATH.getBoolean() && getAmount() != 1) {
handleWholeStackDeath(killed, items, droppedExp);
handleWholeStackDeath(killed, items, custom, droppedExp);
} else if (getAmount() != 1) {
List<String> reasons = Setting.INSTANT_KILL.getStringList();
EntityDamageEvent lastDamageCause = killed.getLastDamageCause();
@ -175,7 +177,7 @@ public class EntityStack {
EntityDamageEvent.DamageCause cause = lastDamageCause.getCause();
for (String s : reasons) {
if (!cause.name().equalsIgnoreCase(s)) continue;
handleWholeStackDeath(killed, items, Setting.NO_EXP_INSTANT_KILL.getBoolean() ? 0 : droppedExp);
handleWholeStackDeath(killed, items, custom, Setting.NO_EXP_INSTANT_KILL.getBoolean() ? 0 : droppedExp);
return;
}
}

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

@ -28,6 +28,7 @@ public class DeathListeners implements Listener {
List<ItemStack> items = Setting.CUSTOM_DROPS.getBoolean()
? instance.getLootManager().getDrops(event.getEntity()) : new ArrayList<>();
boolean custom = false;
if (items.size() != 0) {
event.getDrops().clear();
@ -35,12 +36,13 @@ public class DeathListeners implements Listener {
if (item == null) continue;
event.getEntity().getWorld().dropItemNaturally(event.getEntity().getLocation(), item);
}
custom = true;
} else
items = event.getDrops();
if (instance.getEntityStackManager().isStacked(event.getEntity()))
instance.getEntityStackManager().getStack(event.getEntity())
.onDeath(event.getEntity(), items, event.getDroppedExp());
.onDeath(event.getEntity(), items, custom, event.getDroppedExp());
}
}