diff --git a/pom.xml b/pom.xml index 7622828..9e83735 100644 --- a/pom.xml +++ b/pom.xml @@ -6,31 +6,38 @@ BlockHunt - + - bukkit-repo - http://repo.bukkit.org/content/groups/public/ + addstar-repo + http://maven.addstar.com.au/artifactory/ext-release-local + + false + - - bukkit-maven - http://repo.bukkit.org/content/repositories/releases/ + addstar-snapshot-repo + http://maven.addstar.com.au/artifactory/ext-snapshot-local true + + false + - + + + + md5-repo + http://repo.md-5.net/content/groups/public/ + true + true + + maven-central http://repo1.maven.org/maven2/ - - - - addstar-repo - http://maven.addstar.com.au/artifactory/ext-release-local - @@ -38,21 +45,14 @@ org.bukkit bukkit - 1.7.9-R0.2-SNAPSHOT + 1.9-R0.1-SNAPSHOT - - - me.libraryaddict + me.libraryaddict.disguise LibsDisguises - 7.6.4 + 9.0.2 diff --git a/src/nl/Steffion/BlockHunt/ArenaHandler.java b/src/nl/Steffion/BlockHunt/ArenaHandler.java index 4a005e7..e9385a3 100644 --- a/src/nl/Steffion/BlockHunt/ArenaHandler.java +++ b/src/nl/Steffion/BlockHunt/ArenaHandler.java @@ -78,8 +78,10 @@ public class ArenaHandler { } for (ItemStack invitem : player.getInventory().getArmorContents()) { - if (invitem.getType() != Material.AIR) { - inventoryempty = false; + if (invitem != null) { + if (invitem.getType() != Material.AIR) { + inventoryempty = false; + } } } @@ -385,7 +387,7 @@ public class ArenaHandler { for (Player player : arena.playersInArena) { playerLeaveArena(player, false, false); - player.playSound(player.getLocation(), Sound.LEVEL_UP, 1, 1); + player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1, 1); } arena.gameState = ArenaState.WAITING; @@ -434,7 +436,7 @@ public class ArenaHandler { for (Player player : arena.playersInArena) { playerLeaveArena(player, false, false); - player.playSound(player.getLocation(), Sound.LEVEL_UP, 1, 1); + player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1, 1); } arena.gameState = ArenaState.WAITING; @@ -450,7 +452,7 @@ public class ArenaHandler { for (Player player : arena.playersInArena) { playerLeaveArena(player, false, false); - player.playSound(player.getLocation(), Sound.LEVEL_UP, 1, 1); + player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1, 1); } arena.gameState = ArenaState.WAITING; diff --git a/src/nl/Steffion/BlockHunt/BlockHunt.java b/src/nl/Steffion/BlockHunt/BlockHunt.java index 8cfbf8c..64a663a 100644 --- a/src/nl/Steffion/BlockHunt/BlockHunt.java +++ b/src/nl/Steffion/BlockHunt/BlockHunt.java @@ -208,19 +208,19 @@ public class BlockHunt extends JavaPlugin implements Listener { } else if (arena.timer == 10) { ArenaHandler.sendFMessage(arena, ConfigC.normal_lobbyArenaIsStarting, "1-10"); } else if (arena.timer == 5) { - arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ORB_PICKUP, 1, 0); + arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 0); ArenaHandler.sendFMessage(arena, ConfigC.normal_lobbyArenaIsStarting, "1-5"); } else if (arena.timer == 4) { - arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ORB_PICKUP, 1, 0); + arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 0); ArenaHandler.sendFMessage(arena, ConfigC.normal_lobbyArenaIsStarting, "1-4"); } else if (arena.timer == 3) { - arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ORB_PICKUP, 1, 1); + arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 1); ArenaHandler.sendFMessage(arena, ConfigC.normal_lobbyArenaIsStarting, "1-3"); } else if (arena.timer == 2) { - arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ORB_PICKUP, 1, 1); + arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 1); ArenaHandler.sendFMessage(arena, ConfigC.normal_lobbyArenaIsStarting, "1-2"); } else if (arena.timer == 1) { - arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ORB_PICKUP, 1, 2); + arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 2); ArenaHandler.sendFMessage(arena, ConfigC.normal_lobbyArenaIsStarting, "1-1"); } } else { @@ -305,7 +305,7 @@ public class BlockHunt extends JavaPlugin implements Listener { infBow.addEnchantment(Enchantment.ARROW_INFINITE, 1); player.getInventory().setItem(1, infBow); player.getInventory().setItem(2, new ItemStack(Material.ARROW, 1)); - player.playSound(player.getLocation(), Sound.ANVIL_USE, 1, 1); + player.playSound(player.getLocation(), Sound.BLOCK_ANVIL_USE, 1, 1); } if (W.seekertime.get(player) != null) { @@ -357,19 +357,19 @@ public class BlockHunt extends JavaPlugin implements Listener { } else if (arena.timer == 10) { ArenaHandler.sendFMessage(arena, ConfigC.normal_ingameArenaEnd, "1-10"); } else if (arena.timer == 5) { - arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ORB_PICKUP, 1, 0); + arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 0); ArenaHandler.sendFMessage(arena, ConfigC.normal_ingameArenaEnd, "1-5"); } else if (arena.timer == 4) { - arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ORB_PICKUP, 1, 0); + arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 0); ArenaHandler.sendFMessage(arena, ConfigC.normal_ingameArenaEnd, "1-4"); } else if (arena.timer == 3) { - arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ORB_PICKUP, 1, 1); + arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 1); ArenaHandler.sendFMessage(arena, ConfigC.normal_ingameArenaEnd, "1-3"); } else if (arena.timer == 2) { - arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ORB_PICKUP, 1, 1); + arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 1); ArenaHandler.sendFMessage(arena, ConfigC.normal_ingameArenaEnd, "1-2"); } else if (arena.timer == 1) { - arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ORB_PICKUP, 1, 2); + arena.lobbyWarp.getWorld().playSound(arena.lobbyWarp, Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 2); ArenaHandler.sendFMessage(arena, ConfigC.normal_ingameArenaEnd, "1-1"); } } else { @@ -414,7 +414,7 @@ public class BlockHunt extends JavaPlugin implements Listener { } block.addUnsafeEnchantment(Enchantment.DURABILITY, 10); - player.playSound(pLoc, Sound.ORB_PICKUP, 1, 1); + player.playSound(pLoc, Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 1); W.hiddenLoc.put(player, moveLoc); if (block.getDurability() != 0) { MessageM.sendFMessage( diff --git a/src/nl/Steffion/BlockHunt/Commands/CMDremove.java b/src/nl/Steffion/BlockHunt/Commands/CMDremove.java index 3cbabcb..51062f2 100644 --- a/src/nl/Steffion/BlockHunt/Commands/CMDremove.java +++ b/src/nl/Steffion/BlockHunt/Commands/CMDremove.java @@ -31,7 +31,7 @@ public class CMDremove extends DefaultCMD { LocationSerializable signLoc = new LocationSerializable((Location) W.signs.getFile().get(sign + ".location")); signLoc.getBlock().setType(Material.AIR); signLoc.getWorld().playEffect(signLoc, Effect.MOBSPAWNER_FLAMES, 0); - signLoc.getWorld().playSound(signLoc, Sound.ENDERDRAGON_WINGS, 1, 1); + signLoc.getWorld().playSound(signLoc, Sound.ENTITY_ENDERDRAGON_FLAP, 1, 1); W.signs.getFile().set(sign, null); } } diff --git a/src/nl/Steffion/BlockHunt/Commands/CMDwand.java b/src/nl/Steffion/BlockHunt/Commands/CMDwand.java index 3427e56..3610b2e 100644 --- a/src/nl/Steffion/BlockHunt/Commands/CMDwand.java +++ b/src/nl/Steffion/BlockHunt/Commands/CMDwand.java @@ -32,7 +32,7 @@ public class CMDwand extends DefaultCMD { im.setLore(lores2); wand.setItemMeta(im); player.getInventory().addItem(wand); - player.playSound(player.getLocation(), Sound.ORB_PICKUP, 5, 0); + player.playSound(player.getLocation(), Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 5, 0); MessageM.sendFMessage(player, ConfigC.normal_wandGaveWand, "type-" + wand.getType().toString().replaceAll("_", " ").toLowerCase()); } else { MessageM.sendFMessage(player, ConfigC.error_onlyIngame); diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java index 71a3a2d..f056675 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java @@ -89,7 +89,7 @@ public class OnEntityDamageByEntityEvent implements Listener { } // The damage is allowed, so lets handle it! - player.getWorld().playSound(player.getLocation(), Sound.HURT_FLESH, 1, 1); + player.getWorld().playSound(player.getLocation(), Sound.ENTITY_PLAYER_HURT, 1, 1); if (event.getDamage() >= player.getHealth()) { player.setHealth(20); diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java index d1bfe1a..1615397 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java @@ -120,7 +120,7 @@ public class OnPlayerInteractEvent implements Listener { Block moveLocBlock = W.hiddenLoc.get(pl).getBlock(); if (moveLocBlock.getX() == pLoc.getX() && moveLocBlock.getY() == pLoc.getY() && moveLocBlock.getZ() == pLoc.getZ()) { W.moveLoc.put(pl, new Location(pl.getWorld(), 0, 0, 0)); - pl.getWorld().playSound(player.getLocation(), Sound.HURT_FLESH, 1, 1); + pl.getWorld().playSound(player.getLocation(), Sound.ENTITY_PLAYER_HURT, 1, 1); SolidBlockHandler.makePlayerUnsolid(pl); } } diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerMoveEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerMoveEvent.java index 78415de..602ce67 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerMoveEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerMoveEvent.java @@ -37,32 +37,32 @@ public class OnPlayerMoveEvent implements Listener { if (loc.getBlockX() > maxX) { event.setCancelled(true); player.playEffect(loc, Effect.ENDER_SIGNAL, null); - player.playSound(loc, Sound.GHAST_FIREBALL, 1, 1); + player.playSound(loc, Sound.ENTITY_GHAST_SHOOT, 1, 1); player.teleport(arena.hidersWarp); } else if (loc.getBlockX() < minX) { event.setCancelled(true); player.playEffect(loc, Effect.ENDER_SIGNAL, null); - player.playSound(loc, Sound.GHAST_FIREBALL, 1, 1); + player.playSound(loc, Sound.ENTITY_GHAST_SHOOT, 1, 1); player.teleport(arena.hidersWarp); } else if (loc.getBlockZ() > maxZ) { event.setCancelled(true); player.playEffect(loc, Effect.ENDER_SIGNAL, null); - player.playSound(loc, Sound.GHAST_FIREBALL, 1, 1); + player.playSound(loc, Sound.ENTITY_GHAST_SHOOT, 1, 1); player.teleport(arena.hidersWarp); } else if (loc.getBlockZ() < minZ) { event.setCancelled(true); player.playEffect(loc, Effect.ENDER_SIGNAL, null); - player.playSound(loc, Sound.GHAST_FIREBALL, 1, 1); + player.playSound(loc, Sound.ENTITY_GHAST_SHOOT, 1, 1); player.teleport(arena.hidersWarp); } else if (loc.getBlockY() > maxY) { event.setCancelled(true); player.playEffect(loc, Effect.ENDER_SIGNAL, null); - player.playSound(loc, Sound.GHAST_FIREBALL, 1, 1); + player.playSound(loc, Sound.ENTITY_GHAST_SHOOT, 1, 1); player.teleport(arena.hidersWarp); } else if (loc.getBlockY() < minY) { event.setCancelled(true); player.playEffect(loc, Effect.ENDER_SIGNAL, null); - player.playSound(loc, Sound.GHAST_FIREBALL, 1, 1); + player.playSound(loc, Sound.ENTITY_GHAST_SHOOT, 1, 1); player.teleport(arena.hidersWarp); } } diff --git a/src/nl/Steffion/BlockHunt/SolidBlockHandler.java b/src/nl/Steffion/BlockHunt/SolidBlockHandler.java index 18c2ea3..278a94f 100644 --- a/src/nl/Steffion/BlockHunt/SolidBlockHandler.java +++ b/src/nl/Steffion/BlockHunt/SolidBlockHandler.java @@ -47,7 +47,7 @@ public class SolidBlockHandler { } } - player.playSound(player.getLocation(), Sound.BAT_HURT, 1, 1); + player.playSound(player.getLocation(), Sound.ENTITY_BAT_HURT, 1, 1); block.removeEnchantment(Enchantment.DURABILITY); for (Player playerShow : Bukkit.getOnlinePlayers()) {