From 0262452b6a1bb0b4e949ccd8b58c4c98a32823aa Mon Sep 17 00:00:00 2001 From: xXVevzZXx Date: Thu, 21 Jul 2016 20:48:14 +0200 Subject: [PATCH 1/2] Add enchantments to items, lower arrow spawn rate and limit, give players some steak and make armor unbreakable. --- .../core/itemstack/ItemStackFactory.java | 7 ++++++- .../games/micro/modes/kits/KitOverlord.java | 17 ++++++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) 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))); } } From 9ed0bbe43af67eaade5fc37fde6872b87815c86a Mon Sep 17 00:00:00 2001 From: Shaun Bennett Date: Thu, 21 Jul 2016 14:22:38 -0500 Subject: [PATCH 2/2] Fix NPC's for unloaded worlds --- .../src/mineplex/core/npc/NpcManager.java | 51 ++++++++++++++----- 1 file changed, 38 insertions(+), 13 deletions(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java index 87c84076d..63960ac15 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java @@ -2,14 +2,7 @@ package mineplex.core.npc; import java.sql.Connection; import java.sql.SQLException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; +import java.util.*; import org.bukkit.*; import org.bukkit.configuration.InvalidConfigurationException; @@ -87,6 +80,7 @@ public class NpcManager extends MiniPlugin private final Creature _creature; private final List _npcs = new ArrayList<>(); + private final Queue _queuedNpcs = new LinkedList<>(); final Map _npcMap = new HashMap<>(); private final Set _npcDeletingPlayers = new HashSet<>(); @@ -504,11 +498,19 @@ public class NpcManager extends MiniPlugin { record.detach(); - Npc npc = new Npc(this, record); - _npcs.add(npc); + if (Bukkit.getWorld(record.getWorld()) == null) + { + // World isnt loaded yet, add to queue + _queuedNpcs.add(record); + } + else + { + Npc npc = new Npc(this, record); + _npcs.add(npc); - if (npc.getChunk().isLoaded()) - spawnNpc(npc); + if (npc.getChunk() != null && npc.getChunk().isLoaded()) + spawnNpc(npc); + } } } } @@ -561,11 +563,34 @@ public class NpcManager extends MiniPlugin for (Npc npc : _npcs) { - if (npc.getEntity() != null && !npc.getEntity().isValid() && npc.getChunk().isLoaded()) + if (npc.getEntity() != null && !npc.getEntity().isValid() && npc.getChunk() != null && npc.getChunk().isLoaded()) spawnNpc(npc); } } + @EventHandler + public void processNpcQueue(UpdateEvent event) + { + if (event.getType() != UpdateType.SEC_05) + return; + + Iterator iterator = _queuedNpcs.iterator(); + while (iterator.hasNext()) + { + NpcsRecord record = iterator.next(); + if (Bukkit.getWorld(record.getWorld()) != null) + { + Npc npc = new Npc(this, record); + _npcs.add(npc); + iterator.remove(); + + if (npc.getChunk() != null && npc.getChunk().isLoaded()) + spawnNpc(npc); + } + } + + } + @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true) public void onChunkLoad(ChunkLoadEvent event) {