mirror of
https://github.com/StarWishsama/Slimefun4.git
synced 2024-09-20 03:35:51 +00:00
Merge pull request #1004 from AlexLander123/fixes
Fixes ChestedHorse Duplication Bug
This commit is contained in:
commit
c672dd9afb
@ -2,12 +2,15 @@ package me.mrCookieSlime.Slimefun.listeners;
|
|||||||
|
|
||||||
import java.text.SimpleDateFormat;
|
import java.text.SimpleDateFormat;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.enchantments.Enchantment;
|
import org.bukkit.enchantments.Enchantment;
|
||||||
|
import org.bukkit.entity.ChestedHorse;
|
||||||
import org.bukkit.entity.Creeper;
|
import org.bukkit.entity.Creeper;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.entity.Skeleton;
|
import org.bukkit.entity.Skeleton;
|
||||||
@ -105,6 +108,7 @@ public class DamageListener implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!e.getEntity().getCanPickupItems() && Talisman.checkFor(e, SlimefunItem.getByID("HUNTER_TALISMAN")) && !(e.getEntity() instanceof Player)) {
|
if (!e.getEntity().getCanPickupItems() && Talisman.checkFor(e, SlimefunItem.getByID("HUNTER_TALISMAN")) && !(e.getEntity() instanceof Player)) {
|
||||||
|
|
||||||
List<ItemStack> newDrops = new ArrayList<ItemStack>();
|
List<ItemStack> newDrops = new ArrayList<ItemStack>();
|
||||||
for (ItemStack drop : e.getDrops()) {
|
for (ItemStack drop : e.getDrops()) {
|
||||||
newDrops.add(drop);
|
newDrops.add(drop);
|
||||||
@ -112,6 +116,13 @@ public class DamageListener implements Listener {
|
|||||||
for (ItemStack drop : newDrops) {
|
for (ItemStack drop : newDrops) {
|
||||||
e.getDrops().add(drop);
|
e.getDrops().add(drop);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(e.getEntity() instanceof ChestedHorse) {
|
||||||
|
for(ItemStack invItem : ((ChestedHorse) e.getEntity()).getInventory().getStorageContents()) {
|
||||||
|
e.getDrops().remove(invItem);
|
||||||
|
}
|
||||||
|
e.getDrops().remove(new ItemStack(Material.CHEST)); //The chest is not included in getStorageContents()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user