From d6c8e51104696852b1b2342ce23715715544a8e8 Mon Sep 17 00:00:00 2001
From: Mysticate <unconfigured@null.spigotmc.org>
Date: Fri, 28 Aug 2015 20:57:47 -0600
Subject: [PATCH] Things ^_^

---
 .../game/arcade/game/games/evolution/Evolution.java | 13 +++++++++----
 .../games/evolution/trackers/NoMeleeTracker.java    |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
index a136c20d1..7669bb1cc 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/Evolution.java
@@ -4,6 +4,7 @@ import java.util.AbstractMap.SimpleEntry;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
+import java.util.List;
 
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
@@ -24,6 +25,7 @@ import mineplex.core.updater.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.minecraft.game.core.combat.CombatComponent;
 import mineplex.minecraft.game.core.combat.CombatManager.AttackReason;
+import mineplex.minecraft.game.core.combat.DeathMessageType;
 import mineplex.minecraft.game.core.combat.event.CombatDeathEvent;
 import mineplex.minecraft.game.core.condition.Condition.ConditionType;
 import mineplex.minecraft.game.core.condition.ConditionActive;
@@ -145,9 +147,7 @@ public class Evolution extends SoloGame
 		VersionRequire1_8 = true;
 		
 		CreatureAllow = false;
-		
-		DeathMessages = false;
-		
+				
 		InventoryClick = false;
 		
 		InventoryOpenBlock = false;
@@ -406,6 +406,8 @@ public class Evolution extends SoloGame
 	@EventHandler
 	public void onKill(CombatDeathEvent event)
 	{
+		event.SetBroadcastType(DeathMessageType.Simple);
+		
 		if (!IsLive())
 			return;
 
@@ -723,7 +725,7 @@ public class Evolution extends SoloGame
 		ArrayList<EvoToken> tokens = new ArrayList<EvoToken>(_tokens.values());
 		Collections.sort(tokens);
 
-		ArrayList<Player> players = new ArrayList<Player>();	
+		List<Player> players = new ArrayList<Player>();	
 
 		for (int i = 0 ; i < tokens.size() ; i++)
 		{
@@ -745,6 +747,9 @@ public class Evolution extends SoloGame
 			if (player.isOnline())
 				AddGems(player, 10, "Participation", false, false);
 
+		if (tokens.size() >= 1)
+			players = players.subList(0, 1);
+		
 		_tokens.clear();
 		_evoPlatforms.clear();
 		_evolutionsAvailable.clear();
diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/trackers/NoMeleeTracker.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/trackers/NoMeleeTracker.java
index cafca3709..aee566c16 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/trackers/NoMeleeTracker.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/evolution/trackers/NoMeleeTracker.java
@@ -39,7 +39,7 @@ public class NoMeleeTracker extends StatTracker<Evolution>
 		if (!getGame().IsAlive(player))
 			return;
 		
-		if (event.GetReason() == null || event.GetReason().contains("Attack"))
+		if (event.GetReason() == null || event.GetReason().trim().equals("") || event.GetReason().contains("Attack"))
 		{
 			if (!_out.contains(player.getName()))
 				_out.add(player.getName());