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

Fixed Animator and removed duplicate test call in Game.java

This commit is contained in:
xGamingDudex 2016-05-15 21:05:37 +02:00
parent d850bed725
commit 14f7e64a77
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Plugins/Mineplex.Core.Common/src/mineplex/core/common/animation/Animator.java
View File

@ -70,9 +70,11 @@ public abstract class Animator
_queue.clear(); _queue.clear();
_queue.addAll(_points); _queue.addAll(_points);
if(_queue.isEmpty()) return;
_baseLoc = loc.clone(); _baseLoc = loc.clone();
_prev = new AnimationPoint(0, new Vector(0,0,0), _baseLoc.getDirection());
_next = _queue.peek(); _next = _queue.peek();
_prev = new AnimationPoint(0, _next.getMove().clone(), _next.getDirection().clone());
_task = new BukkitRunnable() _task = new BukkitRunnable()
{ {
@ -87,7 +89,7 @@ public abstract class Animator
_next = _queue.peek(); _next = _queue.peek();
} }
if(!_queue.isEmpty()) if(_queue.isEmpty())
{ {
if(_repeat) if(_repeat)
{ {

4
Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
View File

@ -1860,10 +1860,6 @@ public abstract class Game implements Listener
List<Player> list = new ArrayList<>(UtilServer.getPlayersCollection()); List<Player> list = new ArrayList<>(UtilServer.getPlayersCollection());
AnnounceEnd(list); 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); Bukkit.getScheduler().runTaskLater(getArcadeManager().getPlugin(), () -> { WinEffectManager.end(); }, 20 * 12);
} }
if(event.getMessage().equalsIgnoreCase("/winroom2")) if(event.getMessage().equalsIgnoreCase("/winroom2"))