diff options
Diffstat (limited to 'src/main/java/net/tylermurphy/hideAndSeek/events')
| -rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/events/EventListener.java | 20 | ||||
| -rw-r--r-- | src/main/java/net/tylermurphy/hideAndSeek/events/EventTick.java | 12 |
2 files changed, 24 insertions, 8 deletions
diff --git a/src/main/java/net/tylermurphy/hideAndSeek/events/EventListener.java b/src/main/java/net/tylermurphy/hideAndSeek/events/EventListener.java index 7c095b1..8ac7d29 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/events/EventListener.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/events/EventListener.java @@ -17,6 +17,7 @@ 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.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.potion.PotionEffect; @@ -37,7 +38,7 @@ public class EventListener implements Listener { for(PotionEffect effect : event.getPlayer().getActivePotionEffects()){ event.getPlayer().removePotionEffect(effect.getType()); } - event.getPlayer().teleport(new Location(event.getPlayer().getWorld(), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ())); + event.getPlayer().teleport(new Location(Bukkit.getWorld(spawnWorld), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ())); } else if(status.equals("Setup") || status.equals("Standby")) { Hider.addEntry(event.getPlayer().getName()); } @@ -64,10 +65,10 @@ public class EventListener implements Listener { if(spawnPosition == null) return; event.setCancelled(true); player.setHealth(player.getAttribute(Attribute.GENERIC_MAX_HEALTH).getValue()); - player.teleport(new Location(player.getWorld(), spawnPosition.getX(), spawnPosition.getY(), spawnPosition.getZ())); + player.teleport(new Location(Bukkit.getWorld(spawnWorld), spawnPosition.getX(), spawnPosition.getY(), spawnPosition.getZ())); Functions.playSound(player, Sound.ENTITY_PLAYER_DEATH, 1, 1); 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)); + Bukkit.broadcastMessage(String.format(messagePrefix + "%s%s%s has died and became 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)); @@ -112,4 +113,17 @@ public class EventListener implements Listener { if(event.getRegainReason() == RegainReason.SATIATED || event.getRegainReason() == RegainReason.REGEN) event.setCancelled(true); } + + @EventHandler + public void onPlayerCommandPreProccess(PlayerCommandPreprocessEvent event) { + if(status.equals("Setup") || status.equals("Standby")) return; + String handle = event.getMessage().split(" ")[0].substring(1); + for(String blocked : blockedCommands) { + if(handle.equalsIgnoreCase(blocked) || handle.equalsIgnoreCase("minecraft:"+blocked)) { + event.setCancelled(true); + event.getPlayer().sendMessage(errorPrefix + "This command is blocked during gameplay!"); + break; + } + } + } } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/events/EventTick.java b/src/main/java/net/tylermurphy/hideAndSeek/events/EventTick.java index a0bf36a..2198c05 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/events/EventTick.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/events/EventTick.java @@ -3,7 +3,6 @@ package net.tylermurphy.hideAndSeek.events; import static net.tylermurphy.hideAndSeek.Store.*; import org.bukkit.Bukkit; -import org.bukkit.ChatColor; import org.bukkit.Color; import org.bukkit.FireworkEffect; import org.bukkit.Location; @@ -41,11 +40,11 @@ public class EventTick { tick ++; if(( status.equals("Starting") || status.equals("Playing") ) && Hider.getSize() < 1) { - Bukkit.broadcastMessage(messagePrefix + "Game over! All hiders have been found."); + Bukkit.broadcastMessage(gameoverPrefix + "All hiders have been found."); Stop.onStop(); } if(( status.equals("Starting") || status.equals("Playing") ) && Seeker.getSize() < 1) { - Bukkit.broadcastMessage(messagePrefix + "Game has ended as all seekers have quit."); + Bukkit.broadcastMessage(abortPrefix + "All seekers have quit."); Stop.onStop(); } } @@ -54,7 +53,7 @@ public class EventTick { for(String playerName : Seeker.getEntries()) { Player player = playerList.get(playerName); if(player != null) { - player.teleport(new Location(player.getWorld(), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ())); + player.teleport(new Location(Bukkit.getWorld(spawnWorld), spawnPosition.getX(),spawnPosition.getY(),spawnPosition.getZ())); } } } @@ -83,7 +82,7 @@ public class EventTick { .withTrail() .build()); fw.setFireworkMeta(fwm); - Bukkit.getServer().broadcastMessage(ChatColor.YELLOW + "Taunt >" + ChatColor.WHITE + " Taunt has been activated"); + Bukkit.getServer().broadcastMessage(tauntPrefix + " Taunt has been activated"); } tauntPlayer = ""; } @@ -98,6 +97,9 @@ public class EventTick { player.addPotionEffect(new PotionEffect(PotionEffectType.SLOW_FALLING, 1000000, 1, false, false)); player.addPotionEffect(new PotionEffect(PotionEffectType.WATER_BREATHING, 1000000, 10, false, false)); } + for(Player temp : playerList.values()) { + Functions.setGlow(player, temp, false); + } } for(String playerName : Hider.getEntries()) { Player player = playerList.get(playerName); |