rewrite database and damage event, add placeholders

3 files changed, 104 insertions, 87 deletions

diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java
index c08b779..86711ab 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Board.java
@@ -38,6 +38,8 @@ public class Board {
     private static final List<String> Hider = new ArrayList<>(), Seeker = new ArrayList<>(), Spectator = new ArrayList<>();
     private static final Map<String, Player> playerList = new HashMap<>();
     private static final Map<String, CustomBoard> customBoards = new HashMap<>();
+    private static final Map<String, Integer> kills = new HashMap<>();
+    private static final Map<String, Integer> deaths = new HashMap<>();
 
     public static boolean isPlayer(Player player) {
         return playerList.containsKey(player.getUniqueId().toString());
@@ -51,10 +53,18 @@ public class Board {
         return Hider.contains(player.getUniqueId().toString());
     }
 
+    public static boolean isHider(UUID uuid){
+        return Hider.contains(uuid.toString());
+    }
+
     public static boolean isSeeker(Player player) {
         return Seeker.contains(player.getUniqueId().toString());
     }
 
+    public static boolean isSeeker(UUID uuid){
+        return Seeker.contains(uuid.toString());
+    }
+
     public static boolean isSpectator(Player player) {
         return Spectator.contains(player.getUniqueId().toString());
     }
@@ -133,6 +143,32 @@ public class Board {
         Hider.clear();
         Seeker.clear();
         Spectator.clear();
+        kills.clear();
+        deaths.clear();
+    }
+
+    public static void addKill(UUID uuid){
+        if(kills.containsKey(uuid.toString())){
+            kills.put(uuid.toString(), kills.get(uuid.toString())+1);
+        } else {
+            kills.put(uuid.toString(), 1);
+        }
+    }
+
+    public static void addDeath(UUID uuid){
+        if(deaths.containsKey(uuid.toString())){
+            deaths.put(uuid.toString(), deaths.get(uuid.toString())+1);
+        } else {
+            deaths.put(uuid.toString(), 1);
+        }
+    }
+
+    public static Map<String, Integer> getKills(){
+        return new HashMap<>(kills);
+    }
+
+    public static Map<String, Integer> getDeaths(){
+        return new HashMap<>(deaths);
     }
 
     public static void createLobbyBoard(Player player) {
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java b/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java
index 35089e4..7d83217 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java
@@ -32,6 +32,7 @@ import org.bukkit.attribute.AttributeInstance;
 import org.bukkit.entity.Arrow;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Projectile;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
@@ -148,93 +149,73 @@ public class EventListener implements Listener {
 	
 	@EventHandler(priority = EventPriority.HIGHEST)
 	public void onEntityDamage(EntityDamageEvent event) {
-		try {
-			if (event.getEntity() instanceof Player) {
-				Player player = (Player) event.getEntity();
-				if (!Board.isPlayer(player)) {
-					if (event instanceof EntityDamageByEntityEvent) {
-						Entity damager = ((EntityDamageByEntityEvent) event).getDamager();
-						if (damager instanceof Player) {
-							if(Board.isPlayer(damager)){
-								event.setCancelled(true);
-								return;
-							}
-						}
-					}
-					return;
-				}
-				if (Game.status != Status.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 (!Board.isPlayer(attacker)) event.setCancelled(true);
-						if (Board.onSameTeam(player, attacker)) event.setCancelled(true);
-						if (Board.isSpectator(player)) event.setCancelled(true);
-					} else if(damager instanceof Arrow){
-						ProjectileSource source = ((Arrow) damager).getShooter();
-						if(source instanceof Player){
-							attacker = (Player) source;
-							if (!Board.isPlayer(attacker)) event.setCancelled(true);
-							if (Board.onSameTeam(player, attacker)) event.setCancelled(true);
-							if (Board.isSpectator(player)) event.setCancelled(true);
-						}
-					}
-				}
-				if(event.isCancelled()) return;
-				if (player.getHealth() - event.getFinalDamage() < 0.5 || !pvpEnabled) {
-					if (event instanceof EntityDamageByEntityEvent && !pvpEnabled) {
-						Entity damager = ((EntityDamageByEntityEvent) event).getDamager();
-						if (damager instanceof Player) {
-							Player atacker = (Player) damager;
-							if(!Board.isSeeker(atacker)){
-								event.setCancelled(true);
-								return;
-							}
-						} else {
-							event.setCancelled(true);
-							return;
-						}
-					} else if(!pvpEnabled) {
-						event.setCancelled(true);
-						return;
-					}
-					if (spawnPosition == null) return;
-					event.setCancelled(true);
-					if(Version.atLeast("1.9")) {
-						AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
-						if (attribute != null) player.setHealth(attribute.getValue());
-					} else {
-						player.setHealth(player.getMaxHealth());
-					}
-					player.teleport(new Location(Bukkit.getWorld(Game.getGameWorld()), spawnPosition.getX(), spawnPosition.getY(), spawnPosition.getZ()));
-					if(Version.atLeast("1.9")){
-						XSound.ENTITY_PLAYER_DEATH.play(player, 1, 1);
-					} else {
-						XSound.ENTITY_PLAYER_HURT.play(player, 1, 1);
-					}
-					if (Board.isSeeker(player)) {
-						Game.broadcastMessage(message("GAME_PLAYER_DEATH").addPlayer(player).toString());
-					}
-					if (Board.isHider(player)) {
-						if (attacker == null) {
-							Game.broadcastMessage(message("GAME_PLAYER_FOUND").addPlayer(player).toString());
-						} else {
-							Game.broadcastMessage(message("GAME_PLAYER_FOUND_BY").addPlayer(player).addPlayer(attacker).toString());
-						}
-						Board.addSeeker(player);
-					}
-					Game.resetPlayer(player);
-					Board.reloadBoardTeams();
-				}
+		// If you are not a player, get out of here
+		if(!(event.getEntity() instanceof Player)) return;
+		// Define variables
+		Player player = (Player) event.getEntity();
+		Player attacker = null;
+		// If player pvp is enabled, and player doesn't die, we do not care
+		if(pvpEnabled && player.getHealth() - event.getFinalDamage() >= 0.5){ return; }
+		// If no spawn position, we won't be able to manage their death :o
+		if(spawnPosition == null){ return; }
+		// If there is an attacker, find them
+		if (event instanceof EntityDamageByEntityEvent) {
+			if(((EntityDamageByEntityEvent) event).getDamager() instanceof Player)
+				attacker = (Player) ((EntityDamageByEntityEvent) event).getDamager();
+			else if(((EntityDamageByEntityEvent) event).getDamager() instanceof Projectile)
+				if(((Projectile) ((EntityDamageByEntityEvent) event).getDamager()).getShooter() instanceof Player)
+					attacker = (Player) ((Projectile) ((EntityDamageByEntityEvent) event).getDamager()).getShooter();
+		}
+		// Makes sure that if there was an attacking player, that the event is allowed for the game
+		if(attacker != null){
+			// Cancel if one player is in the game but other isn't
+			if((Board.isPlayer(player) && !Board.isPlayer(attacker)) || (!Board.isPlayer(player) && Board.isPlayer(attacker))){
+				event.setCancelled(true);
+				return;
+			// Ignore event if neither player are in the game
+			} else if(!Board.isPlayer(player) && !Board.isPlayer(attacker)){
+				return;
+			// Ignore event if players are on the same team, or one of them is a spectator
+			} else if(Board.onSameTeam(player, attacker) || Board.isSpectator(player) || Board.isSpectator(attacker)){
+				event.setCancelled(true);
+				return;
+			// Ignore the event if pvp is disabled, and a hider is trying to attack a seeker
+			} else if(!pvpEnabled && Board.isHider(attacker) && Board.isSeeker(player)){
+				event.setCancelled(true);
+				return;
+			}
+		// If there is no attacker, it must of been by natural causes. If pvp is disabled, and config doesn't allow natural causes, cancel event.
+		} else if(!pvpEnabled && !allowNaturalCauses){
+			event.setCancelled(true);
+			return;
+		}
+		// Handle death event
+		event.setCancelled(true);
+		// Reset health and play death effect
+		if(Version.atLeast("1.9")) {
+			AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH);
+			if (attribute != null) player.setHealth(attribute.getValue());
+			XSound.ENTITY_PLAYER_DEATH.play(player, 1, 1);
+		} else {
+			player.setHealth(player.getMaxHealth());
+			XSound.ENTITY_PLAYER_HURT.play(player, 1, 1);
+		}
+		// Teleport player to seeker spawn
+		player.teleport(new Location(Bukkit.getWorld(Game.getGameWorld()), spawnPosition.getX(), spawnPosition.getY(), spawnPosition.getZ()));
+		// Broadcast player death message
+		if (Board.isSeeker(player)) {
+			Game.broadcastMessage(message("GAME_PLAYER_DEATH").addPlayer(player).toString());
+		} else if (Board.isHider(player)) {
+			if (attacker == null) {
+				Game.broadcastMessage(message("GAME_PLAYER_FOUND").addPlayer(player).toString());
+			} else {
+				Game.broadcastMessage(message("GAME_PLAYER_FOUND_BY").addPlayer(player).addPlayer(attacker).toString());
 			}
-		} catch (Exception e){
-			Main.plugin.getLogger().severe("Entity Damage Event Error: " + e.getMessage());
+			Board.addSeeker(player);
 		}
+		// Add leaderboard stats
+		Board.addDeath(player.getUniqueId());
+		if(attacker != null){ Board.addKill(attacker.getUniqueId()); }
 	}
 	
 	@EventHandler(priority = EventPriority.HIGHEST)
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
index 16caee4..fb91a2f 100644
--- a/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
+++ b/src/main/java/net/tylermurphy/hideAndSeek/game/Game.java
@@ -178,11 +178,11 @@ public class Game {
 		List<UUID> players = Board.getPlayers().stream().map(Entity::getUniqueId).collect(Collectors.toList());
 		if(type == WinType.HIDER_WIN){
 			List<UUID> winners = Board.getHiders().stream().map(Entity::getUniqueId).collect(Collectors.toList());
-			Database.playerInfo.addWins(players, winners, type);
+			Database.playerInfo.addWins(players, winners, Board.getKills(), Board.getDeaths(), type);
 		} else if(type == WinType.SEEKER_WIN){
 			List<UUID> winners = new ArrayList<>();
 			winners.add(Board.getFirstSeeker().getUniqueId());
-			Database.playerInfo.addWins(players, winners, type);
+			Database.playerInfo.addWins(players, winners, Board.getKills(), Board.getDeaths(), type);
 		}
 		worldBorder.resetWorldborder(getGameWorld());
 		for(Player player : Board.getPlayers()) {