diff --git a/BankEconomyMod/src/me/kaZep/Base/Main.java b/BankEconomyMod/src/me/kaZep/Base/Main.java index b892d7e..d0c4309 100644 --- a/BankEconomyMod/src/me/kaZep/Base/Main.java +++ b/BankEconomyMod/src/me/kaZep/Base/Main.java @@ -67,8 +67,8 @@ import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.PlayerInventory; import org.bukkit.inventory.ShapedRecipe; -import org.bukkit.inventory.ShapelessRecipe; -import org.bukkit.inventory.meta.FireworkMeta; +import org.bukkit.inventory.ShapelessRecipe; +import org.bukkit.inventory.meta.FireworkMeta; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.map.MapRenderer; @@ -1388,6 +1388,11 @@ public void runTick() { i=Bukkit.getWorld("world").dropItemNaturally(p.getLocation().add((int)(Math.random()*20)-(int)(Math.random()*20), 256, (int)(Math.random()*20)-(int)(Math.random()*20)),new ItemStack(Material.EGG)); i.setTicksLived(3600); } + if (getConfig().getBoolean("thanksgiving-enabled") && Bukkit.getWorld("world").hasStorm() && Main.SERVER_TICK_TIME%160==0) { + Item i = null; + i=Bukkit.getWorld("world").dropItemNaturally(p.getLocation().add((int)(Math.random()*20)-(int)(Math.random()*20), 256, (int)(Math.random()*20)-(int)(Math.random()*20)),new ItemStack(Material.EGG)); + i.setTicksLived(3600); + } if (Main.SERVER_TICK_TIME%90==0) { for (int i=-15;i<=15;i++) { for (int j=-15;j<=15;j++) { diff --git a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java index 38e101b..ddcb9d9 100644 --- a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java +++ b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java @@ -9988,6 +9988,11 @@ implements Listener event.setCancelled(true); return; } + if (this.plugin.is_PocketWorkbench(event.getCurrentItem()) && event.getClick()==ClickType.RIGHT) { + p.openWorkbench(null, true); + event.setCancelled(true); + return; + } } }else if (event.getInventory().getType()==InventoryType.CHEST && event.getInventory().getName().contains("Item Cube")) { @@ -10168,18 +10173,18 @@ implements Listener event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("GOLD") || event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("DIAMOND") || event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("CHAINMAIL")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.BLAZE_HIT, 10, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.BLAZE_HIT, 10, 1); } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("WOOD")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOD, 20, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOD, 20, 1); } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("STONE")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_STONE, 20, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_STONE, 20, 1); } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("LEATHER")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOL, 20, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOL, 20, 1); } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("BOW") || event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("FISHING")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.ARROW_HIT, 10, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.ARROW_HIT, 10, 1); } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("ENCHANTED")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.LEVEL_UP, 10, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.LEVEL_UP, 10, 1); } event.getInventory().setItem(OUTPUT, new ItemStack(Material.AIR)); @@ -10252,18 +10257,18 @@ implements Listener event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("GOLD") || event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("DIAMOND") || event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("CHAINMAIL")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.BLAZE_HIT, 10, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.BLAZE_HIT, 10, 1); } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("WOOD")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOD, 20, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOD, 20, 1); } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("STONE")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_STONE, 20, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_STONE, 20, 1); } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("LEATHER")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOL, 20, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOL, 20, 1); } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("BOW") || event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("FISHING")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.ARROW_HIT, 10, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.ARROW_HIT, 10, 1); } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("ENCHANTED")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.LEVEL_UP, 10, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.LEVEL_UP, 10, 1); } @@ -10318,18 +10323,18 @@ implements Listener event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("GOLD") || event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("DIAMOND") || event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("CHAINMAIL")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.BLAZE_HIT, 10, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.BLAZE_HIT, 10, 1); } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("WOOD")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOD, 20, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOD, 20, 1); } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("STONE")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_STONE, 20, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_STONE, 20, 1); } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("LEATHER")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOL, 20, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.DIG_WOOL, 20, 1); } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("BOW") || event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("FISHING")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.ARROW_HIT, 10, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.ARROW_HIT, 10, 1); } else if (event.getInventory().getItem(OUTPUT).getType().toString().toUpperCase().contains("ENCHANTED")) { - Bukkit.getPlayer(event.getWhoClicked().getName()).playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.LEVEL_UP, 10, 1); + Bukkit.getPlayer(event.getWhoClicked().getName()).getWorld().playSound(Bukkit.getPlayer(event.getWhoClicked().getName()).getLocation(), Sound.LEVEL_UP, 10, 1); } Bukkit.getServer().getScheduler().scheduleSyncDelayedTask(this.plugin, new updateInventoryTask(event.getWhoClicked().getName())); @@ -11230,8 +11235,7 @@ implements Listener } } } - } - + } @EventHandler public void onEggThrow(ProjectileHitEvent e) { LivingEntity l = e.getEntity().getShooter(); @@ -11240,7 +11244,7 @@ implements Listener Location loc = e.getEntity().getLocation(); ItemStack item = null; - switch ((int)(Math.random()*111.01)) { + switch ((int)(Math.random()*112)) { case 0:{ item = new ItemStack(Material.WOOD_HOE); }break; diff --git a/BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java b/BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java index 1779429..df3a851 100644 --- a/BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java +++ b/BankEconomyMod/src/me/kaZep/Commands/commandBankEconomy.java @@ -578,6 +578,32 @@ public String convertToItemName(String val) { chest.setItemMeta(chest_name); + p.getWorld().dropItemNaturally(p.getLocation(), chest); + } + if (args[0].equalsIgnoreCase("thanksgiving")) { + if (this.plugin.getConfig().getBoolean("thanksgiving-enabled")) { + this.plugin.getConfig().set("thanksgiving-enabled", Boolean.valueOf(false)); + p.sendMessage("Thanksgiving event disabled."); + } else { + this.plugin.getConfig().set("thanksgiving-enabled", Boolean.valueOf(true)); + p.sendMessage("Thanksgiving event enabled."); + } + this.plugin.saveConfig(); + } + if (args[0].equalsIgnoreCase("loot")) { + ItemStack chest = new ItemStack(Material.CHEST); + ItemMeta chest_name = chest.getItemMeta(); + chest_name.setDisplayName(ChatColor.YELLOW+"Closed Chest"); + + List chestlore = new ArrayList(); + chestlore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"A mysterious chest!"); + chestlore.add(ChatColor.GRAY+""+ChatColor.ITALIC+""); + chestlore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"It feels heavy; there"); + chestlore.add(ChatColor.GRAY+""+ChatColor.ITALIC+"might be items inside."); + chest_name.setLore(chestlore); + + chest.setItemMeta(chest_name); + p.getWorld().dropItemNaturally(p.getLocation(), chest); } } else