From e89785963a2950f211b1a804a01220c702dff712 Mon Sep 17 00:00:00 2001 From: Thanos paravantis Date: Fri, 1 Jan 2016 15:35:45 +0200 Subject: [PATCH] Change kit helmet to skull. --- .../identified-project-coordinates.json | 2 +- .../games/mineware/effect/DeathEffect.java | 1 + .../game/games/mineware/kit/KitBawksFood.java | 22 +++++++++++++------ 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.recommenders/caches/identified-project-coordinates.json b/.recommenders/caches/identified-project-coordinates.json index 0e768eb0e..ccebebf7f 100644 --- a/.recommenders/caches/identified-project-coordinates.json +++ b/.recommenders/caches/identified-project-coordinates.json @@ -1 +1 @@ -[[{"location":"C:\\@Thanos\\Documents\\Minecraft\\Mineplex\\projects\\Mineplex\\Plugins\\Mineplex.Core","type":"PROJECT","hints":{"PROJECT_NAME":"Mineplex.Core"}},"ABSENT"],[{"location":"C:\\@Thanos\\Documents\\Minecraft\\Mineplex\\projects\\Mineplex\\Plugins\\Nautilus.Game.Arcade","type":"PROJECT","hints":{"PROJECT_NAME":"Nautilus.Game.Arcade"}},"ABSENT"],[{"location":"C:\\@Thanos\\Documents\\Minecraft\\Mineplex\\projects\\Mineplex\\Plugins\\Libraries\\craftbukkit.jar","type":"JAR","hints":{}},"ABSENT"]] \ No newline at end of file +[[{"location":"C:\\@Thanos\\Documents\\Minecraft\\Mineplex\\projects\\Mineplex\\Plugins\\Libraries\\craftbukkit.jar","type":"JAR","hints":{}},"ABSENT"],[{"location":"C:\\@Thanos\\Documents\\Minecraft\\Mineplex\\projects\\Mineplex\\Plugins\\Mineplex.Core.Common","type":"PROJECT","hints":{"PROJECT_NAME":"Mineplex.Core.Common"}},"ABSENT"]] \ No newline at end of file diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/effect/DeathEffect.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/effect/DeathEffect.java index 512223d57..95b752d8c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/effect/DeathEffect.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/effect/DeathEffect.java @@ -119,6 +119,7 @@ public class DeathEffect }.runTaskLater(_plugin, 60L); } + @SuppressWarnings("deprecation") private void spawnChickenHead(DeathEffectData data) { Location loc = data.getLocation(); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/kit/KitBawksFood.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/kit/KitBawksFood.java index 61eef0b82..301d8104a 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/kit/KitBawksFood.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/mineware/kit/KitBawksFood.java @@ -8,7 +8,9 @@ import org.bukkit.entity.Player; import org.bukkit.inventory.EntityEquipment; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.LeatherArmorMeta; +import org.bukkit.inventory.meta.SkullMeta; +import mineplex.core.common.util.UtilSkull; import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.kit.Kit; import nautilus.game.arcade.kit.KitAvailability; @@ -24,7 +26,7 @@ public class KitBawksFood extends Kit new String[] { "You must listen to Bawk Bawk." }, new Perk[] { }, EntityType.SKELETON, - new ItemStack(Material.COOKED_CHICKEN) + new ItemStack(Material.AIR) ); } @@ -34,16 +36,22 @@ public class KitBawksFood extends Kit // Items may be added manually when a challenge starts. } + @SuppressWarnings("deprecation") @Override public void SpawnCustom(LivingEntity ent) { EntityEquipment equipment = ent.getEquipment(); - ItemStack helmet = new ItemStack(Material.LEATHER_HELMET); - LeatherArmorMeta helmetMeta = (LeatherArmorMeta) helmet.getItemMeta(); - helmetMeta.setColor(Color.WHITE); - helmetMeta.spigot().setUnbreakable(true); - helmet.setItemMeta(helmetMeta); + ItemStack skull = new ItemStack(Material.SKULL_ITEM, 1, (short) 0, (byte) 3); + SkullMeta meta = (SkullMeta) skull.getItemMeta(); + meta.setOwner(UtilSkull.getPlayerHeadName(EntityType.CHICKEN)); + skull.setItemMeta(meta); + +// ItemStack helmet = new ItemStack(Material.LEATHER_HELMET); +// LeatherArmorMeta helmetMeta = (LeatherArmorMeta) helmet.getItemMeta(); +// helmetMeta.setColor(Color.WHITE); +// helmetMeta.spigot().setUnbreakable(true); +// helmet.setItemMeta(helmetMeta); ItemStack chestplate = new ItemStack(Material.LEATHER_CHESTPLATE); LeatherArmorMeta chestplateMeta = (LeatherArmorMeta) chestplate.getItemMeta(); @@ -63,7 +71,7 @@ public class KitBawksFood extends Kit bootsMeta.spigot().setUnbreakable(true); boots.setItemMeta(bootsMeta); - equipment.setHelmet(helmet); + equipment.setHelmet(skull); equipment.setChestplate(chestplate); equipment.setLeggings(leggings); equipment.setBoots(boots);