1.3.1 build 6

2 files changed, 43 insertions, 35 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java
index 2e8eafb..ffad241 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java
@@ -82,43 +82,47 @@ public class EventListener implements Listener {
 	
 	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onEntityDamage(EntityDamageEvent event) {
-		if(event.getEntity() instanceof Player) {
-			Player p = (Player) event.getEntity();
-			if(!Main.plugin.board.isPlayer(p)) return;
-			if(!Main.plugin.status.equals("Playing")) {
-				event.setCancelled(true);
-				return;
-			}
-			Player attacker = null;
-			if(event instanceof EntityDamageByEntityEvent) {
-				Entity damager = ((EntityDamageByEntityEvent)event).getDamager();
-                if(damager instanceof Player) {
-                	attacker = (Player) damager;
-                	if(Main.plugin.board.onSameTeam(p, attacker)) event.setCancelled(true);
-                	if(Main.plugin.board.isSpectator(p)) event.setCancelled(true);
-                }
-            }
-			Player player = (Player) event.getEntity();
-			if(player.getHealth()-event.getDamage() < 0 || !pvpEnabled) {
-				if(spawnPosition == null) return;
-				event.setCancelled(true);
-				player.setHealth(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue());
-				player.teleport(new Location(Bukkit.getWorld("hideandseek_"+spawnWorld), spawnPosition.getX(), spawnPosition.getY(), spawnPosition.getZ()));
-				Packet.playSound(player, Sound.ENTITY_PLAYER_DEATH, 1, 1);
-				if(Main.plugin.board.isSeeker(player)) {
-					Bukkit.broadcastMessage(message("GAME_PLAYER_DEATH").addPlayer(event.getEntity()).toString());
+		try {
+			if (event.getEntity() instanceof Player) {
+				Player p = (Player) event.getEntity();
+				if (!Main.plugin.board.isPlayer(p)) return;
+				if (!Main.plugin.status.equals("Playing")) {
+					event.setCancelled(true);
+					return;
 				}
-				if(Main.plugin.board.isHider(player)) {
-					if(attacker == null) {
-						Util.broadcastMessage(message("GAME_PLAYER_FOUND").addPlayer(event.getEntity()).toString());
-					} else {
-						Util.broadcastMessage(message("GAME_PLAYER_FOUND_BY").addPlayer(event.getEntity()).addPlayer(attacker).toString());
+				Player attacker = null;
+				if (event instanceof EntityDamageByEntityEvent) {
+					Entity damager = ((EntityDamageByEntityEvent) event).getDamager();
+					if (damager instanceof Player) {
+						attacker = (Player) damager;
+						if (Main.plugin.board.onSameTeam(p, attacker)) event.setCancelled(true);
+						if (Main.plugin.board.isSpectator(p)) event.setCancelled(true);
+					}
+				}
+				Player player = (Player) event.getEntity();
+				if (player.getHealth() - event.getDamage() < 0 || !pvpEnabled) {
+					if (spawnPosition == null) return;
+					event.setCancelled(true);
+					player.setHealth(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue());
+					player.teleport(new Location(Bukkit.getWorld("hideandseek_" + spawnWorld), spawnPosition.getX(), spawnPosition.getY(), spawnPosition.getZ()));
+					Packet.playSound(player, Sound.ENTITY_PLAYER_DEATH, 1, 1);
+					if (Main.plugin.board.isSeeker(player)) {
+						Bukkit.broadcastMessage(message("GAME_PLAYER_DEATH").addPlayer(event.getEntity()).toString());
+					}
+					if (Main.plugin.board.isHider(player)) {
+						if (attacker == null) {
+							Util.broadcastMessage(message("GAME_PLAYER_FOUND").addPlayer(event.getEntity()).toString());
+						} else {
+							Util.broadcastMessage(message("GAME_PLAYER_FOUND_BY").addPlayer(event.getEntity()).addPlayer(attacker).toString());
+						}
+						Main.plugin.board.addSeeker(player);
 					}
-					Main.plugin.board.addSeeker(player);
+					Util.resetPlayer(player);
+					Main.plugin.board.reloadBoardTeams();
 				}
-				Util.resetPlayer(player);
-				Main.plugin.board.reloadBoardTeams();
 			}
+		} catch (Exception e){
+			//Has shown to cause problems, so ignore if exception
 		}
 	}
 	
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java
index eadcf14..8efbe80 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java
@@ -40,9 +40,13 @@ public class Tick {
 		else tick = 1;
 		
 		for(Player hider : Main.plugin.board.getHiders()) {
-			int distance = 100;
+			int distance = 100, temp = 100;
 			for(Player seeker : Main.plugin.board.getSeekers()) {
-				int temp = (int) hider.getLocation().distance(seeker.getLocation());
+				try {
+					temp = (int) hider.getLocation().distance(seeker.getLocation());
+				} catch (Exception e){
+					//Players in different worlds, NOT OK!!!
+				}
 				if(distance > temp) {
 					distance = temp;
 				}