diff --git a/Maps/Dragons/Dragons_BalloonTown.zip b/Maps/Dragons/Dragons_BalloonTown.zip new file mode 100644 index 000000000..ee384e643 Binary files /dev/null and b/Maps/Dragons/Dragons_BalloonTown.zip differ diff --git a/Maps/Gravity/Gravity_ShatteredSatalite.zip b/Maps/Gravity/Gravity_ShatteredSatalite.zip index 21fe46b14..3293bce41 100644 Binary files a/Maps/Gravity/Gravity_ShatteredSatalite.zip and b/Maps/Gravity/Gravity_ShatteredSatalite.zip differ diff --git a/Maps/Runner/Runner_Eclipse.zip b/Maps/Runner/Runner_Eclipse.zip new file mode 100644 index 000000000..c56713315 Binary files /dev/null and b/Maps/Runner/Runner_Eclipse.zip differ diff --git a/Maps/Survival Games/SG_ElvenCitadel.zip b/Maps/Survival Games/SG_ElvenCitadel.zip new file mode 100644 index 000000000..211a377d9 Binary files /dev/null and b/Maps/Survival Games/SG_ElvenCitadel.zip differ diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java index 8847cd3e4..3eab51e8e 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/modules/NewsManager.java @@ -34,8 +34,9 @@ public class NewsManager extends MiniPlugin _news = new String[] { "New SSM Kit: " + C.cYellow + C.Bold + "Skeletal Horse", + "New Game: " + C.cYellow + C.Bold + "Sheep Quest", "Beta Servers Live! " + C.cPurple + C.Bold + "ULTRA ONLY", - "Beta Game: " + C.cYellow + C.Bold + "Sheep Quest", + "Beta Game: " + C.cYellow + C.Bold + "Gravity", }; } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java index acb92aac5..e6a68bce9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameGemManager.java @@ -30,7 +30,7 @@ public class GameGemManager implements Listener { ArcadeManager Manager; - boolean DoubleGem = false; + boolean DoubleGem = true; public GameGemManager(ArcadeManager manager) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java index 36113284e..a137d75a3 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameManager.java @@ -153,6 +153,15 @@ public class GameManager implements Listener game.SetState(GameState.End); } } + /* + else if (game.GetType() == GameType.Smash) + { + if (UtilTime.elapsed(game.GetStateTime(), 3600000)) + { + game.SetState(GameState.End); + } + } + */ else if (game.GetType() == GameType.HungerGames) { if (UtilTime.elapsed(game.GetStateTime(), 9600000))