From 20037e986f3807a35fe194a2735982a50c766e55 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Sat, 21 Aug 2021 22:02:11 -0400 Subject: hunder and standby health rewrite --- .../hideAndSeek/manager/EventManager.java | 26 ++++++++++++++-------- 1 file changed, 17 insertions(+), 9 deletions(-) (limited to 'src/main/java/net/tylermurphy/hideAndSeek/manager/EventManager.java') diff --git a/src/main/java/net/tylermurphy/hideAndSeek/manager/EventManager.java b/src/main/java/net/tylermurphy/hideAndSeek/manager/EventManager.java index 9983202..0221eda 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/manager/EventManager.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/manager/EventManager.java @@ -15,6 +15,7 @@ import org.bukkit.event.Listener; import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.entity.EntityRegainHealthEvent; import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; +import org.bukkit.event.entity.FoodLevelChangeEvent; import org.bukkit.event.entity.ProjectileLaunchEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; @@ -54,6 +55,10 @@ public class EventManager implements Listener { @EventHandler public void onPlayerDamage(EntityDamageEvent event) { if(event.getEntity() instanceof Player) { + if(!status.equals("Playing")) { + event.setCancelled(true); + return; + } Player player = (Player) event.getEntity(); if(player.getHealth()-event.getDamage() < 0) { if(spawnPosition == null) return; @@ -61,16 +66,14 @@ public class EventManager implements Listener { player.setHealth(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()); player.teleport(new Location(player.getWorld(), spawnPosition.getX(), spawnPosition.getY(), spawnPosition.getZ())); Functions.playSound(player, Sound.ENTITY_PLAYER_DEATH, 1, 1); - if(status.equals("Playing")) { - Functions.resetPlayer(player); - if(Hider.hasEntry(event.getEntity().getName())) { - Bukkit.broadcastMessage(String.format(messagePrefix + "%s%s%s has died and become a seeker", ChatColor.GOLD, event.getEntity().getName(), ChatColor.WHITE)); - } - if(Seeker.hasEntry(event.getEntity().getName())) { - Bukkit.broadcastMessage(String.format(messagePrefix + "%s%s%s has been beat by a hider", ChatColor.RED, event.getEntity().getName(), ChatColor.WHITE)); - } - Seeker.addEntry(player.getName()); + Functions.resetPlayer(player); + if(Hider.hasEntry(event.getEntity().getName())) { + Bukkit.broadcastMessage(String.format(messagePrefix + "%s%s%s has died and become a seeker", ChatColor.GOLD, event.getEntity().getName(), ChatColor.WHITE)); + } + if(Seeker.hasEntry(event.getEntity().getName())) { + Bukkit.broadcastMessage(String.format(messagePrefix + "%s%s%s has been beat by a hider", ChatColor.RED, event.getEntity().getName(), ChatColor.WHITE)); } + Seeker.addEntry(player.getName()); } } @@ -99,6 +102,11 @@ public class EventManager implements Listener { } } + @EventHandler + public void onFoodLevelChange(FoodLevelChangeEvent event) { + event.setCancelled(false); + } + @EventHandler public void onPlayerRegainHealth(EntityRegainHealthEvent event) { if(event.getRegainReason() == RegainReason.SATIATED || event.getRegainReason() == RegainReason.REGEN) -- cgit v1.2.3-freya