From ef74d04125560f6a9ed4084a45792817b9364261 Mon Sep 17 00:00:00 2001 From: MisterErwin Date: Tue, 4 Sep 2018 19:03:23 +0200 Subject: [PATCH] Using 1.13 Skull Materials and Entity Types --- .../Slimefun/listeners/DamageListener.java | 28 ++++++------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/src/me/mrCookieSlime/Slimefun/listeners/DamageListener.java b/src/me/mrCookieSlime/Slimefun/listeners/DamageListener.java index 271f888bb..e6055df06 100644 --- a/src/me/mrCookieSlime/Slimefun/listeners/DamageListener.java +++ b/src/me/mrCookieSlime/Slimefun/listeners/DamageListener.java @@ -15,10 +15,7 @@ import me.mrCookieSlime.Slimefun.api.Slimefun; import me.mrCookieSlime.Slimefun.api.Soul; import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.Creeper; -import org.bukkit.entity.Player; -import org.bukkit.entity.Skeleton; -import org.bukkit.entity.Zombie; +import org.bukkit.entity.*; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageEvent; @@ -82,26 +79,17 @@ public class DamageListener implements Listener { if (SlimefunManager.isItemSimiliar(item, SlimefunItem.getItem("SWORD_OF_BEHEADING"), true)) { if (e.getEntity() instanceof Zombie) { if (SlimefunStartup.chance(100, (Integer) Slimefun.getItemValue("SWORD_OF_BEHEADING", "chance.ZOMBIE"))) { - e.getDrops().add(new CustomItem(Material.SKULL_ITEM, 2)); + e.getDrops().add(new CustomItem(Material.ZOMBIE_HEAD, 2)); } + }else if (e.getEntity() instanceof WitherSkeleton) { + if (SlimefunStartup.chance(100, (Integer) Slimefun.getItemValue("SWORD_OF_BEHEADING", "chance.WITHER_SKELETON"))) + e.getDrops().add(new CustomItem(Material.WITHER_SKELETON_SKULL, 1)); } else if (e.getEntity() instanceof Skeleton) { - switch (((Skeleton) e.getEntity()).getSkeletonType()) { - case NORMAL: { - if (SlimefunStartup.chance(100, (Integer) Slimefun.getItemValue("SWORD_OF_BEHEADING", "chance.SKELETON"))) - e.getDrops().add(new CustomItem(Material.SKULL_ITEM, 0)); - break; - } - case WITHER: { - if (SlimefunStartup.chance(100, (Integer) Slimefun.getItemValue("SWORD_OF_BEHEADING", "chance.WITHER_SKELETON"))) - e.getDrops().add(new CustomItem(Material.SKULL_ITEM, 1)); - break; - } - default: - break; - } + if (SlimefunStartup.chance(100, (Integer) Slimefun.getItemValue("SWORD_OF_BEHEADING", "chance.SKELETON"))) + e.getDrops().add(new CustomItem(Material.SKELETON_SKULL, 0)); } else if (e.getEntity() instanceof Creeper) { if (SlimefunStartup.chance(100, (Integer) Slimefun.getItemValue("SWORD_OF_BEHEADING", "chance.CREEPER"))) { - e.getDrops().add(new CustomItem(Material.SKULL_ITEM, 4)); + e.getDrops().add(new CustomItem(Material.CREEPER_HEAD, 4)); } } else if (e.getEntity() instanceof Player) { if (SlimefunStartup.chance(100, (Integer) Slimefun.getItemValue("SWORD_OF_BEHEADING", "chance.PLAYER"))) {