nametags fix

3 files changed, 4 insertions, 11 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/CommandHandler.java b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/CommandHandler.java
index 23a37a1..af44954 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/CommandHandler.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/CommandHandler.java
@@ -10,7 +10,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import net.tylermurphy.hideAndSeek.Main;
 import net.tylermurphy.hideAndSeek.command.*;
 
 public class CommandHandler {
@@ -40,9 +39,6 @@ public class CommandHandler {
 	}
 	
 	public static boolean handleCommand(CommandSender sender, Command cmd, String label, String[] args) {
-		if(!Main.plugin.board.isReady()) {
-			Main.plugin.board.reload();
-		}
 		if(sender instanceof Player == false) {
 			sender.sendMessage(errorPrefix + "This command can only be run as a player.");
 		} else if(args.length < 1 || !COMMAND_REGISTER.containsKey(args[0].toLowerCase()) ) {
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java
index 393be5b..da8f714 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/EventListener.java
@@ -34,11 +34,7 @@ public class EventListener implements Listener {
 	@EventHandler
 	public void onPlayerJoin(PlayerJoinEvent event) {
 		event.getPlayer().setLevel(0);
-		if(Main.plugin.board.isReady()) {
-			Main.plugin.board.remove(event.getPlayer());
-		} else {
-			Main.plugin.board.init();
-		}
+		Main.plugin.board.remove(event.getPlayer());
 		if(!Util.isSetup()) return;
 		if(event.getPlayer().getWorld().getName().equals("hideandseek_"+spawnWorld) || event.getPlayer().getWorld().getName().equals(lobbyWorld)){
 			event.getPlayer().teleport(new Location(Bukkit.getWorld(exitWorld), exitPosition.getX(), exitPosition.getY(), exitPosition.getZ()));
@@ -70,7 +66,7 @@ public class EventListener implements Listener {
 				Entity damager = ((EntityDamageByEntityEvent)event).getDamager();
                 if(damager instanceof Player) {
                 	attacker = (Player) damager;
-                	if(Main.plugin.board.onSameTeam(p, p)) event.setCancelled(true);
+                	if(Main.plugin.board.onSameTeam(p, attacker)) event.setCancelled(true);
                 	if(Main.plugin.board.isSpectator(p)) event.setCancelled(true);
                 }
             }
@@ -99,7 +95,7 @@ public class EventListener implements Listener {
 	
 	@EventHandler
 	public void onProjectile(ProjectileLaunchEvent event) {
-		if(Main.plugin.status.equals("Playing")) return;
+		if(!Main.plugin.status.equals("Playing")) return;
 		if(event.getEntity() instanceof Snowball) {
 			Snowball snowball = (Snowball) event.getEntity();
 			if(snowball.getShooter() instanceof Player) {
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java
index 3fb48d6..a876df1 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/bukkit/Tick.java
@@ -67,6 +67,7 @@ public class Tick {
 		
 		if(tick%20 == 0) {
 			if(gameLength > 0) {
+				Main.plugin.board.reloadGameBoards();
 				Main.plugin.timeLeft--;
 				for(Player player : Main.plugin.board.getPlayers()) {
 					player.setLevel(Main.plugin.timeLeft);