mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-19 19:25:48 +00:00
Code Releases Activity

Merge pull request #1004 from AlexLander123/fixes

Browse Source 
Fixes ChestedHorse Duplication Bug
This commit is contained in:
TheBusyBiscuit 2019-08-16 13:21:12 +02:00 committed by GitHub
commit c672dd9afb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/me/mrCookieSlime/Slimefun/listeners/DamageListener.java
View File

@ -2,12 +2,15 @@ package me.mrCookieSlime.Slimefun.listeners;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.enchantments.Enchantment;
import org.bukkit.entity.ChestedHorse;
import org.bukkit.entity.Creeper;
import org.bukkit.entity.Player;
import org.bukkit.entity.Skeleton;
@ -105,13 +108,21 @@ public class DamageListener implements Listener {
}
if (!e.getEntity().getCanPickupItems() && Talisman.checkFor(e, SlimefunItem.getByID("HUNTER_TALISMAN")) && !(e.getEntity() instanceof Player)) {
List<ItemStack> newDrops = new ArrayList<ItemStack>();
for (ItemStack drop : e.getDrops()) {
newDrops.add(drop);
newDrops.add(drop);
}
for (ItemStack drop : newDrops) {
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()
}
}
}
}