1.8

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>nl.Steffion</groupId>
   <artifactId>BlockHunt</artifactId>
-  <version>0.2.1</version>
+  <version>0.2.1-MC1.8.8</version>
   <name>BlockHunt</name>
   <build>
     <sourceDirectory>src</sourceDirectory>
@@ -53,7 +53,7 @@
   	<dependency>
   		<groupId>org.spigotmc</groupId>
   		<artifactId>spigot-api</artifactId>
-  		<version>1.9.2-R0.1-SNAPSHOT</version>
+  		<version>1.8.8-R0.1-SNAPSHOT</version>
   		<scope>provided</scope>
   	</dependency>
   	<dependency>

src/nl/Steffion/BlockHunt/ArenaHandler.java

@@ -68,7 +68,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;
@@ -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);
@@ -414,7 +414,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;
@@ -444,7 +444,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;

src/nl/Steffion/BlockHunt/BlockHunt.java

@@ -359,39 +359,39 @@ 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,
 										"1-5");
 							} 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,
 										"1-4");
 							} 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,
 										"1-3");
 							} 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,
 										"1-2");
 							} 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);

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);
 							}
 						}

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());

src/nl/Steffion/BlockHunt/Listeners/OnEntityDamageByEntityEvent.java

@@ -1,13 +1,5 @@
 package nl.Steffion.BlockHunt.Listeners;
 
-import org.bukkit.GameMode;
-import org.bukkit.Sound;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
-import org.bukkit.event.entity.EntityDamageByEntityEvent;
-
 import me.libraryaddict.disguise.DisguiseAPI;
 import nl.Steffion.BlockHunt.Arena;
 import nl.Steffion.BlockHunt.Arena.ArenaState;
@@ -16,9 +8,18 @@
 import nl.Steffion.BlockHunt.W;
 import nl.Steffion.BlockHunt.Managers.MessageM;
 
+import org.bukkit.GameMode;
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.entity.EntityDamageByEntityEvent;
+
 public class OnEntityDamageByEntityEvent implements Listener {
-
-	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
+
+	@SuppressWarnings("deprecation")
+	@EventHandler(priority = EventPriority.NORMAL)
 	public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) {
 		Player player = null;
 		if (event.getEntity() instanceof Player) {
@@ -33,69 +34,97 @@ public void onEntityDamageByEntityEvent(EntityDamageByEntityEvent event) {
 		if (player != null) {
 			for (Arena arena : W.arenaList) {
 				if (arena.playersInArena.contains(player)) {
-					if ((arena.gameState == ArenaState.WAITING) || (arena.gameState == ArenaState.STARTING)) {
+					if (arena.gameState == ArenaState.WAITING
+							|| arena.gameState == ArenaState.STARTING) {
 						event.setCancelled(true);
 					} else {
-						if (arena.seekers.contains(player) && arena.seekers.contains(event.getDamager())) {
+						if (arena.seekers.contains(player)
+								&& arena.seekers.contains(event.getDamager())) {
 							event.setCancelled(true);
 						} else if (arena.playersInArena.contains(player)
-								&& arena.playersInArena.contains(event.getDamager())
-								&& !arena.seekers.contains(event.getDamager()) && !arena.seekers.contains(player)) {
+								&& arena.playersInArena.contains(event
+										.getDamager())
+								&& !arena.seekers.contains(event.getDamager())
+								&& !arena.seekers.contains(player)) {
 							event.setCancelled(true);
 						} else {
-							player.getWorld().playSound(player.getLocation(), Sound.ENTITY_PLAYER_HURT, 1, 1);
+							player.getWorld().playSound(player.getLocation(),
+									Sound.HURT_FLESH, 1, 1);
 
 							if (event.getDamage() >= player.getHealth()) {
-								player.setHealth(player.getMaxHealth());
+								player.setHealth(20);
 								event.setCancelled(true);
 
 								DisguiseAPI.undisguiseToAll(player);
 								W.pBlock.remove(player);
 
 								if (!arena.seekers.contains(player)) {
-									if (W.shop.getFile().get(damager.getName() + ".tokens") == null) {
-										W.shop.getFile().set(damager.getName() + ".tokens", 0);
+									if (W.shop.getFile().get(
+											damager.getName() + ".tokens") == null) {
+										W.shop.getFile().set(
+												damager.getName() + ".tokens",
+												0);
 										W.shop.save();
 									}
-									int damagerTokens = W.shop.getFile().getInt(damager.getName() + ".tokens");
-									W.shop.getFile().set(damager.getName() + ".tokens",
+									int damagerTokens = W.shop.getFile()
+											.getInt(damager.getName()
+													+ ".tokens");
+									W.shop.getFile().set(
+											damager.getName() + ".tokens",
 											damagerTokens + arena.killTokens);
 									W.shop.save();
 
-									MessageM.sendFMessage(damager, ConfigC.normal_addedToken,
+									MessageM.sendFMessage(damager,
+											ConfigC.normal_addedToken,
 											"amount-" + arena.killTokens);
 
-									if (W.shop.getFile().get(player.getName() + ".tokens") == null) {
-										W.shop.getFile().set(player.getName() + ".tokens", 0);
+									if (W.shop.getFile().get(
+											player.getName() + ".tokens") == null) {
+										W.shop.getFile()
+												.set(player.getName()
+														+ ".tokens", 0);
 										W.shop.save();
 									}
-									int playerTokens = W.shop.getFile().getInt(player.getName() + ".tokens");
-									float addingTokens = (arena.hidersTokenWin
-											- (((float) arena.timer / (float) arena.gameTime) * arena.hidersTokenWin));
-									W.shop.getFile().set(player.getName() + ".tokens",
+									int playerTokens = W.shop.getFile().getInt(
+											player.getName() + ".tokens");
+									float addingTokens = ((float) arena.hidersTokenWin - (((float) arena.timer / (float) arena.gameTime) * (float) arena.hidersTokenWin));
+									W.shop.getFile().set(
+											player.getName() + ".tokens",
 											playerTokens + (int) addingTokens);
 									W.shop.save();
 
-									MessageM.sendFMessage(player, ConfigC.normal_addedToken,
+									MessageM.sendFMessage(player,
+											ConfigC.normal_addedToken,
 											"amount-" + (int) addingTokens);
 
 									arena.seekers.add(player);
-									ArenaHandler.sendFMessage(arena, ConfigC.normal_ingameHiderDied,
-											"playername-" + player.getName(),
-											"left-" + (arena.playersInArena.size() - arena.seekers.size()));
+									ArenaHandler
+											.sendFMessage(
+													arena,
+													ConfigC.normal_ingameHiderDied,
+													"playername-"
+															+ player.getName(),
+													"left-"
+															+ (arena.playersInArena
+																	.size() - arena.seekers
+																	.size()));
 								} else {
-									ArenaHandler.sendFMessage(arena, ConfigC.normal_ingameSeekerDied,
-											"playername-" + player.getName(), "secs-" + arena.waitingTimeSeeker);
+									ArenaHandler.sendFMessage(arena,
+											ConfigC.normal_ingameSeekerDied,
+											"playername-" + player.getName(),
+											"secs-" + arena.waitingTimeSeeker);
 								}
 
 								player.getInventory().clear();
 								player.updateInventory();
 
-								if (arena.seekers.size() >= arena.playersInArena.size()) {
+								if (arena.seekers.size() >= arena.playersInArena
+										.size()) {
 									ArenaHandler.seekersWin(arena);
 								} else {
 									DisguiseAPI.undisguiseToAll(player);
-									W.seekertime.put(player, arena.waitingTimeSeeker);
+									W.seekertime.put(player,
+											arena.waitingTimeSeeker);
 									player.teleport(arena.seekersWarp);
 									player.setGameMode(GameMode.SURVIVAL);
 									player.setWalkSpeed(0.25F);

src/nl/Steffion/BlockHunt/Listeners/OnPlayerInteractEvent.java

@@ -36,7 +36,7 @@ public void onPlayerInteractEvent(PlayerInteractEvent event) {
 		Player player = event.getPlayer();
 		Block block = event.getClickedBlock();
 		if (PermissionsM.hasPerm(player, Permissions.create, false)) {
-			ItemStack item = player.getInventory().getItemInMainHand();
+			ItemStack item = player.getItemInHand();
 			if (item.getType() != Material.AIR) {
 				if (item.getItemMeta().hasDisplayName()) {
 					ItemMeta im = item.getItemMeta();
@@ -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);
 							}
 						}
@@ -197,7 +197,7 @@ public void onPlayerInteractEvent(PlayerInteractEvent event) {
 					&& (arena.gameState.equals(ArenaState.WAITING) || arena.gameState
 							.equals(ArenaState.STARTING))) {
 				event.setCancelled(true);
-				ItemStack item = player.getInventory().getItemInMainHand();
+				ItemStack item = player.getInventory().getItemInHand();
 				if (item.getType() != Material.AIR) {
 					if (item.getItemMeta().getDisplayName() != null) {
 						if (item.getItemMeta()

src/nl/Steffion/BlockHunt/Listeners/OnPlayerMoveEvent.java

@@ -37,32 +37,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);
 					}
 				}