diff --git a/Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java b/Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java index 732b6c742..dec383adb 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/itemstack/ItemStackFactory.java @@ -811,6 +811,11 @@ public class ItemStackFactory extends MiniPlugin return CreateStack(id, data, amount, damage, name, lore, owner, unbreakable, 0, null); } + public ItemStack CreateStack(Material type, Integer enchLevel, Enchantment... enchantments) + { + return CreateStack(type.getId(), (byte)0, 1, (short)0, null, ArrayToList(new String[] {}), null, true, enchLevel, enchantments); + } + //XXX Owner Variant End @SuppressWarnings("deprecation") @@ -886,7 +891,7 @@ public class ItemStackFactory extends MiniPlugin { for(Enchantment enchantment : enchantments) { - stack.addEnchantment(enchantment, enchLevel); + stack.addUnsafeEnchantment(enchantment, enchLevel); } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/modes/kits/KitOverlord.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/modes/kits/KitOverlord.java index ff46e7414..30eb4dde0 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/modes/kits/KitOverlord.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/micro/modes/kits/KitOverlord.java @@ -1,10 +1,12 @@ package nautilus.game.arcade.game.games.micro.modes.kits; import org.bukkit.Material; +import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; +import mineplex.core.common.util.UtilItem; import mineplex.core.itemstack.ItemStackFactory; import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.kit.KitAvailability; @@ -19,15 +21,16 @@ public class KitOverlord extends ProgressingKit }; private static final Perk[] PERKS = { - new PerkFletcher(3, 16, true) + new PerkFletcher(7, 4, true) }; private static final ItemStack IN_HAND = new ItemStack(Material.GOLDEN_APPLE); private static final ItemStack[] PLAYER_ITEMS = { - ItemStackFactory.Instance.CreateStack(Material.DIAMOND_SWORD), + ItemStackFactory.Instance.CreateStack(Material.DIAMOND_SWORD, 4, Enchantment.DAMAGE_ALL), ItemStackFactory.Instance.CreateStack(Material.DIAMOND_PICKAXE), - ItemStackFactory.Instance.CreateStack(Material.BOW), + ItemStackFactory.Instance.CreateStack(Material.BOW, 25, Enchantment.ARROW_DAMAGE), + ItemStackFactory.Instance.CreateStack(Material.COOKED_BEEF, 64), ItemStackFactory.Instance.CreateStack(Material.GOLDEN_APPLE, 5) }; @@ -41,9 +44,9 @@ public class KitOverlord extends ProgressingKit { player.getInventory().addItem(PLAYER_ITEMS); - player.getInventory().setHelmet(new ItemStack(Material.DIAMOND_HELMET)); - player.getInventory().setChestplate(new ItemStack(Material.DIAMOND_CHESTPLATE)); - player.getInventory().setLeggings(new ItemStack(Material.DIAMOND_LEGGINGS)); - player.getInventory().setBoots(new ItemStack(Material.DIAMOND_BOOTS)); + player.getInventory().setHelmet(UtilItem.makeUnbreakable(new ItemStack(Material.DIAMOND_HELMET))); + player.getInventory().setChestplate(UtilItem.makeUnbreakable(new ItemStack(Material.DIAMOND_CHESTPLATE))); + player.getInventory().setLeggings(UtilItem.makeUnbreakable(new ItemStack(Material.DIAMOND_LEGGINGS))); + player.getInventory().setBoots(UtilItem.makeUnbreakable(new ItemStack(Material.DIAMOND_BOOTS))); } }