From c500f216a812b40fdd74c1a1a707a4bfa7eb4768 Mon Sep 17 00:00:00 2001 From: Steffion Date: Sun, 24 Apr 2016 21:44:51 +0200 Subject: [PATCH 1/2] Reverted back to MC 1.8.8 For people running the old version --- pom.xml | 4 ++-- src/nl/Steffion/BlockHunt/ArenaHandler.java | 6 ++--- src/nl/Steffion/BlockHunt/BlockHunt.java | 24 +++++++++---------- .../BlockHunt/Commands/CMDremove.java | 2 +- .../Steffion/BlockHunt/Commands/CMDwand.java | 2 +- .../OnEntityDamageByEntityEvent.java | 2 +- .../Listeners/OnPlayerInteractEvent.java | 2 +- .../Listeners/OnPlayerMoveEvent.java | 12 +++++----- .../Steffion/BlockHunt/SolidBlockHandler.java | 2 +- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/pom.xml b/pom.xml index 16832cb..97676af 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 nl.Steffion BlockHunt - 0.2.0 + 0.2.0-MC1.8.8 BlockHunt src @@ -53,7 +53,7 @@ org.spigotmc spigot-api - 1.9-R0.1-SNAPSHOT + 1.8.8-R0.1-SNAPSHOT provided diff --git a/src/nl/Steffion/BlockHunt/ArenaHandler.java b/src/nl/Steffion/BlockHunt/ArenaHandler.java index 76f8a07..601727b 100644 --- a/src/nl/Steffion/BlockHunt/ArenaHandler.java +++ b/src/nl/Steffion/BlockHunt/ArenaHandler.java @@ -58,7 +58,7 @@ public static void hidersWin(Arena arena) { for (Player player : arena.playersInArena) { ArenaHandler.playerLeaveArena(player, false, false); - player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1, 1); + player.playSound(player.getLocation(), Sound.LEVEL_UP, 1, 1); } arena.gameState = ArenaState.WAITING; @@ -404,7 +404,7 @@ public static void seekersWin(Arena arena) { for (Player player : arena.playersInArena) { ArenaHandler.playerLeaveArena(player, false, false); - player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1, 1); + player.playSound(player.getLocation(), Sound.LEVEL_UP, 1, 1); } arena.gameState = ArenaState.WAITING; @@ -434,7 +434,7 @@ public static void stopArena(Arena arena) { for (Player player : arena.playersInArena) { ArenaHandler.playerLeaveArena(player, false, false); - player.playSound(player.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1, 1); + player.playSound(player.getLocation(), Sound.LEVEL_UP, 1, 1); } arena.gameState = ArenaState.WAITING; diff --git a/src/nl/Steffion/BlockHunt/BlockHunt.java b/src/nl/Steffion/BlockHunt/BlockHunt.java index 3a0f412..217e3a1 100644 --- a/src/nl/Steffion/BlockHunt/BlockHunt.java +++ b/src/nl/Steffion/BlockHunt/BlockHunt.java @@ -359,7 +359,7 @@ public void run() { } else if (arena.timer == 5) { for (Player pl : arena.playersInArena) { pl.playSound(pl.getLocation(), - Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 0); + Sound.ORB_PICKUP, 1, 0); } ArenaHandler.sendFMessage(arena, ConfigC.normal_lobbyArenaIsStarting, @@ -367,7 +367,7 @@ public void run() { } else if (arena.timer == 4) { for (Player pl : arena.playersInArena) { pl.playSound(pl.getLocation(), - Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 0); + Sound.ORB_PICKUP, 1, 0); } ArenaHandler.sendFMessage(arena, ConfigC.normal_lobbyArenaIsStarting, @@ -375,7 +375,7 @@ public void run() { } else if (arena.timer == 3) { for (Player pl : arena.playersInArena) { pl.playSound(pl.getLocation(), - Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 1); + Sound.ORB_PICKUP, 1, 1); } ArenaHandler.sendFMessage(arena, ConfigC.normal_lobbyArenaIsStarting, @@ -383,7 +383,7 @@ public void run() { } else if (arena.timer == 2) { for (Player pl : arena.playersInArena) { pl.playSound(pl.getLocation(), - Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 1); + Sound.ORB_PICKUP, 1, 1); } ArenaHandler.sendFMessage(arena, ConfigC.normal_lobbyArenaIsStarting, @@ -391,7 +391,7 @@ public void run() { } else if (arena.timer == 1) { for (Player pl : arena.playersInArena) { pl.playSound(pl.getLocation(), - Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 2); + Sound.ORB_PICKUP, 1, 2); } ArenaHandler.sendFMessage(arena, ConfigC.normal_lobbyArenaIsStarting, @@ -525,7 +525,7 @@ public void run() { player.getInventory().setBoots( new ItemStack(Material.IRON_BOOTS, 1)); player.playSound(player.getLocation(), - Sound.BLOCK_ANVIL_USE, 1, 1); + Sound.ANVIL_USE, 1, 1); } if (W.seekertime.get(player) != null) { @@ -574,31 +574,31 @@ public void run() { } else if (arena.timer == 5) { arena.lobbyWarp.getWorld() .playSound(arena.lobbyWarp, - Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 0); + Sound.ORB_PICKUP, 1, 0); ArenaHandler.sendFMessage(arena, ConfigC.normal_ingameArenaEnd, "1-5"); } else if (arena.timer == 4) { arena.lobbyWarp.getWorld() .playSound(arena.lobbyWarp, - Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 0); + Sound.ORB_PICKUP, 1, 0); ArenaHandler.sendFMessage(arena, ConfigC.normal_ingameArenaEnd, "1-4"); } else if (arena.timer == 3) { arena.lobbyWarp.getWorld() .playSound(arena.lobbyWarp, - Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 1); + Sound.ORB_PICKUP, 1, 1); ArenaHandler.sendFMessage(arena, ConfigC.normal_ingameArenaEnd, "1-3"); } else if (arena.timer == 2) { arena.lobbyWarp.getWorld() .playSound(arena.lobbyWarp, - Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 1); + Sound.ORB_PICKUP, 1, 1); ArenaHandler.sendFMessage(arena, ConfigC.normal_ingameArenaEnd, "1-2"); } else if (arena.timer == 1) { arena.lobbyWarp.getWorld() .playSound(arena.lobbyWarp, - Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 1, 2); + Sound.ORB_PICKUP, 1, 2); ArenaHandler.sendFMessage(arena, ConfigC.normal_ingameArenaEnd, "1-1"); } @@ -669,7 +669,7 @@ public void run() { Enchantment.DURABILITY, 10); player.playSound(pLoc, - Sound.ENTITY_EXPERIENCE_ORB_PICKUP, + Sound.ORB_PICKUP, 1, 1); W.hiddenLoc.put(player, moveLoc); diff --git a/src/nl/Steffion/BlockHunt/Commands/CMDremove.java b/src/nl/Steffion/BlockHunt/Commands/CMDremove.java index 0f25ee5..837e459 100644 --- a/src/nl/Steffion/BlockHunt/Commands/CMDremove.java +++ b/src/nl/Steffion/BlockHunt/Commands/CMDremove.java @@ -40,7 +40,7 @@ public boolean exectue(Player player, Command cmd, String label, signLoc.getWorld().playEffect(signLoc, Effect.MOBSPAWNER_FLAMES, 0); signLoc.getWorld().playSound(signLoc, - Sound.ENTITY_ENDERDRAGON_FLAP, 1, 1); + Sound.ENDERDRAGON_WINGS, 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 90c6c5a..28d3f4c 100644 --- a/src/nl/Steffion/BlockHunt/Commands/CMDwand.java +++ b/src/nl/Steffion/BlockHunt/Commands/CMDwand.java @@ -37,7 +37,7 @@ public boolean exectue(Player player, Command cmd, String label, im.setLore(lores2); wand.setItemMeta(im); player.getInventory().addItem(wand); - player.playSound(player.getLocation(), Sound.ENTITY_EXPERIENCE_ORB_PICKUP, 5, 0); + player.playSound(player.getLocation(), Sound.ORB_PICKUP, 5, 0); MessageM.sendFMessage(player, ConfigC.normal_wandGaveWand, "type-" + wand.getType().toString().replaceAll("_", " ") .toLowerCase()); diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java index b7bff5d..53e0dc6 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java @@ -49,7 +49,7 @@ public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) { event.setCancelled(true); } else { player.getWorld().playSound(player.getLocation(), - Sound.ENTITY_PLAYER_HURT, 1, 1); + Sound.HURT_FLESH, 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 e521fce..436789a 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java @@ -183,7 +183,7 @@ public void onPlayerInteractEvent(PlayerInteractEvent event) { W.moveLoc.put(pl, new Location(pl.getWorld(), 0, 0, 0)); pl.getWorld().playSound(player.getLocation(), - Sound.ENTITY_PLAYER_HURT, 1, 1); + Sound.HURT_FLESH, 1, 1); SolidBlockHandler.makePlayerUnsolid(pl); } } diff --git a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerMoveEvent.java b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerMoveEvent.java index 79faa91..a3cac72 100644 --- a/src/nl/Steffion/BlockHunt/Listeners/OnPlayerMoveEvent.java +++ b/src/nl/Steffion/BlockHunt/Listeners/OnPlayerMoveEvent.java @@ -40,32 +40,32 @@ public void onPlayerMoveEvent(PlayerMoveEvent event) { if (loc.getBlockX() > maxX) { event.setCancelled(true); player.playEffect(loc, Effect.ENDER_SIGNAL, null); - player.playSound(loc, Sound.ENTITY_GHAST_SHOOT, 1, 1); + player.playSound(loc, Sound.GHAST_FIREBALL, 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.ENTITY_GHAST_SHOOT, 1, 1); + player.playSound(loc, Sound.GHAST_FIREBALL, 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.ENTITY_GHAST_SHOOT, 1, 1); + player.playSound(loc, Sound.GHAST_FIREBALL, 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.ENTITY_GHAST_SHOOT, 1, 1); + player.playSound(loc, Sound.GHAST_FIREBALL, 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.ENTITY_GHAST_SHOOT, 1, 1); + player.playSound(loc, Sound.GHAST_FIREBALL, 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.ENTITY_GHAST_SHOOT, 1, 1); + player.playSound(loc, Sound.GHAST_FIREBALL, 1, 1); player.teleport(arena.hidersWarp); } } diff --git a/src/nl/Steffion/BlockHunt/SolidBlockHandler.java b/src/nl/Steffion/BlockHunt/SolidBlockHandler.java index 608413b..a5a2d4a 100644 --- a/src/nl/Steffion/BlockHunt/SolidBlockHandler.java +++ b/src/nl/Steffion/BlockHunt/SolidBlockHandler.java @@ -43,7 +43,7 @@ public static void makePlayerUnsolid(Player player) { } } - player.playSound(player.getLocation(), Sound.ENTITY_BAT_HURT, 1, 1); + player.playSound(player.getLocation(), Sound.BAT_HURT, 1, 1); block.removeEnchantment(Enchantment.DURABILITY); for (Player playerShow : Bukkit.getOnlinePlayers()) { From 4d4178c6f118c63ca5e19d7daf00392fc2048937 Mon Sep 17 00:00:00 2001 From: Steffion Date: Sat, 14 May 2016 14:45:32 +0200 Subject: [PATCH 2/2] Setting health sometimes gave an error, fixes #381 --- src/nl/Steffion/BlockHunt/ArenaHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nl/Steffion/BlockHunt/ArenaHandler.java b/src/nl/Steffion/BlockHunt/ArenaHandler.java index 30e8cc4..64c4f0d 100644 --- a/src/nl/Steffion/BlockHunt/ArenaHandler.java +++ b/src/nl/Steffion/BlockHunt/ArenaHandler.java @@ -337,7 +337,7 @@ public static void playerLeaveArena(Player player, boolean message, boolean clea player.updateInventory(); player.setExp(pad.pEXP); player.setLevel(pad.pEXPL); - player.setHealth(pad.pHealth); + player.setHealth(pad.pHealth > 20 ? 20 : pad.pHealth); player.setFoodLevel(pad.pFood); player.addPotionEffects(pad.pPotionEffects); player.teleport(arena.spawnWarp);