From 735550c157bc1caaea200f30e3d0a89e563b1a5d Mon Sep 17 00:00:00 2001 From: md-5 Date: Thu, 17 Nov 2016 12:29:33 +1100 Subject: [PATCH] Use Mineplex Pair Util Class in Halloween 2016 (#274) JavaFX is not included in OpenJDK. --- .../arcade/game/games/halloween2016/Halloween2016.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween2016/Halloween2016.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween2016/Halloween2016.java index 4fef083cc..d868e9164 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween2016/Halloween2016.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween2016/Halloween2016.java @@ -23,6 +23,7 @@ import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; +import mineplex.core.common.Pair; import mineplex.core.common.animation.AnimationPoint; import mineplex.core.common.animation.Animator; import mineplex.core.common.animation.AnimatorFactory; @@ -38,7 +39,6 @@ import mineplex.core.reward.rewards.PetReward; import mineplex.core.updater.UpdateType; import mineplex.core.updater.event.UpdateEvent; -import javafx.util.Pair; import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.GameType; import nautilus.game.arcade.events.GameStateChangeEvent; @@ -139,8 +139,8 @@ public class Halloween2016 extends Halloween _lockAllPlayers = null; for(Entry> e : _playerPreLockData.entrySet()) { - e.getKey().teleport(e.getValue().getKey()); - e.getKey().setGameMode(e.getValue().getValue()); + e.getKey().teleport(e.getValue().getLeft()); + e.getKey().setGameMode(e.getValue().getRight()); if(IsAlive(e.getKey())) { UtilPlayer.showForAll(e.getKey()); @@ -171,7 +171,7 @@ public class Halloween2016 extends Halloween { if(!_playerPreLockData.containsKey(p)) { - _playerPreLockData.put(p, new Pair(p.getLocation(), p.getGameMode())); + _playerPreLockData.put(p, Pair.create(p.getLocation(), p.getGameMode())); p.setGameMode(GameMode.SPECTATOR); } p.teleport(_lockAllPlayers);