diff --git a/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/components/player/GamePlayerManager.java b/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/components/player/GamePlayerManager.java index a0cbc2728..b0e687d4a 100644 --- a/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/components/player/GamePlayerManager.java +++ b/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/components/player/GamePlayerManager.java @@ -8,6 +8,7 @@ import org.bukkit.event.entity.EntityRegainHealthEvent; import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; import org.bukkit.event.entity.FoodLevelChangeEvent; import org.bukkit.event.inventory.InventoryClickEvent; +import org.bukkit.event.inventory.InventoryOpenEvent; import org.bukkit.event.player.PlayerDropItemEvent; import org.bukkit.event.player.PlayerPickupItemEvent; import org.bukkit.event.vehicle.VehicleEnterEvent; @@ -15,6 +16,8 @@ import org.bukkit.event.vehicle.VehicleEnterEvent; import mineplex.core.ReflectivelyCreateMiniPlugin; import mineplex.core.account.permissions.Permission; import mineplex.core.account.permissions.PermissionGroup; +import mineplex.core.arcadeevents.CoreGameStartEvent; +import mineplex.core.arcadeevents.CoreGameStopEvent; import mineplex.core.common.util.UtilPlayer; import mineplex.core.common.util.UtilServer; import mineplex.core.gadget.event.GadgetEnableEvent; @@ -22,6 +25,7 @@ import mineplex.core.gadget.persistence.UserGadgetPersistence; import mineplex.core.pet.event.PetSpawnEvent; import mineplex.core.teleport.event.MineplexTeleportEvent; import mineplex.game.nano.GameManager; +import mineplex.game.nano.NanoManager; import mineplex.game.nano.game.Game.GameState; import mineplex.game.nano.game.components.ComponentHook; import mineplex.game.nano.game.event.GameStateChangeEvent; @@ -73,9 +77,11 @@ public class GamePlayerManager extends GameManager implements ComponentHook _rooms.forEach((player, room) -> { + if (!player.isFlying()) + { + UtilTextMiddle.display(null, C.cYellow + "Double Tap Space To Fly", 0, 40, 0, player); + } + + player.setAllowFlight(true); + player.setFlying(true); + if (room.next()) { UtilTextMiddle.display(C.cYellowB + "Level " + room.Level, C.cRed + room.Blocks + " Blocks", 0, 40, 0, player); @@ -118,26 +123,6 @@ public class CopyCat extends RoomedSoloGame }); } - @EventHandler - public void updateFlight(UpdateEvent event) - { - if (event.getType() != UpdateType.TICK) - { - return; - } - - for (Player player : getAllPlayers()) - { - player.setAllowFlight(true); - player.setFlying(true); - - if (UtilEnt.isGrounded(player)) - { - UtilAction.velocity(player, new Vector(0, 0.3, 0)); - } - } - } - @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) public void blockPlace(BlockPlaceEvent event) { diff --git a/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/games/quick/challenges/ChallengeMilkCow.java b/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/games/quick/challenges/ChallengeMilkCow.java index 94bcdc997..84038eeea 100644 --- a/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/games/quick/challenges/ChallengeMilkCow.java +++ b/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/games/quick/challenges/ChallengeMilkCow.java @@ -1,5 +1,7 @@ package mineplex.game.nano.game.games.quick.challenges; +import java.util.concurrent.TimeUnit; + import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.entity.Cow; @@ -21,7 +23,7 @@ public class ChallengeMilkCow extends Challenge { super(game, ChallengeType.MILK_A_COW); - _timeout = 2500; + _timeout = TimeUnit.SECONDS.toMillis(5); } @Override diff --git a/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/games/quick/challenges/ChallengePlayMusic.java b/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/games/quick/challenges/ChallengePlayMusic.java index 0d145c93d..c31ea8a1f 100644 --- a/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/games/quick/challenges/ChallengePlayMusic.java +++ b/Plugins/Mineplex.Game.Nano/src/mineplex/game/nano/game/games/quick/challenges/ChallengePlayMusic.java @@ -4,6 +4,7 @@ import java.io.File; import java.io.FileNotFoundException; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.TimeUnit; import org.bukkit.Location; import org.bukkit.Material; @@ -52,7 +53,7 @@ public class ChallengePlayMusic extends Challenge _song = song; _songTick = new HashMap<>(); - _timeout = 2500; + _timeout = TimeUnit.SECONDS.toMillis(5); } @Override