death messages, give item fix

2 files changed, 14 insertions, 4 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/manager/EventManager.java b/src/main/java/net/tylermurphy/hideAndSeek/manager/EventManager.java
index 99825f7..8a4923e 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/manager/EventManager.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/manager/EventManager.java
@@ -2,6 +2,7 @@ package net.tylermurphy.hideAndSeek.manager;
 
 import static net.tylermurphy.hideAndSeek.Store.*;
 
+import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.event.EventHandler;
@@ -11,6 +12,8 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.potion.PotionEffect;
 
+import net.md_5.bungee.api.ChatColor;
+
 public class EventManager implements Listener {
 
 	@EventHandler
@@ -43,6 +46,13 @@ public class EventManager implements Listener {
 	@EventHandler
 	public void onDeath(PlayerDeathEvent event) {
 		if(status.equals("Playing")) {
+			if(Hider.hasEntry(event.getEntity().getName())) {
+				Bukkit.getServer().broadcastMessage(String.format(messagePrefix + "%s%s has died", ChatColor.GOLD, event.getEntity().getName()));
+			}
+			if(Seeker.hasEntry(event.getEntity().getName())) {
+				Bukkit.getServer().broadcastMessage(String.format(messagePrefix + "%s%s has died", ChatColor.RED, event.getEntity().getName()));
+			}
+			
 			setPlayerData(event.getEntity().getName(), "Death", 1);
 			setPlayerData(event.getEntity().getName(), "GiveStatus", 1);
 		}
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/manager/TickManager.java b/src/main/java/net/tylermurphy/hideAndSeek/manager/TickManager.java
index 5ee491a..7b6cedf 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/manager/TickManager.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/manager/TickManager.java
@@ -149,6 +149,10 @@ public class TickManager {
 		}
 		for(Player player : playerList.values()) {
 			player.addPotionEffect(new PotionEffect(PotionEffectType.DOLPHINS_GRACE, 1000000, 1, false, false));
+			if(getPlayerData(player.getName(),"Death") > 0) {
+				setPlayerData(player.getName(),"Death",0);
+				Seeker.addEntry(player.getName());
+			}
 			if(getPlayerData(player.getName(),"GiveStatus") > 0) {
 				setPlayerData(player.getName(),"GiveStatus",0);
 				player.getInventory().clear();
@@ -193,10 +197,6 @@ public class TickManager {
 					player.getInventory().addItem(potion);
 				}
 			}
-			if(getPlayerData(player.getName(),"Death") > 0) {
-				setPlayerData(player.getName(),"Death",0);
-				Seeker.addEntry(player.getName());
-			}
 		}
 		for(String playerName : Seeker.getEntries()) {
 			Player player = playerList.get(playerName);