From 14f7e64a770cedbd13fffad2787827f609364f68 Mon Sep 17 00:00:00 2001 From: xGamingDudex Date: Sun, 15 May 2016 21:05:37 +0200 Subject: [PATCH] Fixed Animator and removed duplicate test call in Game.java --- .../src/mineplex/core/common/animation/Animator.java | 6 ++++-- .../src/nautilus/game/arcade/game/Game.java | 4 ---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java index 1ac7d40da..2e2461fda 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java @@ -70,9 +70,11 @@ public abstract class Animator _queue.clear(); _queue.addAll(_points); + if(_queue.isEmpty()) return; + _baseLoc = loc.clone(); - _prev = new AnimationPoint(0, new Vector(0,0,0), _baseLoc.getDirection()); _next = _queue.peek(); + _prev = new AnimationPoint(0, _next.getMove().clone(), _next.getDirection().clone()); _task = new BukkitRunnable() { @@ -87,7 +89,7 @@ public abstract class Animator _next = _queue.peek(); } - if(!_queue.isEmpty()) + if(_queue.isEmpty()) { if(_repeat) { diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java index 6174dfc1e..f63232a05 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java @@ -1860,10 +1860,6 @@ public abstract class Game implements Listener List list = new ArrayList<>(UtilServer.getPlayersCollection()); AnnounceEnd(list); - Location loc = GetSpectatorLocation().getBlock().getLocation().add(1000.5, 0, 1000.5); - loc.setY(200); - - WinEffectManager.playWinEffect(loc); Bukkit.getScheduler().runTaskLater(getArcadeManager().getPlugin(), () -> { WinEffectManager.end(); }, 20 * 12); } if(event.getMessage().equalsIgnoreCase("/winroom2"))