JarvisBigBalls/Mineplex2018-withcommit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Mineplex Pair Util Class in Halloween 2016 (#274)

Browse Source 
JavaFX is not included in OpenJDK.
This commit is contained in:
md-5 2016-11-17 12:29:33 +11:00 committed by Shaun Bennett
parent 0039b79281
commit 735550c157
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween2016/Halloween2016.java
View File

@ -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<Player, Pair<Location, GameMode>> 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<Location, GameMode>(p.getLocation(), p.getGameMode()));
_playerPreLockData.put(p, Pair.create(p.getLocation(), p.getGameMode()));
p.setGameMode(GameMode.SPECTATOR);
}
p.teleport(_lockAllPlayers);