diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hungergames/HungerGames.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hungergames/HungerGames.java index 55d6f8fa6..b86381e54 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hungergames/HungerGames.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hungergames/HungerGames.java @@ -42,6 +42,7 @@ import org.bukkit.event.player.PlayerMoveEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; +import org.bukkit.util.Vector; import mineplex.core.common.util.C; import mineplex.core.common.util.F; @@ -884,17 +885,11 @@ public class HungerGames extends SoloGame { if (Math.random() > 0.8) { - /* Vector traj = UtilAlg.getTrajectory(block.getLocation().add(0.5, 1.5, 0.5), player.getLocation()); Snowball ball = player.getWorld().spawn(block.getLocation().add(0.5, 1.5, 0.5).subtract(traj.clone().multiply(8 + UtilMath.r(8))), Snowball.class); ball.setVelocity(UtilAlg.getTrajectory(ball.getLocation(), player.getEyeLocation().add(0, 3, 0)).add(new Vector(Math.random()-0.5, Math.random()-0.5, Math.random()-0.5).multiply(0.1))); - */ - - player.playEffect(block.getLocation(), Effect.STEP_SOUND, Material.OBSIDIAN); - - player.sendMessage("Block @ " + UtilWorld.locToStrClean(block.getLocation())); } } @@ -1002,7 +997,7 @@ public class HungerGames extends SoloGame if (time > 14000 && time < 23000) { - if (_supplyCurrent == null) + if (_supplyCurrent == null && !_deathmatchCountdown && !_deathmatchLive) { if (_supplyLocations.isEmpty()) return; @@ -1165,6 +1160,9 @@ public class HungerGames extends SoloGame if (UtilMath.offset2d(event.getFrom(), event.getTo()) == 0) return; + if (!IsAlive(event.getPlayer())) + return; + event.setTo(event.getFrom()); }